# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS E2FSPROGS_YEAR E2FSPROGS_MONTH E2FSPROGS_DAY E2FSPROGS_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LD CPP EGREP LINUX_INCLUDE HTREE_CMT HTREE_CLR_CMT ELF_CMT BSDLIB_CMT PROFILE_CMT CHECKER_CMT LIB_EXT STATIC_LIB_EXT PROFILED_LIB_EXT SWAPFS_CMT DEBUGFS_CMT IMAGER_CMT RESIZER_CMT E2FSCK_TYPE FSCK_PROG FSCK_MAN E2INITRD_PROG E2INITRD_MAN GETTEXT_PACKAGE PACKAGE VERSION SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE RANLIB ac_ct_RANLIB ALLOCA GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB BINARY_TYPE LN LN_S MV CP RM CHMOD AWK SED PERL LDCONFIG AR ac_ct_AR STRIP ac_ct_STRIP BUILD_CC SIZEOF_SHORT SIZEOF_INT SIZEOF_LONG SIZEOF_LONG_LONG SOCKET_LIB DLOPEN_LIB LINUX_CMT CYGWIN_CMT UNIX_CMT root_prefix root_bindir root_sbindir root_libdir root_sysconfdir LDFLAG_STATIC SS_DIR ET_DIR DO_TEST_SUITE INTL_FLAGS LIBOBJS LTLIBOBJS'
-ac_subst_files='MCONFIG MAKEFILE_ELF MAKEFILE_BSDLIB MAKEFILE_PROFILE MAKEFILE_CHECKER MAKEFILE_LIBRARY'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS E2FSPROGS_YEAR E2FSPROGS_MONTH E2FSPROGS_DAY E2FSPROGS_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LD CPP EGREP LINUX_INCLUDE MAINTAINER_CMT HTREE_CMT ELF_CMT BSDLIB_CMT PROFILE_CMT CHECKER_CMT LIB_EXT STATIC_LIB_EXT PROFILED_LIB_EXT SWAPFS_CMT DEBUGFS_CMT IMAGER_CMT RESIZER_CMT E2FSCK_TYPE FSCK_PROG FSCK_MAN E2INITRD_PROG E2INITRD_MAN DEVMAPPER_REQ DEVMAPPER_PC_LIBS DEVMAPPER_LIBS STATIC_DEVMAPPER_LIBS GETTEXT_PACKAGE PACKAGE VERSION SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE RANLIB ac_ct_RANLIB ALLOCA GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB BINARY_TYPE LN LN_S MV CP RM CHMOD AWK SED PERL LDCONFIG AR ac_ct_AR STRIP ac_ct_STRIP BUILD_CC SIZEOF_SHORT SIZEOF_INT SIZEOF_LONG SIZEOF_LONG_LONG SOCKET_LIB DLOPEN_LIB LINUX_CMT CYGWIN_CMT UNIX_CMT root_prefix root_bindir root_sbindir root_libdir root_sysconfdir LDFLAG_STATIC SS_DIR ET_DIR DO_TEST_SUITE INTL_FLAGS BUILD_CFLAGS BUILD_LDFLAGS LIBOBJS LTLIBOBJS'
+ac_subst_files='MCONFIG MAKEFILE_ELF MAKEFILE_BSDLIB MAKEFILE_PROFILE MAKEFILE_CHECKER MAKEFILE_LIBRARY ASM_TYPES_HEADER'
# Initialize some variables set by options.
ac_init_help=
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-maintainer-mode enable makefile rules useful for maintainers
--enable-compression enable EXPERIMENTAL compression support
--enable-htree enable EXPERIMENTAL htree directory support
- --enable-htree-clear clear htree because we don't trust e2fsck
--enable-elf-shlibs select ELF shared libraries
--enable-bsd-shlibs select BSD shared libraries
--enable-profile build profiling libraries
--enable-dynamic-e2fsck build e2fsck dynamically
--enable-fsck build fsck wrapper program
--enable-e2initrd-helper build e2initrd-helper program
- --enable-old-bitops Use old (non-standard but native) bitmask operations
+ --enable-blkid-devmapper build with device-mapper support
--disable-nls do not use Native Language Support
--disable-rpath do not hardcode runtime library paths
root_prefix=$withval
else
root_prefix=NONE
-fi; # Check whether --enable-compression or --disable-compression was given.
+fi; # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
+ enableval="$enable_maintainer_mode"
+ if test "$enableval" = "no"
+then
+ MAINTAINER_CMT=#
+ echo "Disabling maintainer mode"
+else
+ MAINTAINER_CMT=
+ echo "Enabling maintainer mode"
+fi
+
+else
+ MAINTAINER_CMT=#
+echo "Disabling maintainer mode by default"
+
+fi;
+
+# Check whether --enable-compression or --disable-compression was given.
if test "${enable_compression+set}" = set; then
enableval="$enable_compression"
if test "$enableval" = "no"
fi;
-# Check whether --enable-htree-clear or --disable-htree-clear was given.
-if test "${enable_htree_clear+set}" = set; then
- enableval="$enable_htree_clear"
- if test "$enableval" = "no"
-then
- HTREE_CLR_CMT=#
- echo "Disabling htree clearing"
-else
- HTREE_CLR_CMT=
- cat >>confdefs.h <<\_ACEOF
-#define ENABLE_HTREE_CLEAR 1
-_ACEOF
-
- echo "Enabling htree clearing"
-fi
-
-else
- HTREE_CLR_CMT=#
-echo "Disabling htree clearing by default"
-
-fi;
-
# Check whether --enable-elf-shlibs or --disable-elf-shlibs was given.
if test "${enable_elf_shlibs+set}" = set; then
enableval="$enable_elf_shlibs"
fi;
-MAKEFILE_LIBRARY=$srcdir/lib/Makefile.library
-
-# Check whether --enable-old-bitops or --disable-old-bitops was given.
-if test "${enable_old_bitops+set}" = set; then
- enableval="$enable_old_bitops"
+# Check whether --enable-blkid-devmapper or --disable-blkid-devmapper was given.
+if test "${enable_blkid_devmapper+set}" = set; then
+ enableval="$enable_blkid_devmapper"
if test "$enableval" = "no"
then
- echo "Using new (standard) bitmask operations"
+ echo "Disabling device-mapper support"
+ DEVMAPPER_REQ=''
+ DEVMAPPER_LIBS=''
+ STATIC_DEVMAPPER_LIBS=''
else
cat >>confdefs.h <<\_ACEOF
-#define EXT2_OLD_BITOPS 1
+#define HAVE_DEVMAPPER 1
_ACEOF
- echo "Using old (native) bitmask operations"
+ echo "Enabling device-mapper support"
+
+ DEVMAPPER_REQ='libselinux libsepol'
+ DEVMAPPER_PC_LIBS='-ldevmapper'
+ DEVMAPPER_LIBS='-ldevmapper -lselinux -lsepol'
+ STATIC_DEVMAPPER_LIBS='/usr/lib/libdevmapper.a /usr/lib/libselinux.a /usr/lib/libsepol.a'
fi
else
- echo "Using standard bitmask operations by default"
+ echo "Disabling device-mapper support by default"
fi;
+
+
+
+
+MAKEFILE_LIBRARY=$srcdir/lib/Makefile.library
+
GETTEXT_PACKAGE=e2fsprogs
PACKAGE=e2fsprogs
VERSION="$E2FSPROGS_VERSION"
-for ac_header in 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/disklabel.h sys/ioctl.h sys/mkdev.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_dl.h netinet/in.h
+
+for ac_header in 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/disklabel.h sys/ioctl.h sys/mkdev.h sys/prctl.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_dl.h netinet/in.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
{ (exit 1); exit 1; }; } ;;
esac
+/bin/sh $ac_aux_dir/parse-types.sh
+ASM_TYPES_HEADER=./asm_types.h
+
for ac_header in inttypes.h
do
-for ac_func in chflags getrusage llseek lseek64 open64 getmntinfo strtoull strcasecmp srandom fchown mallinfo fdatasync strnlen strptime sysconf pathconf posix_memalign memalign valloc
+
+
+
+for ac_func in chflags getrusage llseek lseek64 open64 fstat64 getmntinfo strtoull strcasecmp srandom fchown mallinfo fdatasync strnlen strptime sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
INTL_FLAGS='-I$(top_builddir)/intl -I$(top_srcdir)/intl'
fi
+if test $cross_compiling = no; then
+ BUILD_CFLAGS="$CFLAGS"
+ BUILD_LDFLAGS="$LDFLAGS"
+else
+ BUILD_CFLAGS=
+ BUILD_LDFLAGS=
+fi
+
+
test -d lib || mkdir lib
test -d include || mkdir include
test -d include/linux || mkdir include/linux
test -d include/asm || mkdir include/asm
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/et/Makefile lib/ss/Makefile lib/e2p/Makefile \
+ lib/ext2fs/Makefile lib/ext2fs/ext2_types.h \
lib/uuid/Makefile lib/uuid/uuid_types.h \
lib/blkid/Makefile lib/blkid/blkid_types.h \
lib/ss/ss.pc lib/uuid/uuid.pc lib/et/com_err.pc \
s,@CPP@,$CPP,;t t
s,@EGREP@,$EGREP,;t t
s,@LINUX_INCLUDE@,$LINUX_INCLUDE,;t t
+s,@MAINTAINER_CMT@,$MAINTAINER_CMT,;t t
s,@HTREE_CMT@,$HTREE_CMT,;t t
-s,@HTREE_CLR_CMT@,$HTREE_CLR_CMT,;t t
s,@ELF_CMT@,$ELF_CMT,;t t
s,@BSDLIB_CMT@,$BSDLIB_CMT,;t t
s,@PROFILE_CMT@,$PROFILE_CMT,;t t
s,@FSCK_MAN@,$FSCK_MAN,;t t
s,@E2INITRD_PROG@,$E2INITRD_PROG,;t t
s,@E2INITRD_MAN@,$E2INITRD_MAN,;t t
+s,@DEVMAPPER_REQ@,$DEVMAPPER_REQ,;t t
+s,@DEVMAPPER_PC_LIBS@,$DEVMAPPER_PC_LIBS,;t t
+s,@DEVMAPPER_LIBS@,$DEVMAPPER_LIBS,;t t
+s,@STATIC_DEVMAPPER_LIBS@,$STATIC_DEVMAPPER_LIBS,;t t
s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
s,@PACKAGE@,$PACKAGE,;t t
s,@VERSION@,$VERSION,;t t
s,@ET_DIR@,$ET_DIR,;t t
s,@DO_TEST_SUITE@,$DO_TEST_SUITE,;t t
s,@INTL_FLAGS@,$INTL_FLAGS,;t t
+s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t
+s,@BUILD_LDFLAGS@,$BUILD_LDFLAGS,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
/@MCONFIG@/r $MCONFIG
s,@MAKEFILE_CHECKER@,,;t t
/@MAKEFILE_LIBRARY@/r $MAKEFILE_LIBRARY
s,@MAKEFILE_LIBRARY@,,;t t
+/@ASM_TYPES_HEADER@/r $ASM_TYPES_HEADER
+s,@ASM_TYPES_HEADER@,,;t t
CEOF
_ACEOF
$ac_cs_success || { (exit 1); exit 1; }
fi
+if test -f util/gen-tarball; then chmod +x util/gen-tarball; fi
+