X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=configure.in;h=cc8137ef26f78278c549dd04593b17935b5c4dba;hp=5299ab3ee5490675d3be999ae10cbbe4792e8d18;hb=a3ab8e4243d14360f2769230d23e7d3afd6397cb;hpb=d7783603566abe1a1784cd3cc25f0ab16bc2b8d5 diff --git a/configure.in b/configure.in index 5299ab3..cc8137e 100644 --- a/configure.in +++ b/configure.in @@ -161,16 +161,15 @@ then READLINE="" echo "Not including readline support" else - READLINE="-lreadline -ltermcap" + READLINE="yes" AC_DEFINE([HAVE_READLINE],1,[Define if you want to include readline support.]) echo "Including readline support" fi , -READLINE="-lreadline -ltermcap" +READLINE="yes" AC_DEFINE([HAVE_READLINE],1,[Define if you want to include readline support.]) echo "Including readline support by default" ) -AC_SUBST(READLINE) dnl dnl Handle --enable-oldsylefscript @@ -254,6 +253,29 @@ fi echo "Not including Mac OSX restore compatibility code by default" ) +dnl +dnl Handle --enable-transselinux +dnl +AC_ARG_ENABLE([transselinux], +[ --enable-transselinux restore can translate SELinux EAs (default is YES)], +if test "$enableval" = "yes" +then + LTRANSSELINUX="-lselinux" + CCTRANSSELINUX="-DTRANSSELINUX" + echo "restore can translate SELinux EAs" +else + LTRANSSELINUX="" + CCTRANSSELINUX="" + echo "restore can not translate SELinux EAs" +fi +, +LTRANSSELINUX="-lselinux" +CCTRANSSELINUX="-DTRANSSELINUX" +echo "restore can translate SELinux EAs by default" +) +AC_SUBST(LTRANSSELINUX) +AC_SUBST(CCTRANSSELINUX) + dnl dnl set $(CC) from --with-cc=value @@ -394,6 +416,14 @@ 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 Check for ext2fs_read_inode_full +dnl +AC_CHECK_LIB(ext2fs, ext2fs_read_inode_full, [rif=yes], [rif=no], [-lcom_err]) +if test "$rif" = yes; then + AC_DEFINE([HAVE_EXT2FS_READ_INODE_FULL],1,[Define this if your ext2fs libs have the ext2fs_read_inode_full function.]) +fi + dnl dnl Try to use ext2_fs.h header from libext2fs instead of from the kernel dnl @@ -432,25 +462,50 @@ AC_TRY_COMPILE([#include AC_MSG_RESULT(no)) dnl -dnl Check for termcap libraries +dnl Check for blkid headers libraries +dnl +AC_CHECK_HEADER(blkid/blkid.h, [blkid_h=yes], [blkid_h=no], [-]) +AC_CHECK_LIB(blkid, blkid_get_devname, [blkid_lib=yes], [blkid_lib=no], [-luuid]) +if test "$blkid_h" = yes -a "$blkid_lib" = yes; then + AC_DEFINE([HAVE_BLKID],1,[Define this if you have the blkid library.]) + BLKID="-lblkid -luuid" +fi +AC_SUBST(BLKID) + dnl +dnl Check for ncurses or termcap libraries +dnl +AC_CHECK_LIB(ncurses, tgetent, [ncurses_lib=yes], [ncurses_lib=no]) 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) +AC_CHECK_LIB(tinfo, tgetent, [tinfo_lib=yes], [tinfo_lib=no]) + +if test "$ncurses_lib" = no -a "$termcap_lib" = no -a "$tinfo_lib" = no; then + if test "$READLINE" = "yes"; then + AC_MSG_ERROR(You need to install the ncurses or termcap library or configure without --enable-readline) fi fi +if test "$tinfo_lib" = yes; then + rdllib="-ltinfo" +elif test "$ncurses_lib" = yes; then + rdllib="-lncurses" +elif test "$termcap_lib" = yes; then + rdllib="-ltermcap" +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], "-ltermcap") +AC_CHECK_LIB(readline, readline, [readline_lib=yes], [readline_lib=no], $rdllib) if test "$readline_h" = no -o "$readline_lib" = no; then - if test "$READLINE" = "-lreadline -ltermcap"; then + if test "$READLINE" = "yes"; then AC_MSG_ERROR(You need to install the GNU readline library or configure without --enable-readline) fi fi +if test "$READLINE" = yes; then + READLINE="-lreadline $rdllib" +fi +AC_SUBST(READLINE) dnl dnl Check for rl_completion_matches