configure.in, ChangeLog:

[tools/e2fsprogs.git] / configure.in

diff --git a/configure.in b/configure.in
index 1c737e5..432eb36 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -55,6 +55,7 @@ if test -z "$CC" ; then CC=cc; fi
 [AC_MSG_RESULT(CC defaults to $CC)])dnl
 export CC
 AC_SUBST([CC])
+AC_PROG_CC
 dnl
 dnl set $(LD) from --with-linker=value
 dnl
@@ -82,12 +83,8 @@ 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"
+if test "$linux_headers" != yes; then
+  LINUX_INCLUDE='-I$(top_builddir)/include'
 fi
 AC_SUBST(LINUX_INCLUDE)
 dnl
@@ -114,6 +111,22 @@ AC_ARG_WITH([root-prefix],
 root_prefix=$withval,
 root_prefix=NONE)dnl
 dnl
+dnl handle --enable-compression
+dnl
+AC_ARG_ENABLE([compression],
+[  --enable-compression          enable EXPERIMENTAL compression support],
+if test "$enableval" = "no"
+then
+       echo "Disabling compression support"
+else
+       AC_DEFINE(ENABLE_COMPRESSION)
+       echo "Enabling compression support"
+       echo "WARNING: Compression support is experimental"
+fi
+,
+echo "Disabling compression support by default"
+)
+dnl
 dnl handle --enable-dll-shlibs
 dnl
 AC_ARG_ENABLE([dll-shlibs],
@@ -185,6 +198,18 @@ echo "Disabling BSD shared libraries by default"
 AC_SUBST(BSDLIB_CMT)
 AC_SUBST_FILE(MAKEFILE_BSDLIB)
 dnl
+dnl Add internationalization support, using gettext.
+dnl
+PACKAGE=e2fsprogs
+VERSION="$E2FSPROGS_VERSION"
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
+
+ALL_LINGUAS="it nyc"
+AM_GNU_GETTEXT
+dnl
 dnl handle --enable-profile
 dnl
 AC_ARG_ENABLE([profile],
@@ -330,9 +355,7 @@ 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
 # See if we need a separate native compiler.
 if test $cross_compiling = no; then
   BUILD_CC="$CC"
@@ -340,7 +363,7 @@ if test $cross_compiling = no; then
 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 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_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
@@ -422,7 +445,7 @@ if test "$e2fsprogs_cv_struct_st_flags" = yes; then
          AC_DEFINE(HAVE_STAT_FLAGS)
   fi
 fi
-AC_CHECK_FUNCS(chflags getrusage llseek strdup getmntinfo strcasecmp srandom fchown mallinfo)
+AC_CHECK_FUNCS(chflags getrusage llseek strdup getmntinfo strcasecmp srandom fchown mallinfo fdatasync)
 dnl
 dnl Check to see if ino_t is defined
 dnl
@@ -455,32 +478,13 @@ 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
-AC_MSG_CHECKING(whether the ext2 ioctls compile)
-AC_CACHE_VAL(e2fsprogs_cv_ioctl_ext2,
-       AC_TRY_COMPILE([#include <linux/ext2_fs.h>
-#include <sys/ioctl.h>],
-               [ioctl (0, EXT2_IOC_SETVERSION, 0);],
-               [e2fsprogs_cv_ioctl_ext2=yes],
-               [e2fsprogs_cv_ioctl_ext2=no]))
-AC_MSG_RESULT($e2fsprogs_cv_ioctl_ext2)
-if test "$e2fsprogs_cv_ioctl_ext2" = yes; then
-  AC_DEFINE(HAVE_EXT2_IOCTLS)
-fi
+dnl We use the EXT2 ioctls only under Linux
 dnl
-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
+case "$host_os" in
+linux*)
+       AC_DEFINE(HAVE_EXT2_IOCTLS)
+       ;;
+esac
 dnl
 dnl Linux and Hurd places root files in the / by default
 dnl
@@ -574,4 +578,5 @@ fi
 AC_OUTPUT(MCONFIG Makefile util/Makefile util/subst.conf lib/et/Makefile 
        lib/ss/Makefile lib/ext2fs/Makefile lib/e2p/Makefile lib/uuid/Makefile
        misc/Makefile e2fsck/Makefile debugfs/Makefile tests/Makefile 
-       tests/progs/Makefile $rmakefile doc/Makefile)
+       tests/progs/Makefile $rmakefile doc/Makefile 
+       intl/Makefile po/Makefile.in)