X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=configure.in;h=fc2896719fb26eafd0edb5a6c4bec089ad0b3059;hp=b5dd89cf92e2a5a2e5979bcd3e12378d0181c9a5;hb=f48a055e452249091f3c6851a20431a8c87135b1;hpb=35b24fb7fabcf6df3b37aebf70c228d5b0688d32

diff --git a/configure.in b/configure.in
index b5dd89c..fc28967 100644
--- a/configure.in
+++ b/configure.in
@@ -129,7 +129,7 @@ AC_ARG_ENABLE([largefile],
 [  --enable-largefile         enable Large File System support (your glibc needs to support it)],
 if test "$enableval" = "yes"
 then
-	AC_DEFINE(_FILE_OFFSET_BITS,64)
+	AC_DEFINE(USE_LFS)
 fi
 ,
 echo "Not enabling Large File System support"
@@ -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