ChangeLog, MCONFIG.in:

[tools/e2fsprogs.git] / configure.in

diff --git a/configure.in b/configure.in
index 513b05c..dfec9f2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -77,6 +77,20 @@ CFLAGS="$CFLAGS $withval",
 CCOPTS=)dnl
 AC_SUBST(CCOPTS)
 dnl
+dnl On systems without linux header files, we add an extra include directory
+dnl that holds enough to fake it (hopefully).  Note that the $(top_srcdir) here
+dnl is quoted so that it gets expanded by make, not by configure.
+dnl
+AC_CHECK_HEADER(linux/fs.h, [linux_headers=yes], [linux_headers=no])
+if test "$linux_headers" = yes; then
+  AC_DEFINE(HAVE_LINUX_FS_H)
+else
+  LINUX_INCLUDE='-I$(top_srcdir)/include -I$(top_builddir)/include'
+  # Use this include directory with test compiles in the configure script too.
+  CPPFLAGS="$CPPFLAGS -I$srcdir/include -I./include"
+fi
+AC_SUBST(LINUX_INCLUDE)
+dnl
 dnl Set default values for library extentions.  Will be dealt with after
 dnl parsing configuration opions, which may modify these
 dnl
@@ -312,13 +326,21 @@ AC_PATH_PROG(RM, rm, rm)
 AC_PATH_PROG(CHMOD, chmod, :)
 AC_PATH_PROG(AWK, awk, awk)
 AC_PATH_PROG(SED, sed, sed)
+AC_PATH_PROG(PERL, perl, perl)
 AC_CHECK_TOOL(AR, ar, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 AC_CHECK_TOOL(STRIP, strip, :)
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_C_CROSS
-AC_CHECK_HEADERS(stdlib.h unistd.h stdarg.h errno.h malloc.h mntent.h paths.h dirent.h getopt.h setjmp.h linux/fd.h linux/major.h sys/disklabel.h sys/sockio.h sys/time.h sys/stat.h sys/types.h net/if.h netinet/in.h)
+# See if we need a separate native compiler.
+if test $cross_compiling = no; then
+  BUILD_CC="$CC"
+  AC_SUBST(BUILD_CC)
+else
+  AC_CHECK_PROGS(BUILD_CC, gcc cc)
+fi
+AC_CHECK_HEADERS(stdlib.h unistd.h stdarg.h errno.h malloc.h mntent.h paths.h dirent.h getopt.h setjmp.h signal.h termios.h linux/fd.h linux/major.h sys/disklabel.h sys/sockio.h sys/time.h sys/stat.h sys/types.h net/if.h netinet/in.h)
 AC_FUNC_VPRINTF
 dnl
 dnl See if struct dirent has a d_namlen field (like bsd systems), implying
@@ -362,8 +384,8 @@ if test "$cross_compiling" = yes -a "$ac_cv_sizeof_long" = ""; then
   ac_cv_sizeof_short=2
   ac_cv_sizeof_int=4
   ac_cv_sizeof_long=4
-  ac_cv_sizeof_long_long=0
-  AC_MSG_WARN([Cross-compiling, so cannot check type sizes; assuming short=2, int=4, long=4])
+  ac_cv_sizeof_long_long=8
+  AC_MSG_WARN([Cross-compiling, so cannot check type sizes; assuming short=2, int=4, long=4, long long=8])
 fi
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
@@ -389,7 +411,16 @@ AC_CACHE_VAL(e2fsprogs_cv_struct_st_flags,
                [e2fsprogs_cv_struct_st_flags=no]))
 AC_MSG_RESULT($e2fsprogs_cv_struct_st_flags)
 if test "$e2fsprogs_cv_struct_st_flags" = yes; then
-  AC_DEFINE(HAVE_STAT_FLAGS)
+  AC_MSG_CHECKING(whether st_flags field is useful)
+  AC_CACHE_VAL(e2fsprogs_cv_struct_st_flags_immut,
+       AC_TRY_COMPILE([#include <sys/stat.h>],
+               [struct stat stat; stat.st_flags |= UF_IMMUTABLE;],
+               [e2fsprogs_cv_struct_st_flags_immut=yes],
+               [e2fsprogs_cv_struct_st_flags_immut=no]))
+  AC_MSG_RESULT($e2fsprogs_cv_struct_st_flags_immut)
+  if test "$e2fsprogs_cv_struct_st_flags_immut" = yes; then
+         AC_DEFINE(HAVE_STAT_FLAGS)
+  fi
 fi
 AC_CHECK_FUNCS(chflags getrusage llseek strdup getmntinfo strcasecmp srandom fchown mallinfo)
 dnl
@@ -406,20 +437,6 @@ if test "$e2fsprogs_cv_ino_t" = yes; then
    AC_DEFINE(HAVE_INO_T)
 fi
 dnl
-dnl On systems without linux header files, we add an extra include directory
-dnl that holds enough to fake it (hopefully).  Note that the $(top_srcdir) here
-dnl is quoted so that it gets expanded by make, not by configure.
-dnl
-AC_CHECK_HEADER(linux/fs.h, [linux_headers=yes], [linux_headers=no])
-if test "$linux_headers" = yes; then
-  AC_DEFINE(HAVE_LINUX_FS_H)
-else
-  LINUX_INCLUDE='-I$(top_srcdir)/include -I$(top_builddir)/include'
-  # Use this include directory with test compiles in the configure script too.
-  CPPFLAGS="$CPPFLAGS -I$srcdir/include -I./include"
-fi
-AC_SUBST(LINUX_INCLUDE)
-dnl
 dnl Check to see if -lsocket is required (solaris) to make something
 dnl that uses socket() to compile; this is needed for the UUID library
 dnl
@@ -438,7 +455,7 @@ if test $ac_cv_have_optreset = yes; then
   AC_DEFINE(HAVE_OPTRESET)
 fi
 dnl
-dnl See if using the EXT2 ioctls causes a compile-time barf (as on the hurd).
+dnl See if using the EXT2 ioctls causes a compile-time barf (as on the Hurd).
 dnl
 AC_MSG_CHECKING(whether the ext2 ioctls compile)
 AC_CACHE_VAL(e2fsprogs_cv_ioctl_ext2,
@@ -452,10 +469,23 @@ if test "$e2fsprogs_cv_ioctl_ext2" = yes; then
   AC_DEFINE(HAVE_EXT2_IOCTLS)
 fi
 dnl
-dnl Linux places root files in the / by default
+dnl Check if ext2_inode has i_version (changed to i_generation in Linux 2.3)
+dnl
+AC_MSG_CHECKING(whether struct ext2_inode has an i_version field)
+AC_CACHE_VAL(e2fsprogs_cv_ext2_inode_version,
+       AC_TRY_COMPILE([#include <linux/ext2_fs.h>],
+               [struct ext2_inode e2i; e2i.i_version=0;],
+               [e2fsprogs_cv_ext2_inode_version=yes],
+               [e2fsprogs_cv_ext2_inode_version=no]))
+AC_MSG_RESULT($e2fsprogs_cv_ext2_inode_version)
+if test "$e2fsprogs_cv_ext2_inode_version" = yes; then
+  AC_DEFINE(HAVE_EXT2_INODE_VERSION)
+fi
+dnl
+dnl Linux and Hurd places root files in the / by default
 dnl
 case "$host_os" in
-linux*)
+linux* | gnu*)
        if test "$prefix" = NONE -a "$root_prefix" = NONE ; then
                root_prefix="";
                echo "On $host_os systems, root_prefix defaults to ''"