Fix the fix, ahem.

[dump.git] / configure.in

diff --git a/configure.in b/configure.in
index 3166457ef8322b8921a23629784325c2381d2848..cf3bbdc9d6c02d5a1604e2a36f9448304027808c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -23,17 +23,20 @@ dnl
 dnl Handle --enable-debug
 dnl
 AC_ARG_ENABLE([debug],
-[  --enable-debug             include debugging code],
+[  --enable-debug             include debugging code (default is NO)],
 if test "$enableval" = "no"
 then
        DUMPDEBUG=""
        RESTOREDEBUG=""
+       echo "Not including debugging code"
 else
        DUMPDEBUG="-DFDEBUG -DTDEBUG -DWRITEDEBUG -DDIRDEBUG"
        RESTOREDEBUG="-DDIRDEBUG"
+       echo "Including debugging code"
 fi,
 DUMPDEBUG=""
 RESTOREDEBUG=""
+echo "Not including debugging code by default"
 )
 AC_SUBST(DUMPDEBUG)
 AC_SUBST(RESTOREDEBUG)
@@ -42,12 +45,14 @@ dnl
 dnl Handle --enable-static
 dnl
 AC_ARG_ENABLE([static],
-[  --enable-static            link dump and restore statically],
+[  --enable-static            link dump and restore statically (default is NO)],
 if test "$enableval" = "no"
 then
        STATIC=""
+       echo "Linking dump and restore dynamically"
 else
        STATIC="-static"
+       echo "Linking dump and restore statically"
 fi
 ,
 STATIC=""
@@ -59,18 +64,21 @@ dnl
 dnl Handle --enable-rmt
 dnl
 AC_ARG_ENABLE([rmt],
-[  --enable-rmt               compile and install rmt],
+[  --enable-rmt               compile and install rmt (default is YES)],
 if test "$enableval" = "no"
 then
        RMTDIR=""
        RMTMAKEFILE=""
+       echo "Not compiling rmt"
 else
        RMTDIR="rmt"
        RMTMAKEFILE="rmt/Makefile"
+       echo "Compiling rmt"
 fi
 ,
-RMTDIR=""
-echo "Not compiling rmt by default"
+RMTDIR="rmt"
+RMTMAKEFILE="rmt/Makefile"
+echo "Compiling rmt by default"
 )
 AC_SUBST(RMTDIR)
 
@@ -78,12 +86,14 @@ dnl
 dnl Handle --enable-kerberos
 dnl
 AC_ARG_ENABLE([kerberos],
-[  --enable-kerberos          compile kerberos extensions],
+[  --enable-kerberos          compile kerberos extensions (default is NO)],
 if test "$enableval" = "yes"
 then
        OPTDEFS="-DKERBEROS"
+       echo "Compiling kerberos extensions"
 else
        OPTDEFS=""
+       echo "Not compiling kerberos extensions"
 fi
 ,
 OPTDEFS=""
@@ -95,17 +105,20 @@ dnl
 dnl Handle --enable-readline
 dnl
 AC_ARG_ENABLE([readline],
-[  --enable-readline          enable readline support in restore],
+[  --enable-readline          enable readline support in restore (default is YES)],
 if test "$enableval" = "no"
 then
        READLINE=""
+       echo "Not including readline support"
 else
        READLINE="-lreadline -ltermcap"
        AC_DEFINE(HAVE_READLINE)
+       echo "Including readline support"
 fi
 ,
-READLINE=""
-echo "Not including readline support by default"
+READLINE="-lreadline -ltermcap"
+AC_DEFINE(HAVE_READLINE)
+echo "Including readline support by default"
 )
 AC_SUBST(READLINE)
 
@@ -113,52 +126,66 @@ dnl
 dnl Handle --enable-oldsylefscript
 dnl
 AC_ARG_ENABLE([oldstylefscript],
-[  --enable-oldstylefscript   enable old style F script (no arguments)],
+[  --enable-oldstylefscript   enable old style F script (no arguments) (default is NO)],
 if test "$enableval" = "yes"
 then
        AC_DEFINE(OLD_STYLE_FSCRIPT)
+       echo "Using old style F script"
+else
+       echo "Using new style F script"
 fi
 ,
-echo "Using new style F script"
+echo "Using new style F script by default"
 )
 
 dnl
 dnl Handle --enable-largefile
 dnl
 AC_ARG_ENABLE([largefile],
-[  --enable-largefile         enable Large File System support (your glibc needs to support it)],
+[  --enable-largefile         enable Large File System support (default is YES)],
 if test "$enableval" = "yes"
 then
        AC_DEFINE(USE_LFS)
+       echo "Enabling Large File System support"
+else
+       echo "Not enabling Large File System support"
 fi
 ,
-echo "Not enabling Large File System support"
+AC_DEFINE(USE_LFS)
+echo "Enabling Large File System support by default"
 )
 
 dnl
 dnl Handle --enable-qfa
 dnl
 AC_ARG_ENABLE([qfa],
-[  --enable-qfa               enable Quick File Access support],
+[  --enable-qfa               enable Quick File Access support (default is YES)],
 if test "$enableval" = "yes"
 then
        AC_DEFINE(USE_QFA)
+       echo "Enabling Quick File Access support"
+else
+       echo "Not enabling Quick File Access support"
 fi
 ,
-echo "Not enabling Quick File Access support"
+AC_DEFINE(USE_QFA)
+echo "Enabling Quick File Access support by default"
 )
 
 dnl
 dnl Handle --enable-qfadebug
 dnl
 AC_ARG_ENABLE([qfadebug],
-[  --enable-qfadebug          include Quick File Access debugging code],
+[  --enable-qfadebug          include Quick File Access debugging code (default is NO)],
 if test "$enableval" = "yes"
 then
        AC_DEFINE(DEBUG_QFA)
+       echo "Including Quick File Access debugging code"
+else
+       echo "Not including Quick File Access debugging code"
 fi
 ,
-echo "Not including Quick File Access debugging code"
+echo "Not including Quick File Access debugging code by default"
 )
 
 dnl
@@ -294,7 +321,7 @@ AC_SUBST(DUMPDATESPATH)
 dnl
 dnl Check for Ext2fs headers and libraries
 dnl
-AC_CHECK_HEADER(ext2fs/ext2fs.h, [ext2fs_h=yes], [ext2fs_h=no])
+AC_CHECK_HEADER(ext2fs/ext2fs.h, [ext2fs_h=yes], [ext2fs_h=no], [-])
 AC_CHECK_LIB(ext2fs, ext2fs_open, [ext2fs_lib=yes], [ext2fs_lib=no], [-lcom_err])
 if test "$ext2fs_h" = no -o "$ext2fs_lib" = no; then
        AC_MSG_ERROR(You need to install the Ext2fs libraries from the E2fsprogs distribution first - hint: make install-libs)
@@ -303,7 +330,7 @@ fi
 dnl
 dnl Try to use ext2_fs.h header from libext2fs instead of from the kernel
 dnl
-AC_CHECK_HEADERS(ext2fs/ext2_fs.h)
+AC_CHECK_HEADERS(ext2fs/ext2_fs.h, [], [], [-])
 
 dnl
 dnl Check for ext2_ino_t type
@@ -348,7 +375,7 @@ fi
 dnl
 dnl Check for readline headers and libraries
 dnl
-AC_CHECK_HEADER(readline/readline.h, [readline_h=yes], [readline_h=no])
+AC_CHECK_HEADER(readline/readline.h, [readline_h=yes], [readline_h=no], [-])
 AC_CHECK_LIB(readline, readline, [readline_lib=yes], [readline_lib=no], "-ltermcap")
 if test "$readline_h" = no -o "$readline_lib" = no; then
        if test "$READLINE" = "-lreadline -ltermcap"; then
@@ -375,7 +402,7 @@ fi
 dnl
 dnl Check for zlib headers and libraries
 dnl
-AC_CHECK_HEADER(zlib.h, [zlib_h=yes], [zlib_h=no])
+AC_CHECK_HEADER(zlib.h, [zlib_h=yes], [zlib_h=no], [-])
 AC_CHECK_LIB(z, compress2, [zlib_lib=yes], [zlib_lib=no])
 if test "$zlib_h" = yes -a "$zlib_lib" = yes; then
        ZLIB="-lz"
@@ -388,7 +415,7 @@ AC_SUBST(ZLIB)
 dnl
 dnl Check for bzlib headers and libraries
 dnl
-AC_CHECK_HEADER(bzlib.h, [bzlib_h=yes], [bzlib_h=no])
+AC_CHECK_HEADER(bzlib.h, [bzlib_h=yes], [bzlib_h=no], [-])
 AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress, [bzlib_lib=yes], [bzlib_lib=no])
 if test "$bzlib_h" = yes -a "$bzlib_lib" = yes; then
        BZLIB="-lbz2"
@@ -429,8 +456,8 @@ fi
 dnl
 dnl Check for types
 dnl
-AC_CHECK_TYPE(quad_t, __s64)
-AC_CHECK_TYPE(u_quad_t, __u64)
+AC_CHECK_TYPE(quad_t, int64_t)
+AC_CHECK_TYPE(u_quad_t, uint64_t)
 
 dnl
 dnl Compute top_buildir