# 
# 
# patch "ChangeLog"
#  from [f260fa063aed5d6bb30b92971e05f919a11914a6]
#    to [fd95c4f2c9d165cda966cfe2f76955425bccbbce]
# 
# patch "configure.ac"
#  from [a7a31091beeba59c197c639389ae5a284ce1a64c]
#    to [c7984f7ceb6f010a466e3986c73e0088e09c17cb]
# 
============================================================
--- ChangeLog	f260fa063aed5d6bb30b92971e05f919a11914a6
+++ ChangeLog	fd95c4f2c9d165cda966cfe2f76955425bccbbce
@@ -1,3 +1,8 @@
+2006-03-20  Matthew Gregan  <address@hidden>
+
+	* configure.ac: Fix Windows identification test so that it doesn't
+	pass unexpected under Cygwin.  Reported by Lapo Luchini.
+
 2006-03-20  Matt Johnston  <address@hidden>
 
 	* configure.ac: use test -f rather than test -e, since Solaris's
============================================================
--- configure.ac	a7a31091beeba59c197c639389ae5a284ce1a64c
+++ configure.ac	c7984f7ceb6f010a466e3986c73e0088e09c17cb
@@ -277,7 +277,9 @@
 
 AC_CACHE_CHECK([if this is Windows],
        ac_win32, [
-       AC_TRY_COMPILE([#include <windows.h>],
+       AC_TRY_COMPILE([#ifdef WIN32
+                       #include <windows.h>
+                       #endif],
                       [HANDLE h; DWORD d;],
                       ac_win32=yes,
                       ac_win32=no)