Imported Upstream version 2.10

[debian/cpmtools] / configure.in

diff --git a/configure.in b/configure.in
index 17025c00727bb1bbb99d9bec4e94c0781cd10b61..8a6e47fc8cfa0a0577461468595c8ede47ce94f1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 AC_INIT(cpmfs.c)
 AC_CONFIG_HEADER(config.h)
 AC_CANONICAL_HOST
-VERSION=2.7
-UPDATED='November 26, 2007'
+VERSION=2.10
+UPDATED='July 6, 2009'
 
 DEVICE="posix"
 
@@ -27,30 +27,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], 
-               [CPPFLAGS="$CPPFLAGS -I$with_dmalloc/include"
-                 LDFLAGS="$LDFLAGS -L$with_dmalloc/lib"
-                 LIBS="$LIBS -ldmalloc"
-                 AC_DEFINE(USE_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