AC_INIT(version.h)
-AC_PREREQ(2.54)
+AC_PREREQ(2.59)
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_HEADERS([lib/config.h])
AH_BOTTOM([#include <dirpaths.h>])
dnl
WITH_DIET_LIBC=
AC_ARG_WITH([diet-libc],
-[ --with-diet-libc use diet libc],
+AS_HELP_STRING([--with-diet-libc],[use diet libc]),
CC="diet cc -nostdinc"
WITH_DIET_LIBC=yes
if test -z "$LIBS"
AC_SUBST(DLOPEN_LIB)
dnl
AC_ARG_WITH([cc],
-AC_HELP_STRING([--with-cc],[no longer supported, use CC= instead]),
+AS_HELP_STRING([--with-cc],[no longer supported, use CC= instead]),
AC_MSG_ERROR([--with-cc no longer supported; use CC= instead]))
dnl
AC_ARG_WITH([ccopts],
-AC_HELP_STRING([--with-ccopts],[no longer supported, use CFLAGS= instead]),
+AS_HELP_STRING([--with-ccopts],[no longer supported, use CFLAGS= instead]),
AC_MSG_ERROR([--with-ccopts no longer supported; use CFLAGS= instead]))
dnl
AC_ARG_WITH([ldopts],
-AC_HELP_STRING([--with-ldopts],[no longer supported, use LDFLAGS= instead]),
+AS_HELP_STRING([--with-ldopts],[no longer supported, use LDFLAGS= instead]),
AC_MSG_ERROR([--with-ldopts no longer supported; use LDFLAGS= instead]))
dnl
AC_PROG_CC
dnl Allow separate `root_prefix' to be specified
dnl
AC_ARG_WITH([root-prefix],
-[ --with-root-prefix=PREFIX override prefix variable for files to be placed in the root],
+AS_HELP_STRING([--with-root-prefix=PREFIX],[override prefix variable for files to be placed in the root]),
root_prefix=$withval,
root_prefix=NONE)dnl
dnl
dnl handle --enable-maintainer-mode
dnl
AC_ARG_ENABLE([maintainer-mode],
-[ --enable-maintainer-mode enable makefile rules useful for maintainers],
+AS_HELP_STRING([--enable-maintainer-mode],[enable makefile rules useful for maintainers]),
if test "$enableval" = "no"
then
MAINTAINER_CMT=#
dnl handle --enable-symlink-install
dnl
AC_ARG_ENABLE([symlink-install],
-[ --enable-symlink-install use symlinks when installing instead of hard links],
+AS_HELP_STRING([--enable-symlink-install],[use symlinks when installing instead of hard links]),
if test "$enableval" = "no"
then
LINK_INSTALL_FLAGS=-f
dnl
relative_symlink_defined=
AC_ARG_ENABLE([relative-symlinks],
-[ --enable-relative-symlinks use relative symlinks when installing],
+AS_HELP_STRING([--enable-relative-symlinks],[use relative symlinks when installing]),
if test "$enableval" = "no"
then
SYMLINK_RELATIVE=
dnl handle --enable-symlink-build
dnl
AC_ARG_ENABLE([symlink-build],
-[ --enable-symlink-build use symlinks while building instead of hard links],
+AS_HELP_STRING([--enable-symlink-build],[use symlinks while building instead of hard links]),
if test "$enableval" = "no"
then
LINK_BUILD_FLAGS=
dnl handle --enable-verbose-makecmds
dnl
AC_ARG_ENABLE([verbose-makecmds],
-[ --enable-verbose-makecmds enable verbose make command output],
+AS_HELP_STRING([--enable-verbose-makecmds],[enable verbose make command output]),
if test "$enableval" = "no"
then
AC_MSG_RESULT([Disabling verbose make commands])
dnl handle --enable-elf-shlibs
dnl
AC_ARG_ENABLE([elf-shlibs],
-[ --enable-elf-shlibs select ELF shared libraries],
+AS_HELP_STRING([--enable-elf-shlibs],[select ELF shared libraries]),
if test "$enableval" = "no"
then
ELF_CMT=#
dnl handle --enable-bsd-shlibs
dnl
AC_ARG_ENABLE([bsd-shlibs],
-[ --enable-bsd-shlibs select BSD shared libraries],
+AS_HELP_STRING([--enable-bsd-shlibs],[select BSD shared libraries]),
if test "$enableval" = "no"
then
BSDLIB_CMT=#
dnl handle --enable-profile
dnl
AC_ARG_ENABLE([profile],
-[ --enable-profile build profiling libraries],
+AS_HELP_STRING([--enable-profile],[build profiling libraries]),
if test "$enableval" = "no"
then
PROFILE_CMT=#
dnl handle --enable-gcov
dnl
AC_ARG_ENABLE([gcov],
-[ --enable-gcov build for coverage testing using gcov],
+AS_HELP_STRING([--enable-gcov],[build for coverage testing using gcov]),
if test "$enableval" = "yes"
then
CFLAGS="-g -fprofile-arcs -ftest-coverage"
LDFLAGS_SHLIB=${LDFLAGS_SHLIB:-$LDFLAGS}
LDFLAGS_STATIC=${LDFLAGS_STATIC:-$LDFLAGS}
AC_ARG_ENABLE([hardening],
-[ --enable-hardening build for coverage testing using gcov],
+AS_HELP_STRING([--enable-hardening],[build for coverage testing using gcov]),
if test "$enableval" = "yes"
then
HARDEN_CFLAGS="-D_FORTIFY_SOURCE=2 -fstack-protector-strong"
dnl handle --enable-jbd-debug
dnl
AC_ARG_ENABLE([jbd-debug],
-[ --enable-jbd-debug enable journal debugging],
+AS_HELP_STRING([--enable-jbd-debug],[enable journal debugging]),
if test "$enableval" = "no"
then
AC_MSG_RESULT([Disabling journal debugging])
dnl handle --enable-blkid-debug
dnl
AC_ARG_ENABLE([blkid-debug],
-[ --enable-blkid-debug enable blkid debugging],
+AS_HELP_STRING([--enable-blkid-debug],[enable blkid debugging]),
if test "$enableval" = "no"
then
AC_MSG_RESULT([Disabling blkid debugging])
dnl handle --enable-testio-debug
dnl
AC_ARG_ENABLE([testio-debug],
-[ --disable-testio-debug disable the use of the test I/O manager for debugging],
+AS_HELP_STRING([--disable-testio-debug],[disable the use of the test I/O manager for debugging]),
AH_TEMPLATE([CONFIG_TESTIO_DEBUG],
[Define to 1 if the testio I/O manager should be enabled])
if test "$enableval" = "no"
)
AC_SUBST(TEST_IO_CMT)
dnl
+dnl handle --enable-developer-features
+dnl
+AC_ARG_ENABLE([developer-features],
+AS_HELP_STRING([--enable-developer-features],[enable features for use by ext4 developers]),
+AH_TEMPLATE([CONFIG_DEVELOPER_FEATURES],
+ [Define to 1 for features for use by ext4 developers])
+if test "$enableval" = "yes"
+then
+ DEV_FEATURES_CMT=
+ AC_DEFINE(CONFIG_DEVELOPER_FEATURES, 1)
+ AC_MSG_RESULT([Enabling ext4 developer features])
+else
+ AC_MSG_RESULT([Disabling ext4 developer features])
+ DEV_FEATURES_CMT="#"
+fi
+,
+AC_MSG_RESULT([Disabling ext4 developer features by default])
+DEV_FEATURES_CMT=
+)
+AC_SUBST(DEV_FEATURES_CMT)
+dnl
dnl handle --disable-libuuid
dnl
PKG_PROG_PKG_CONFIG
DEPPROFILED_LIBUUID=
UUID_CMT=
AC_ARG_ENABLE([libuuid],
-[ --enable-libuuid build and use private uuid library],
+AS_HELP_STRING([--enable-libuuid],[build and use private uuid library]),
if test "$enableval" = "no"
then
if test -z "$PKG_CONFIG"; then
BLKID_CMT=
AH_TEMPLATE([CONFIG_BUILD_FINDFS], [Define to 1 to compile findfs])
AC_ARG_ENABLE([libblkid],
-[ --enable-libblkid build and use private blkid library],
+AS_HELP_STRING([--enable-libblkid],[build and use private blkid library]),
if test "$enableval" = "no"
then
if test -z "$PKG_CONFIG"; then
ALL_CMT=
SUBSET_CMT=
AC_ARG_ENABLE([subset],
-[ --enable-subset enable subset-only build],
+AS_HELP_STRING([--enable-subset],[enable subset-only build]),
if test "$enableval" = "no"
then
SUBSET_CMT=#
dnl
AH_TEMPLATE([DISABLE_BACKTRACE], [Define to 1 to disable use of backtrace])
AC_ARG_ENABLE([backtrace],
-[ --disable-backtrace disable use backtrace],
+AS_HELP_STRING([--disable-backtrace],[disable use backtrace]),
if test "$enableval" = "no"
then
AC_MSG_RESULT([Disabling use of backtrace])
dnl handle --enable-debugfs
dnl
AC_ARG_ENABLE([debugfs],
-[ --disable-debugfs disable support of debugfs program],
+AS_HELP_STRING([--disable-debugfs],[disable support of debugfs program]),
if test "$enableval" = "no"
then
AC_MSG_RESULT([Disabling debugfs support])
dnl handle --enable-imager
dnl
AC_ARG_ENABLE([imager],
-[ --disable-imager disable support of e2image program],
+AS_HELP_STRING([--disable-imager],[disable support of e2image program]),
if test "$enableval" = "no"
then
AC_MSG_RESULT([Disabling e2image support])
dnl handle --enable-resizer
dnl
AC_ARG_ENABLE([resizer],
-[ --disable-resizer disable support of e2resize program],
+AS_HELP_STRING([--disable-resizer],[disable support of e2resize program]),
if test "$enableval" = "no"
then
AC_MSG_RESULT([Disabling e2resize support])
dnl handle --enable-defrag
dnl
AC_ARG_ENABLE([defrag],
-[ --disable-defrag disable support of e4defrag program],
+AS_HELP_STRING([--disable-defrag],[disable support of e4defrag program]),
if test "$enableval" = "no"
then
AC_MSG_RESULT([Disabling e4defrag support])
dnl See whether to install the `fsck' wrapper program (that calls e2fsck)
dnl
AC_ARG_ENABLE([fsck],
-[ --enable-fsck build fsck wrapper program],
+AS_HELP_STRING([--enable-fsck],[build fsck wrapper program]),
[if test "$enableval" = "no"
then
FSCK_PROG='' FSCK_MAN=''
dnl See whether to install the `e2initrd-helper' program
dnl
AC_ARG_ENABLE([e2initrd-helper],
-[ --enable-e2initrd-helper build e2initrd-helper program],
+AS_HELP_STRING([--enable-e2initrd-helper],[build e2initrd-helper program]),
[if test "$enableval" = "no"
then
E2INITRD_PROG='' E2INITRD_MAN=''
dnl
dnl
AC_ARG_ENABLE([tls],
-[ --disable-tls disable use of thread local support],
+AS_HELP_STRING([--disable-tls],[disable use of thread local support]),
[if test "$enableval" = "no"
then
try_tls=""
dnl
dnl
dnl
+AC_ARG_WITH([pthread],
+AS_HELP_STRING([--without-pthread],[disable use of pthread support]),
+[if test "$withval" = "no"
+then
+ try_pthread=""
+ AC_MSG_RESULT([Disabling pthread support])
+else
+ try_pthread="yes"
+ AC_MSG_RESULT([Testing for pthread support])
+fi]
+,
+try_pthread="yes"
+AC_MSG_RESULT([Try testing for pthread support by default])
+)
+if test "$try_pthread" = "yes"
+then
+AX_PTHREAD
+else
+test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
+AC_SUBST([PTHREAD_CC])
+fi
+dnl
+dnl
+dnl
AH_TEMPLATE([USE_UUIDD], [Define to 1 to build uuidd])
AC_ARG_ENABLE([uuidd],
-[ --disable-uuidd disable building the uuid daemon],
+AS_HELP_STRING([--disable-uuidd],[disable building the uuid daemon]),
[if test "$enableval" = "no"
then
AC_MSG_RESULT([Not building uuidd])
dnl
AH_TEMPLATE([CONFIG_MMP], [Define to 1 to enable mmp support])
AC_ARG_ENABLE([mmp],
-[ --disable-mmp disable support mmp, Multi Mount Protection],
+AS_HELP_STRING([--disable-mmp],[disable support mmp, Multi Mount Protection]),
if test "$enableval" = "no"
then
AC_MSG_RESULT([Disabling mmp support])
dnl
AH_TEMPLATE([CONFIG_TDB], [Define to 1 to enable tdb support])
AC_ARG_ENABLE([tdb],
-[ --disable-tdb disable tdb support],
+AS_HELP_STRING([--disable-tdb],[disable tdb support]),
if test "$enableval" = "no"
then
AC_MSG_RESULT([Disabling tdb support])
dnl
AH_TEMPLATE([ENABLE_BMAP_STATS], [Define to 1 to enable bitmap stats.])
AC_ARG_ENABLE([bmap-stats],
-[ --disable-bmap-stats disable collection of bitmap stats.],
+AS_HELP_STRING([--disable-bmap-stats],[disable collection of bitmap stats]),
if test "$enableval" = "no"
then
AC_MSG_RESULT([Disabling bitmap statistics support])
dnl
AH_TEMPLATE([ENABLE_BMAP_STATS_OPS], [Define to 1 to enable bitmap stats.])
AC_ARG_ENABLE([bmap-stats-ops],
-[ --enable-bmap-stats-ops enable collection of additional bitmap stats],
+AS_HELP_STRING([--enable-bmap-stats-ops],[enable collection of additional bitmap stats]),
if test "$enableval" = "no"
then
AC_MSG_RESULT([Disabling additional bitmap statistics])
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
-AM_GNU_GETTEXT
+AM_GNU_GETTEXT([external])
dnl
dnl End of configuration options
dnl
CHECK_GNU_MAKE
AC_PATH_PROG(LN, ln, ln)
AC_PROG_MKDIR_P
+dnl
+dnl @mkdir_p@ is used by po's Makefile.in
+dnl
+mkdir_p=$MKDIR_P
+AC_SUBST(mkdir_p)
AC_PROG_LN_S
AC_PATH_PROG(MV, mv, mv)
AC_PATH_PROG(CP, cp, cp)
malloc.h
mntent.h
paths.h
+ pthread.h
semaphore.h
setjmp.h
signal.h
sys/sockio.h
sys/stat.h
sys/syscall.h
- sys/sysctl.h
sys/sysmacros.h
sys/time.h
sys/types.h
FUSE_LIB=
dnl osxfuse.dylib supersedes fuselib.dylib
AC_ARG_ENABLE([fuse2fs],
-[ --disable-fuse2fs do not build fuse2fs],
+AS_HELP_STRING([--disable-fuse2fs],[do not build fuse2fs]),
if test "$enableval" = "no"
then
FUSE_CMT="#"
dnl Enable LTO for all packages
dnl
AC_ARG_ENABLE([lto],
-[ --enable-lto enable link time optimization],,
+AS_HELP_STRING([--enable-lto],[enable link time optimization]),,
enable_lto=no)
if test "$enable_lto" = "yes" || test "$enable_lto" = "probe"; then
AC_MSG_CHECKING([if C compiler supports LTO])
dnl Enable UBSAN for all packages
dnl
AC_ARG_ENABLE([ubsan],
-[ --enable-ubsan enable undefined behavior sanitizer],,
+AS_HELP_STRING([--enable-ubsan],[enable undefined behavior sanitizer]),,
enable_ubsan=no)
if test "$enable_ubsan" = "yes" || test "$enable_ubsan" = "probe"; then
AC_MSG_CHECKING([if C compiler supports UBSAN])
dnl Enable ADDRSAN for all packages
dnl
AC_ARG_ENABLE([addrsan],
-[ --enable-addrsan enable address sanitizer],,
+AS_HELP_STRING([--enable-addrsan],[enable address sanitizer]),,
enable_addrsan=no)
if test "$enable_addrsan" = "yes" || test "$enable_addrsan" = "probe"; then
AC_MSG_CHECKING([if C compiler supports ADDRSAN])
dnl Enable THREADSAN for all packages
dnl
AC_ARG_ENABLE([threadsan],
-[ --enable-threadsan enable thread sanitizer],,
+AS_HELP_STRING([--enable-threadsan],[enable thread sanitizer]),,
enable_threadsan=no)
if test "$enable_threadsan" = "yes" || test "$enable_threadsan" = "probe"; then
AC_MSG_CHECKING([if C compiler supports THREADSAN])
dnl Allow specification of the multiarch arch
dnl
AC_ARG_WITH([multiarch],
-[ --with-multiarch=ARCH specify the multiarch triplet],
+AS_HELP_STRING([--with-multiarch=ARCH],[specify the multiarch triplet]),
if test "$withval" = "lib64"; then
libdir=/usr/lib64
root_libdir=/lib64
lib/blkid/blkid_types.h"
fi
for i in MCONFIG Makefile \
+ e2fsprogs-RHEL-6.spec \
+ e2fsprogs-SUSE_LINUX-11+12+15.spec \
+ e2fsprogs-RHEL-7+8.spec \
util/Makefile util/subst.conf util/gen-tarball util/install-symlink \
lib/et/Makefile lib/ss/Makefile lib/e2p/Makefile \
lib/ext2fs/Makefile lib/ext2fs/ext2_types.h \
lib/ss/ss.pc lib/et/com_err.pc lib/e2p/e2p.pc lib/ext2fs/ext2fs.pc \
misc/Makefile ext2ed/Makefile e2fsck/Makefile \
debugfs/Makefile tests/Makefile tests/progs/Makefile \
- resize/Makefile doc/Makefile intl/Makefile \
- intl/libgnuintl.h po/Makefile.in scrub/Makefile; do
+ resize/Makefile doc/Makefile po/Makefile.in scrub/Makefile; do
if test -d `dirname ${srcdir}/$i` ; then
outlist="$outlist $i"
fi