move gbp.conf into debian/

[debian/cpmtools] / configure.in

diff --git a/configure.in b/configure.in
index cf88b570e711698c0e786dc4bac65eef3c557bdf..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
 AC_INIT(cpmfs.c)
 AC_CONFIG_HEADER(config.h)
 AC_CANONICAL_HOST

-VERSION=2.5
-UPDATED='Oct 19, 2005'
+VERSION=2.10
+UPDATED='July 6, 2009'

 
 DEVICE="posix"
 
 
 DEVICE="posix"
 


@@ -27,27 +27,35 @@ else
   LDFLAGS="${LDFLAGS} ${EXTRA_LDFLAGS}"
 fi
 
   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"
 
 AC_CYGWIN
 AC_MINGW32
 dnl Choose between posix and win32 drivers...
 DEVICE="posix"
 

+DISKDEFS='${datarootdir}/diskdefs'
+

 if test "$CYGWIN" = "yes"
 then
   DEVICE="win32"
 if test "$CYGWIN" = "yes"
 then
   DEVICE="win32"

+#  DISKDEFS='%USERPROFILE%/diskdefs'

 fi
 if test "$MINGW32" = "yes"
 then
   DEVICE="win32"
 fi
 if test "$MINGW32" = "yes"
 then
   DEVICE="win32"

+#  DISKDEFS='%USERPROFILE%\\diskdefs'

 fi
 
 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
 
 dnl Check for curses. If not found, don't build fsed.cpm
 dnl Try both curses and ncurses


@@ -71,16 +79,6 @@ if test x"$DEVICE" = x"win32"; then
   AC_CHECK_HEADERS(windows.h winioctl.h, ,[echo "Windows headers not found - aborting"; exit 1] )
 fi
 
   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)
-fi
-
-

 dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS(fcntl.h sys/types.h sys/stat.h limits.h unistd.h)
 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 +92,7 @@ AC_TYPE_SIZE_T
 AC_STRUCT_TM
 AC_EXEEXT
 AC_OBJEXT
 AC_STRUCT_TM
 AC_EXEEXT
 AC_OBJEXT

+AC_SYS_LARGEFILE

 
 dnl add EXE extension to fsed.cpm
 if test x"$FSED_CPM" != x""; then
 
 dnl add EXE extension to fsed.cpm
 if test x"$FSED_CPM" != x""; then