X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=configure.in;h=f0bff7a312a60d01f17e2b03a1195962679ff0f2;hb=669a947da532682fcdb01a4fcbb0d9418206bcd0;hp=8a6e47fc8cfa0a0577461468595c8ede47ce94f1;hpb=da79766c5b4c4bae50ddc7bd81b610d3a45c5899;p=debian%2Fcpmtools

diff --git a/configure.in b/configure.in
index 8a6e47f..f0bff7a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 AC_INIT(cpmfs.c)
 AC_CONFIG_HEADER(config.h)
 AC_CANONICAL_HOST
-VERSION=2.10
-UPDATED='July 6, 2009'
+VERSION=2.12
+UPDATED='December 20, 2009'
 
 DEVICE="posix"
 
@@ -11,6 +11,9 @@ then
   case $host in
     *-linux-*)
     ;;
+    *-pc-mingw32)
+      CFLAGS_LIBDSK=-DNOTWINDLL
+    ;;
   esac
 fi
 
@@ -68,7 +71,7 @@ dnl If using libdsk, check it's available.
 if test "$LIBDSK" != ""; then
   DEVICE="libdsk"
   CPPFLAGS="$CPPFLAGS -I$LIBDSK/include"
-  CFLAGS="$CFLAGS -I$LIBDSK/include"
+  CFLAGS="$CFLAGS -I$LIBDSK/include $CFLAGS_LIBDSK"
   LDFLAGS="$LDFLAGS -L$LIBDSK/lib"
   AC_CHECK_LIB(dsk, dsk_open)
   AC_CHECK_HEADERS(libdsk.h, ,[echo "No libdsk.h - aborting"; exit 1])
@@ -76,7 +79,12 @@ fi
 
 dnl If using win32, check it's available. 
 if test x"$DEVICE" = x"win32"; then
-  AC_CHECK_HEADERS(windows.h winioctl.h, ,[echo "Windows headers not found - aborting"; exit 1] )
+  AC_CHECK_HEADERS(windows.h, ,[echo "Device win32, but <windows.h> not found - aborting"; exit 1] )
+  AC_CHECK_HEADERS(winioctl.h, ,[echo "Device win32, but <winioctl.h> not found - aborting"; exit 1],
+[#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
+])
 fi
 
 dnl Checks for header files.