AC_INIT(version.h)
-AC_PREREQ(2.12)
+AC_PREREQ(2.50)
+AC_CONFIG_AUX_DIR(config)
MCONFIG=./MCONFIG
AC_SUBST_FILE(MCONFIG)
BINARY_TYPE=bin
| awk '{print $3}' | tr \" " " | awk '{print $1}'`
DATE=`grep E2FSPROGS_DATE ${srcdir}/version.h | awk '{print $3}' \
| tr \" " "`
+E2FSPROGS_DAY=`echo $DATE | awk -F- '{print $1}'`
MONTH=`echo $DATE | awk -F- '{print $2}'`
YEAR=`echo $DATE | awk -F- '{print $3}'`
echo "Release date is ${E2FSPROGS_MONTH}, ${E2FSPROGS_YEAR}"
AC_SUBST(E2FSPROGS_YEAR)
AC_SUBST(E2FSPROGS_MONTH)
+AC_SUBST(E2FSPROGS_DAY)
AC_SUBST(E2FSPROGS_VERSION)
-AC_REQUIRE([AC_CANONICAL_HOST])
+AC_CANONICAL_HOST
+dnl
+dnl Use diet libc
+dnl
+AC_ARG_WITH([diet-libc],
+[ --with-diet-libc Use diet libc],
+CC="diet cc -nostdinc"
+AC_MSG_RESULT(CC=$CC))dnl
dnl
dnl set $(CC) from --with-cc=value
dnl
fi
AC_SUBST(LINUX_INCLUDE)
dnl
+dnl Alpha computers use fast and imprecise floating point code that may
+dnl miss exceptions by default. Force sane options if we're using GCC.
+AC_MSG_CHECKING(for additional special compiler flags)
+if test "$GCC" = yes
+then
+ case "$host_cpu" in
+ alpha) addcflags="-mieee" ;;
+ esac
+fi
+if test "x$addcflags" != x
+then
+ AC_MSG_RESULT($addcflags)
+ CFLAGS="$addcflags $CFLAGS"
+else
+ AC_MSG_RESULT([[(none)]])
+fi
+dnl
dnl Set default values for library extentions. Will be dealt with after
dnl parsing configuration opions, which may modify these
dnl
echo "Disabling compression support by default"
)
dnl
-dnl handle --enable-dll-shlibs
+dnl handle --enable-htree
+dnl
+AC_ARG_ENABLE([htree],
+[ --enable-htree enable EXPERIMENTAL htree directory support],
+if test "$enableval" = "no"
+then
+ HTREE_CMT=#
+ echo "Disabling htree directory support"
+else
+ HTREE_CMT=
+ AC_DEFINE(ENABLE_HTREE)
+ echo "Enabling htree directory support"
+fi
+,
+HTREE_CMT=
+AC_DEFINE(ENABLE_HTREE)
+echo "Enabling htree directory support by default"
+)
+AC_SUBST(HTREE_CMT)
+dnl
+dnl handle --enable-clear-htree
dnl
-AC_ARG_ENABLE([dll-shlibs],
-[ --enable-dll-shlibs select DLL libraries],
+AC_ARG_ENABLE([htree-clear],
+[ --enable-htree-clear clear htree because we don't trust e2fsck],
if test "$enableval" = "no"
then
- DLL_CMT=#
- MAKEFILE_DLL=/dev/null
- echo "Disabling DLL shared libraries"
+ HTREE_CLR_CMT=#
+ echo "Disabling htree clearing"
else
- DLL_CMT=
- MAKEFILE_DLL=$srcdir/lib/Makefile.dll-lib
- BINARY_TYPE=dllbin
- LIB_EXT=.sa
- echo "Enabling DLL shared libraries"
+ HTREE_CLR_CMT=
+ AC_DEFINE(ENABLE_HTREE_CLEAR)
+ echo "Enabling htree clearing"
fi
,
-MAKEFILE_DLL=/dev/null
-DLL_CMT=#
-echo "Disabling DLL shared libraries by default"
+HTREE_CLR_CMT=#
+echo "Disabling htree clearing by default"
)
-AC_SUBST(DLL_CMT)
-AC_SUBST_FILE(MAKEFILE_DLL)
+AC_SUBST(HTREE_CLR_CMT)
dnl
dnl handle --enable-elf-shlibs
dnl
BSDLIB_CMT=
MAKEFILE_BSDLIB=$srcdir/lib/Makefile.bsd-lib
LIB_EXT=.so
+ [case "$host_os" in
+ darwin*)
+ MAKEFILE_BSDLIB=$srcdir/lib/Makefile.darwin-lib
+ LIB_EXT=.dylib
+ ;;
+ esac]
echo "Enabling BSD shared libraries"
fi
,
AC_SUBST(BSDLIB_CMT)
AC_SUBST_FILE(MAKEFILE_BSDLIB)
dnl
-dnl handle --enable-jfs-debug
-dnl
-AC_ARG_ENABLE([jfs-debug],
-[ --enable-jfs-debug enable journal debugging],
-if test "$enableval" = "no"
-then
- echo "Disabling journal debugging"
-else
- AC_DEFINE(JFS_DEBUG)
- echo "Enabling journal debugging"
-fi
-,
-echo "Disabling journal debugging by default"
-)
-dnl
-dnl handle --enable-swapfs
-dnl
-AC_ARG_ENABLE([swapfs],
-[ --disable-swapfs disable support of legacy byte-swapped filesystems],
-if test "$enableval" = "no"
-then
- echo "Disabling swapfs support"
- SWAPFS_CMT="#"
-else
- AC_DEFINE(ENABLE_SWAPFS)
- SWAPFS_CMT=
- echo "Enabling swapfs support"
-fi
-,
-echo "Enabling swapfs support by default"
-AC_DEFINE(ENABLE_SWAPFS)
-SWAPFS_CMT=
-)
-AC_SUBST(SWAPFS_CMT)
-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],
AC_SUBST(STATIC_LIB_EXT)
AC_SUBST(PROFILED_LIB_EXT)
dnl
+dnl handle --enable-jbd-debug
+dnl
+AC_ARG_ENABLE([jbd-debug],
+[ --enable-jbd-debug enable journal debugging],
+if test "$enableval" = "no"
+then
+ echo "Disabling journal debugging"
+else
+ AC_DEFINE(CONFIG_JBD_DEBUG)
+ echo "Enabling journal debugging"
+fi
+,
+echo "Disabling journal debugging by default"
+)
+dnl
+dnl handle --enable-blkid-debug
+dnl
+AC_ARG_ENABLE([blkid-debug],
+[ --enable-blkid-debug enable blkid debugging],
+if test "$enableval" = "no"
+then
+ echo "Disabling blkid debugging"
+else
+ AC_DEFINE(CONFIG_BLKID_DEBUG)
+ echo "Enabling blkid debugging"
+fi
+,
+echo "Disabling blkid debugging by default"
+)
+dnl
+dnl handle --enable-testio-debug
+dnl
+AC_ARG_ENABLE([testio-debug],
+[ --enable-testio-debug enable the use of the test I/O manager for debugging],
+if test "$enableval" = "no"
+then
+ echo "Disabling testio debugging"
+else
+ AC_DEFINE(CONFIG_TESTIO_DEBUG)
+ echo "Enabling testio debugging"
+fi
+,
+echo "Disabling testio debugging by default"
+)
+dnl
+dnl handle --enable-swapfs
+dnl
+AC_ARG_ENABLE([swapfs],
+[ --disable-swapfs disable support of legacy byte-swapped filesystems],
+if test "$enableval" = "no"
+then
+ SWAPFS_CMT=#
+ echo "Disabling swapfs support"
+else
+ SWAPFS_CMT=
+ AC_DEFINE(ENABLE_SWAPFS)
+ echo "Enabling swapfs support"
+fi
+,
+SWAPFS_CMT=
+echo "Enabling swapfs support by default"
+AC_DEFINE(ENABLE_SWAPFS)
+)
+AC_SUBST(SWAPFS_CMT)
+dnl
+dnl handle --enable-debugfs
+dnl
+AC_ARG_ENABLE([debugfs],
+[ --disable-debugfs disable support of debugfs program],
+if test "$enableval" = "no"
+then
+ echo "Disabling debugfs support"
+ DEBUGFS_CMT="#"
+else
+ DEBUGFS_CMT=
+ echo "Enabling debugfs support"
+fi
+,
+echo "Enabling debugfs support by default"
+DEBUGFS_CMT=
+)
+AC_SUBST(DEBUGFS_CMT)
+dnl
+dnl handle --enable-imager
+dnl
+AC_ARG_ENABLE([imager],
+[ --disable-imager disable support of e2image program],
+if test "$enableval" = "no"
+then
+ echo "Disabling e2image support"
+ IMAGER_CMT="#"
+else
+ IMAGER_CMT=
+ echo "Enabling e2image support"
+fi
+,
+echo "Enabling e2image support by default"
+IMAGER_CMT=
+)
+AC_SUBST(IMAGER_CMT)
+dnl
+dnl handle --enable-resizer
+dnl
+AC_ARG_ENABLE([resizer],
+[ --disable-resizer disable support of e2resize program],
+if test "$enableval" = "no"
+then
+ echo "Disabling e2resize support"
+ RESIZER_CMT="#"
+else
+ RESIZER_CMT=
+ echo "Enabling e2resize support"
+fi
+,
+echo "Enabling e2resize support by default"
+RESIZER_CMT=
+)
+AC_SUBST(RESIZER_CMT)
+dnl
dnl handle --enable-dynamic-e2fsck
dnl
AC_ARG_ENABLE([dynamic-e2fsck],
AC_SUBST(FSCK_PROG)
AC_SUBST(FSCK_MAN)
dnl
+dnl See whether to install the `e2initrd-helper' program
+dnl
+AC_ARG_ENABLE([e2initrd-helper],
+[ --enable-e2initrd-helper build e2initrd-helper program],
+[if test "$enableval" = "no"
+then
+ E2INITRD_PROG='' E2INITRD_MAN=''
+ echo "Not building e2initrd helper"
+else
+ E2INITRD_PROG=e2initrd_helper E2INITRD_MAN=e2initrd_helper.8
+ echo "Building e2initrd helper"
+fi]
+,
+E2INITRD_PROG=e2initrd_helper E2INITRD_MAN=e2initrd_helper.8
+echo "Building e2initrd helper by default"
+)
+AC_SUBST(E2INITRD_PROG)
+AC_SUBST(E2INITRD_MAN)
+dnl
dnl
MAKEFILE_LIBRARY=$srcdir/lib/Makefile.library
AC_SUBST_FILE(MAKEFILE_LIBRARY)
echo "Using standard bitmask operations by default"
)
dnl
+dnl Add internationalization support, using gettext.
+dnl
+GETTEXT_PACKAGE=e2fsprogs
+PACKAGE=e2fsprogs
+VERSION="$E2FSPROGS_VERSION"
+VERSION=0.14.1
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
+AC_SUBST(GETTEXT_PACKAGE)
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
+
+AM_GNU_GETTEXT
+dnl
dnl End of configuration options
dnl
AC_SUBST(BINARY_TYPE)
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/ioctl.h sys/mkdev.h sys/mount.h sys/sockio.h sys/sysmacros.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 stdint.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/disk.h sys/disklabel.h sys/ioctl.h sys/mkdev.h sys/mount.h sys/queue.h sys/sockio.h sys/socket.h sys/sysmacros.h sys/time.h sys/stat.h sys/types.h sys/wait.h sys/resource.h net/if.h net/if_dl.h netinet/in.h)
AC_FUNC_VPRINTF
-dnl
-dnl See if struct dirent has a d_namlen field (like bsd systems), implying
-dnl that the actual length of the structure may be grater than the declared
-dnl length.
-dnl
-AC_MSG_CHECKING(whether struct dirent has a d_namlen field)
-AC_CACHE_VAL(e2fsprogs_cv_struct_d_namlen,
+dnl Check to see if dirent has member d_reclen. On cygwin those d_reclen
+dnl is not decleared.
+AC_MSG_CHECKING(whether d_reclen declared in dirent)
+AC_CACHE_VAL(e2fsprogs_cv_have_d_reclen_dirent,
+ AC_TRY_COMPILE(
+[#include <dirent.h>], [struct dirent de; de.d_reclen = 0; ],
+ [e2fsprogs_cv_have_d_reclen_dirent=yes],
+ [e2fsprogs_cv_have_d_reclen_dirent=no]))
+AC_MSG_RESULT($e2fsprogs_cv_have_d_reclen_dirent)
+if test "$e2fsprogs_cv_have_d_reclen_dirent" = yes; then
+ AC_DEFINE(HAVE_RECLEN_DIRENT)
+fi
+dnl Check to see if ssize_t was decleared
+AC_MSG_CHECKING(whether ssize_t declared)
+AC_CACHE_VAL(e2fsprogs_cv_have_ssize_t,
AC_TRY_COMPILE(
-[#include <sys/types.h>
-#include <dirent.h>],
- [struct dirent de; de.d_namlen = 0;],
- [e2fsprogs_cv_struct_d_namlen=yes],
- [e2fsprogs_cv_struct_d_namlen=no]))
-AC_MSG_RESULT($e2fsprogs_cv_struct_d_namlen)
-if test "$e2fsprogs_cv_struct_d_namlen" = yes; then
- AC_DEFINE(HAVE_DIRENT_NAMLEN)
+[#include <sys/types.h>], [ssize_t a = 0; ],
+ [e2fsprogs_cv_have_ssize_t=yes],
+ [e2fsprogs_cv_have_ssize_t=no]))
+AC_MSG_RESULT($e2fsprogs_cv_have_ssize_t)
+if test "$e2fsprogs_cv_have_ssize_t" = yes; then
+ AC_DEFINE(HAVE_TYPE_SSIZE_T)
fi
dnl
dnl Check to see if llseek() is declared in unistd.h. On some libc's
AC_SUBST(SIZEOF_LONG_LONG)
AC_C_BIGENDIAN
dnl
+dnl See if we have inttypes.h and if intptr_t is defined
+dnl
+AC_CHECK_HEADERS([inttypes.h])
+AC_CHECK_TYPE(intptr_t,long)
+dnl
dnl See if struct stat has a st_flags field, in which case we can get file
dnl flags somewhat portably. Also check for the analogous setter, chflags().
dnl
AC_DEFINE(HAVE_STAT_FLAGS)
fi
fi
-AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 strdup getmntinfo strcasecmp srandom fchown mallinfo fdatasync)
+dnl
+dnl Check for the presence of SA_LEN
+dnl
+AC_MSG_CHECKING(whether struct sockaddr contains sa_len)
+AC_CACHE_VAL(e2fsprogs_cv_sockaddr_sa_len,
+[AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/socket.h>
+],
+[struct sockaddr sa;
+sa.sa_len;],
+e2fsprogs_cv_sockaddr_sa_len=yes,e2fsprogs_cv_sockaddr_sa_len=no)])
+AC_MSG_RESULT([$]e2fsprogs_cv_sockaddr_sa_len)
+if test $e2fsprogs_cv_sockaddr_sa_len = yes; then
+ AC_DEFINE_UNQUOTED(HAVE_SA_LEN,1,[Define if struct sockaddr contains sa_len])
+fi
+dnl
+AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 getmntinfo strtoull strcasecmp srandom fchown mallinfo fdatasync strnlen strptime sysconf pathconf posix_memalign memalign valloc)
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
AC_CHECK_LIB(socket, socket, [SOCKET_LIB=-lsocket])
AC_SUBST(SOCKET_LIB)
dnl
+dnl Check to see if libdl exists for the sake of dlopen
+dnl
+DLOPEN_LIB=''
+AC_CHECK_LIB(dl, dlopen,
+[DLOPEN_LIB=-ldl
+AC_DEFINE(HAVE_DLOPEN)])
+AC_SUBST(DLOPEN_LIB)
+dnl
dnl See if optreset exists
dnl
AC_MSG_CHECKING(for optreset)
;;
esac
dnl
+dnl OS-specific uncomment control
+dnl
+LINUX_CMT="#"
+CYGWIN_CMT="#"
+UNIX_CMT=
+case "$host_os" in
+linux*)
+ LINUX_CMT=
+ ;;
+cygwin)
+ CYGWIN_CMT=
+ UNIX_CMT="#"
+ ;;
+esac
+AC_SUBST(LINUX_CMT)
+AC_SUBST(CYGWIN_CMT)
+AC_SUBST(UNIX_CMT)
+dnl
dnl Linux and Hurd places root files in the / by default
dnl
case "$host_os" in
-linux* | gnu*)
+linux* | gnu* | k*bsd*-gnu)
if test "$prefix" = NONE -a "$root_prefix" = NONE ; then
root_prefix="";
echo "On $host_os systems, root_prefix defaults to ''"
dnl On Linux/hurd, force the prefix to be /usr
dnl
case "$host_os" in
-linux* | gnu*)
+linux* | gnu* | k*bsd*-gnu)
if test "$prefix" = NONE ; then
prefix="/usr";
echo "On $host_os systems, prefix defaults to /usr"
+ if test "$mandir" = '${prefix}/man' ; then
+ echo "...and mandir defaults to /usr/share/man"
+ mandir=/usr/share/man
+ fi
fi
;;
esac
else
root_prefix="$prefix"
fi
+ root_bindir=$bindir
+ root_sbindir=$sbindir
+ root_libdir=$libdir
+ root_sysconfdir=$sysconfdir
+else
+ root_bindir='${root_prefix}/bin'
+ root_sbindir='${root_prefix}/sbin'
+ root_libdir='${root_prefix}/lib'
+ root_sysconfdir='${root_prefix}/etc'
fi
AC_SUBST(root_prefix)
+AC_SUBST(root_bindir)
+AC_SUBST(root_sbindir)
+AC_SUBST(root_libdir)
+AC_SUBST(root_sysconfdir)
dnl
dnl See if -static works.
dnl
fi
AC_SUBST(LDFLAG_STATIC)
dnl
+dnl Work around mysterious Darwin / GNU libintl problem
+dnl (__asm__ redirection doesn't work for some mysterious reason. Looks like
+dnl Apple hacked gcc somehow?)
+dnl
+case "$host_os" in
+darwin*)
+ echo "Using Apple Darwin / GNU libintl workaround"
+ AC_DEFINE(_INTL_REDIRECT_MACROS)
+ ;;
+esac
+dnl
dnl Make the ss and et directories work correctly.
dnl
SS_DIR=`cd ${srcdir}/lib/ss; pwd`
fi
AC_SUBST(DO_TEST_SUITE)
dnl
+dnl Only include the intl include files if we're building with them
+dnl
+INTL_FLAGS=
+if test "$USE_INCLUDED_LIBINTL" = "yes" ; then
+ INTL_FLAGS='-I$(top_builddir)/intl -I$(top_srcdir)/intl'
+fi
+AC_SUBST(INTL_FLAGS)
+dnl
dnl Make our output files, being sure that we create the some miscellaneous
dnl directories
dnl
test -d include || mkdir include
test -d include/linux || mkdir include/linux
test -d include/asm || mkdir include/asm
-rmakefile=
-if test -d ${srcdir}/resize ; then
- rmakefile=resize/Makefile
-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
- intl/Makefile po/Makefile.in)
+for i in MCONFIG Makefile e2fsprogs.spec \
+ util/Makefile util/subst.conf util/gen-tarball \
+ lib/et/Makefile lib/ss/Makefile lib/ext2fs/Makefile lib/e2p/Makefile \
+ lib/uuid/Makefile lib/uuid/uuid_types.h \
+ lib/blkid/Makefile lib/blkid/blkid_types.h \
+ misc/Makefile ext2ed/Makefile e2fsck/Makefile \
+ debugfs/Makefile tests/Makefile tests/progs/Makefile \
+ resize/Makefile doc/Makefile intl/Makefile po/Makefile.in ; do
+ if test -d `dirname ${srcdir}/$i` ; then
+ outlist="$outlist $i"
+ fi
+done
+AC_OUTPUT($outlist)
git://git.whamcloud.com / tools / e2fsprogs.git / blobdiff