X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=configure.in;h=e8bc8528b6cfe0de9f475a20a36fbf0f4bb6034e;hp=a7b608e18678df78c6282e54962a2baf6770685b;hb=b82d31dc01e8474d503a86fbf52ddf6d74c245e6;hpb=95c74f382492999827000f544fcb6844150cda81

diff --git a/configure.in b/configure.in
index a7b608e..e8bc852 100644
--- a/configure.in
+++ b/configure.in
@@ -299,13 +299,22 @@ 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 <stdio.h>
+#ifdef HAVE_EXT2FS_EXT2_FS_H
+#include <ext2fs/ext2_fs.h>
+#else
 #include <linux/ext2_fs.h>
-#include <ext2fs/ext2fs.h>], 
+#endif
+#include <ext2fs/ext2fs.h>],
 [ext2_ino_t ino = 0;], 
 [AC_DEFINE(HAVE_EXT2_INO_T) AC_MSG_RESULT(yes)],
 AC_MSG_RESULT(no))
@@ -315,7 +324,11 @@ 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 <stdio.h>
+#ifdef HAVE_EXT2FS_EXT2_FS_H
+#include <ext2fs/ext2_fs.h>
+#else
 #include <linux/ext2_fs.h>
+#endif
 #include <ext2fs/ext2fs.h>],
 [struct ext2_super_block es; es.s_journal_inum = 0;],
 [AC_DEFINE(HAVE_EXT2_JOURNAL_INUM) AC_MSG_RESULT(yes)],
@@ -327,7 +340,7 @@ 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 libraries first)
+		AC_MSG_ERROR(You need to install the GNU termcap library or configure without --enable-readline)
 	fi
 fi
 
@@ -338,7 +351,7 @@ 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
-		AC_MSG_ERROR(You need to install the GNU readline libraries first)
+		AC_MSG_ERROR(You need to install the GNU readline library or configure without --enable-readline)
 	fi
 fi
 
@@ -355,6 +368,19 @@ else
 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