X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=configure.in;h=3166457ef8322b8921a23629784325c2381d2848;hp=00038cdae2a7e98f36fd63227ade9ab0e1ffb677;hb=f5504e5413d8c260ef4dcfd22e5e0fdbee402156;hpb=c38e5b6a9c658f06d9b27f33e9db131ffa23d947 diff --git a/configure.in b/configure.in index 00038cd..3166457 100644 --- a/configure.in +++ b/configure.in @@ -23,7 +23,7 @@ dnl dnl Handle --enable-debug dnl AC_ARG_ENABLE([debug], -[ --enable-debug include debugging code], +[ --enable-debug include debugging code], if test "$enableval" = "no" then DUMPDEBUG="" @@ -42,7 +42,7 @@ dnl dnl Handle --enable-static dnl AC_ARG_ENABLE([static], -[ --enable-static link dump and restore statically], +[ --enable-static link dump and restore statically], if test "$enableval" = "no" then STATIC="" @@ -59,7 +59,7 @@ dnl dnl Handle --enable-rmt dnl AC_ARG_ENABLE([rmt], -[ --enable-rmt compile and install rmt], +[ --enable-rmt compile and install rmt], if test "$enableval" = "no" then RMTDIR="" @@ -78,7 +78,7 @@ dnl dnl Handle --enable-kerberos dnl AC_ARG_ENABLE([kerberos], -[ --enable-kerberos compile kerberos extensions], +[ --enable-kerberos compile kerberos extensions], if test "$enableval" = "yes" then OPTDEFS="-DKERBEROS" @@ -95,12 +95,12 @@ dnl dnl Handle --enable-readline dnl AC_ARG_ENABLE([readline], -[ --enable-readline enable readline support in restore], +[ --enable-readline enable readline support in restore], if test "$enableval" = "no" then READLINE="" else - READLINE="-lreadline" + READLINE="-lreadline -ltermcap" AC_DEFINE(HAVE_READLINE) fi , @@ -109,11 +109,63 @@ echo "Not including readline support by default" ) AC_SUBST(READLINE) +dnl +dnl Handle --enable-oldsylefscript +dnl +AC_ARG_ENABLE([oldstylefscript], +[ --enable-oldstylefscript enable old style F script (no arguments)], +if test "$enableval" = "yes" +then + AC_DEFINE(OLD_STYLE_FSCRIPT) +fi +, +echo "Using new style F script" +) + +dnl +dnl Handle --enable-largefile +dnl +AC_ARG_ENABLE([largefile], +[ --enable-largefile enable Large File System support (your glibc needs to support it)], +if test "$enableval" = "yes" +then + AC_DEFINE(USE_LFS) +fi +, +echo "Not enabling Large File System support" +) + +dnl +dnl Handle --enable-qfa +dnl +AC_ARG_ENABLE([qfa], +[ --enable-qfa enable Quick File Access support], +if test "$enableval" = "yes" +then + AC_DEFINE(USE_QFA) +fi +, +echo "Not enabling Quick File Access support" +) + +dnl +dnl Handle --enable-qfadebug +dnl +AC_ARG_ENABLE([qfadebug], +[ --enable-qfadebug include Quick File Access debugging code], +if test "$enableval" = "yes" +then + AC_DEFINE(DEBUG_QFA) +fi +, +echo "Not including Quick File Access debugging code" +) + dnl dnl set $(CC) from --with-cc=value dnl AC_ARG_WITH([cc], -[ --with-cc=COMPILER select compiler to use], +[ --with-cc=COMPILER select compiler to use], AC_MSG_RESULT(CC=$withval) CC=$withval, if test -z "$CC" ; then CC=cc; fi @@ -125,7 +177,7 @@ dnl dnl set $(LD) from --with-linker=value dnl AC_ARG_WITH([linker], -[ --with-linker=LINKER select linker to use], +[ --with-linker=LINKER select linker to use], AC_MSG_RESULT(LD=$withval) LD=$withval, if test -z "$LD" ; then LD=$CC; fi @@ -137,7 +189,7 @@ dnl dnl set $(CCOPTS) from --with-ccopts=value dnl AC_ARG_WITH([ccopts], -[ --with-ccopts=CCOPTS select compiler command line options], +[ --with-ccopts=CCOPTS select compiler command line options], AC_MSG_RESULT(CCOPTS is $withval) CCOPTS=$withval CFLAGS="$CFLAGS $withval", @@ -148,17 +200,18 @@ dnl dnl set $(LDFLAGS) from --with-ldopts=value dnl AC_ARG_WITH([ldopts], -[ --with-ldopts=LDOPTS select linker command line options], +[ --with-ldopts=LDOPTS select linker command line options], AC_MSG_RESULT(LDFLAGS is $withval) -LDFLAGS=$withval, -LDFLAGS=)dnl -AC_SUBST(LDFLAGS) +LDOPTS=$withval +LDFLAGS="$LDFLAGS $withval", +LDOPTS=)dnl +AC_SUBST(LDOPTS) dnl dnl set $(BINOWNER) from --with-binowner dnl AC_ARG_WITH([binowner], -[ --with-binowner=USER select owner for binaries], +[ --with-binowner=USER select owner for binaries], AC_MSG_RESULT(BINOWNER is $withval) BINOWNER=$withval, BINOWNER=root @@ -170,7 +223,7 @@ dnl dnl set $(BINGRP) from --with-bingrp dnl AC_ARG_WITH([bingrp], -[ --with-bingrp=GROUP select group for binaries], +[ --with-bingrp=GROUP select group for binaries], AC_MSG_RESULT(BINGRP is $withval) BINGRP=$withval, BINGRP=tty @@ -182,10 +235,10 @@ dnl dnl set $(BINMODE) from --with-binmode dnl AC_ARG_WITH([binmode], -[ --with-binmode=MODE select mode for binaries], +[ --with-binmode=MODE select mode for binaries], AC_MSG_RESULT(BINMODE is $withval) BINMODE=$withval, -BINMODE=6555 +BINMODE=0755 echo "BINMODE defaults to $BINMODE" )dnl AC_SUBST(BINMODE) @@ -194,7 +247,7 @@ dnl dnl set $(MANOWNER) from --with-manowner dnl AC_ARG_WITH([manowner], -[ --with-manowner=USER select owner for manual pages], +[ --with-manowner=USER select owner for manual pages], AC_MSG_RESULT(MANOWNER is $withval) MANOWNER=$withval, MANOWNER=man @@ -206,7 +259,7 @@ dnl dnl set $(MANGRP) from --with-mangrp dnl AC_ARG_WITH([mangrp], -[ --with-mangrp=group select group for manual pages], +[ --with-mangrp=GROUP select group for manual pages], AC_MSG_RESULT(MANGRP is $withval) MANGRP=$withval, MANGRP=tty @@ -218,10 +271,10 @@ dnl dnl set $(MANMODE) from --with-manmode dnl AC_ARG_WITH([manmode], -[ --with-manmode=MODE select mode for manual pages], +[ --with-manmode=MODE select mode for manual pages], AC_MSG_RESULT(MANMODE is $withval) MANMODE=$withval, -MANMODE=0444 +MANMODE=0644 echo "MANMODE defaults to $MANMODE" )dnl AC_SUBST(MANMODE) @@ -230,10 +283,10 @@ dnl dnl set $(DUMPDATESPATH) from --with-dumpdatespath dnl AC_ARG_WITH([dumpdatespath], -[ --with-dumpdatespath=path select path for dumpdates file], +[ --with-dumpdatespath=PATH select path for dumpdates file], AC_MSG_RESULT(DUMPDATESPATH is $withval) DUMPDATESPATH=$withval, -DUMPDATESPATH="/etc/dumpdates" +DUMPDATESPATH="${sysconfdir}/dumpdates" echo "DUMPDATESPATH defaults to $DUMPDATESPATH" )dnl AC_SUBST(DUMPDATESPATH) @@ -247,17 +300,104 @@ 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) 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) + +dnl +dnl Check for ext2_ino_t type +dnl +AC_MSG_CHECKING(for ext2_ino_t type in libext2fs headers) +AC_TRY_COMPILE([#include +#ifdef HAVE_EXT2FS_EXT2_FS_H +#include +#else +#include +#endif +#include ], +[ext2_ino_t ino = 0;], +[AC_DEFINE(HAVE_EXT2_INO_T) AC_MSG_RESULT(yes)], +AC_MSG_RESULT(no)) + +dnl +dnl Check for s_journal_inum field in ext2_super_block struct +dnl +AC_MSG_CHECKING(for s_journal_inum field in ext2_super_block struct) +AC_TRY_COMPILE([#include +#ifdef HAVE_EXT2FS_EXT2_FS_H +#include +#else +#include +#endif +#include ], +[struct ext2_super_block es; es.s_journal_inum = 0;], +[AC_DEFINE(HAVE_EXT2_JOURNAL_INUM) AC_MSG_RESULT(yes)], +AC_MSG_RESULT(no)) + +dnl +dnl Check for termcap libraries +dnl +AC_CHECK_LIB(termcap, tgetent, [termcap_lib=yes], [termcap_lib=no]) +if test "$termcap_lib" = no; then + if test "$READLINE" = "-lreadline -ltermcap"; then + AC_MSG_ERROR(You need to install the GNU termcap library or configure without --enable-readline) + fi +fi + dnl dnl Check for readline headers and libraries dnl AC_CHECK_HEADER(readline/readline.h, [readline_h=yes], [readline_h=no]) -AC_CHECK_LIB(readline, readline, [readline_lib=yes], [readline_lib=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"; then - AC_MSG_ERROR(You need to install the GNU readline libraries first) + if test "$READLINE" = "-lreadline -ltermcap"; then + AC_MSG_ERROR(You need to install the GNU readline library or configure without --enable-readline) fi fi +dnl +dnl Check for rl_completion_matches +dnl +AC_CHECK_LIB(readline, rl_completion_matches, [rlcm=yes], [rlcm=no], "-ltermcap") +if test "$rlcm" = yes; then + AC_DEFINE(HAVE_READLINE_RLCM) +fi + +dnl +dnl Check for rl_completion_append_character +dnl +AC_CHECK_LIB(readline, rl_completion_append_character, [rcac=yes], [rcac=no], "-ltermcap") +if test "$rcac" = yes; then + AC_DEFINE(HAVE_READLINE_CAC) +fi + +dnl +dnl Check for zlib headers and libraries +dnl +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" + AC_DEFINE(HAVE_ZLIB) +else + ZLIB="" +fi +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_LIB(bz2, BZ2_bzBuffToBuffCompress, [bzlib_lib=yes], [bzlib_lib=no]) +if test "$bzlib_h" = yes -a "$bzlib_lib" = yes; then + BZLIB="-lbz2" + AC_DEFINE(HAVE_BZLIB) +else + BZLIB="" +fi +AC_SUBST(BZLIB) + dnl dnl Check for library functions dnl @@ -267,6 +407,7 @@ AC_CHECK_FUNC(glob) dnl dnl Check for GLOB_ALTDIRFUNC dnl +AC_MSG_CHECKING(for extended glob routines) if test "$ac_cv_func_glob" = "yes"; then AC_EGREP_CPP(yes, [ @@ -274,10 +415,15 @@ if test "$ac_cv_func_glob" = "yes"; then # ifdef GLOB_ALTDIRFUNC yes # endif - ], AC_DEFINE(HAVE_GLOB), noglob=yes) - if test "$noglob" = "yes"; then - echo "Your system does not support extended glob, will use the internal routines" - fi + ], + [ + AC_DEFINE(HAVE_GLOB) + AC_MSG_RESULT(yes) + ], + [ + AC_MSG_RESULT(no) + echo "Your system does not support extended glob, will use the internal routines" + ]) fi dnl