X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=configure.in;h=0632ff7a87827295df3bba32ba21fa12b583da3e;hb=edf600144998d1a1e09898548938cc11b95c10bc;hp=cf88b570e711698c0e786dc4bac65eef3c557bdf;hpb=9d1b9d0a2b6515be3cec895654af126aaddd21b3;p=debian%2Fcpmtools

diff --git a/configure.in b/configure.in
index cf88b57..0632ff7 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.5
-UPDATED='Oct 19, 2005'
+VERSION=2.17
+UPDATED='November 16, 2013'
 
 DEVICE="posix"
 
@@ -11,6 +11,9 @@ then
   case $host in
     *-linux-*)
     ;;
+    *-pc-mingw32)
+      CFLAGS_LIBDSK=-DNOTWINDLL
+    ;;
   esac
 fi
 
@@ -27,27 +30,35 @@ else
   LDFLAGS="${LDFLAGS} ${EXTRA_LDFLAGS}"
 fi
 
-AC_ARG_WITH(defformat,[  --with-defformat        Specify default format (ibm-3740)], 
-		[DEFFORMAT="$withval"], [DEFFORMAT="ibm-3740"])
-AC_ARG_WITH(libdsk,   [  --with-libdsk           Specify path to libdsk library], 
-		[LIBDSK="$withval"], [LIBDSK=""])
-AC_ARG_WITH(dmalloc,  [  --with-dmalloc          Specify path to dmalloc library], 
-		[DMALLOC="$withval"], [DMALLOC=""])
-
 AC_CYGWIN
 AC_MINGW32
 dnl Choose between posix and win32 drivers...
 DEVICE="posix"
 
+DISKDEFS='${datarootdir}/diskdefs'
+
 if test "$CYGWIN" = "yes"
 then
   DEVICE="win32"
+#  DISKDEFS='%USERPROFILE%/diskdefs'
 fi
 if test "$MINGW32" = "yes"
 then
   DEVICE="win32"
+#  DISKDEFS='%USERPROFILE%\\diskdefs'
 fi
 
+AC_ARG_WITH(diskdefs,[  --with-diskdefs         Specify diskdefs location], 
+		[DISKDEFS="$withval"], [DISKDEFS="$DISKDEFS"])
+AC_ARG_WITH(defformat,[  --with-defformat        Specify default format (ibm-3740)], 
+		[DEFFORMAT="$withval"], [DEFFORMAT="ibm-3740"])
+AC_ARG_WITH(libdsk,   [  --with-libdsk           Specify path to libdsk library], 
+		[LIBDSK="$withval"], [LIBDSK=""])
+AC_ARG_WITH(dmalloc,  [  --with-dmalloc          Specify path to dmalloc library], 
+		[CPPFLAGS="$CPPFLAGS -I$with_dmalloc/include"
+                 LDFLAGS="$LDFLAGS -L$with_dmalloc/lib"
+                 LIBS="$LIBS -ldmalloc"
+                 AC_DEFINE(USE_DMALLOC)])
 
 dnl Check for curses. If not found, don't build fsed.cpm
 dnl Try both curses and ncurses
@@ -60,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])
@@ -68,19 +79,14 @@ 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] )
-fi
-
-dnl Check for dmalloc
-if test x"$DMALLOC" != x""; then
-   CPPFLAGS  = "-I$DMALLOC/include $CPPFLAGS"
-   CFLAGS  = "-I$DMALLOC/include $CFLAGS"
-   LDFLAGS = "-L$DMALLOC/lib $LDFLAGS"
-   AC_CHECK_LIB(dmalloc, malloc)
-   AC_CHECK_HEADERS(dmalloc.h)
+  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.
 AC_HEADER_STDC
 AC_CHECK_HEADERS(fcntl.h sys/types.h sys/stat.h limits.h unistd.h)
@@ -94,6 +100,7 @@ AC_TYPE_SIZE_T
 AC_STRUCT_TM
 AC_EXEEXT
 AC_OBJEXT
+AC_SYS_LARGEFILE
 
 dnl add EXE extension to fsed.cpm
 if test x"$FSED_CPM" != x""; then