X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=configure;h=486ebc35002c9a6abcd4083821bc597beffc044b;hb=91819cd70924d2654b9328490b9c7f93f69d7d74;hp=fb9c81fc8a7ca7a56717da39d573b68aa3eb3d7f;hpb=e3d10158e612ed63be7850b75054638b93f69258;p=tools%2Fe2fsprogs.git diff --git a/configure b/configure index fb9c81f..486ebc3 100755 --- a/configure +++ b/configure @@ -625,14 +625,15 @@ gl_use_threads_default= ac_func_list= ac_subst_vars='LTLIBOBJS LIBOBJS +LDFLAGS_SHLIB +CFLAGS_STLIB +CFLAGS_SHLIB BUILD_LDFLAGS BUILD_CFLAGS MKINSTALLDIRS INCLUDES DO_TEST_SUITE -ET_DIR -SS_DIR -LDFLAG_STATIC +LDFLAGS_STATIC root_sysconfdir root_libdir root_sbindir @@ -643,12 +644,18 @@ CYGWIN_CMT LINUX_CMT UNI_DIFF_OPTS SEM_INIT_LIB +FUSE_CMT +FUSE_LIB +CLOCK_GETTIME_LIB +MAGIC_LIB SOCKET_LIB +SIZEOF_TIME_T SIZEOF_OFF_T SIZEOF_LONG_LONG SIZEOF_LONG SIZEOF_INT SIZEOF_SHORT +DD BUILD_CC MAKEINFO STRIP @@ -724,6 +731,8 @@ SET_MAKE VERSION PACKAGE GETTEXT_PACKAGE +TDB_MAN_COMMENT +TDB_CMT UUIDD_CMT E2INITRD_MAN E2INITRD_PROG @@ -733,14 +742,6 @@ DEFRAG_CMT RESIZER_CMT IMAGER_CMT DEBUGFS_CMT -QUOTA_CMT -DEPPROFILED_LIBQUOTA -PROFILED_LIBQUOTA -DEPSTATIC_LIBQUOTA -STATIC_LIBQUOTA -DEPLIBQUOTA -LIBQUOTA -QUOTA_MAN_COMMENT BLKID_CMT DEPPROFILED_LIBBLKID PROFILED_LIBBLKID @@ -767,7 +768,6 @@ LIB_EXT PROFILE_CMT BSDLIB_CMT ELF_CMT -HTREE_CMT Q ES E @@ -819,6 +819,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -858,18 +859,16 @@ enable_relative_symlinks enable_symlink_relative_symlinks enable_symlink_build enable_verbose_makecmds -enable_compression -enable_htree enable_elf_shlibs enable_bsd_shlibs enable_profile enable_gcov +enable_hardening enable_jbd_debug enable_blkid_debug enable_testio_debug enable_libuuid enable_libblkid -enable_quota enable_backtrace enable_debugfs enable_imager @@ -879,6 +878,10 @@ enable_fsck enable_e2initrd_helper enable_tls enable_uuidd +enable_mmp +enable_tdb +enable_bmap_stats +enable_bmap_stats_ops enable_nls enable_threads with_gnu_ld @@ -887,6 +890,7 @@ with_libpth_prefix with_libiconv_prefix with_included_gettext with_libintl_prefix +enable_fuse2fs with_multiarch ' ac_precious_vars='build_alias @@ -939,6 +943,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -1191,6 +1196,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1328,7 +1342,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1481,6 +1495,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1518,18 +1533,16 @@ Optional Features: --enable-symlink-build use symlinks while building instead of hard links --enable-verbose-makecmds enable verbose make command output - --enable-compression enable EXPERIMENTAL compression support - --enable-htree enable EXPERIMENTAL htree directory support --enable-elf-shlibs select ELF shared libraries --enable-bsd-shlibs select BSD shared libraries --enable-profile build profiling libraries --enable-gcov build for coverage testing using gcov + --enable-hardening build for coverage testing using gcov --enable-jbd-debug enable journal debugging --enable-blkid-debug enable blkid debugging --disable-testio-debug disable the use of the test I/O manager for debugging - --disable-libuuid do not build private uuid library - --disable-libblkid do not build private blkid library - --enable-quota enable quota support + --enable-libuuid build and use private uuid library + --enable-libblkid build and use private blkid library --disable-backtrace disable use backtrace --disable-debugfs disable support of debugfs program --disable-imager disable support of e2image program @@ -1539,11 +1552,16 @@ Optional Features: --enable-e2initrd-helper build e2initrd-helper program --disable-tls disable use of thread local support --disable-uuidd disable building the uuid daemon + --disable-mmp disable support mmp, Multi Mount Protection + --disable-tdb disable tdb support + --disable-bmap-stats disable collection of bitmap stats. + --enable-bmap-stats-ops enable collection of additional bitmap stats --disable-nls do not use Native Language Support --enable-threads={posix|solaris|pth|windows} specify multithreading API --disable-threads build without multithread safety --disable-rpath do not hardcode runtime library paths + --disable-fuse2fs do not build fuse2fs Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -2742,7 +2760,7 @@ E2FSPROGS_VERSION=`grep E2FSPROGS_VERSION ${srcdir}/version.h \ | 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}'` +E2FSPROGS_DAY=$(echo $DATE | awk -F- '{print $1}' | sed -e '/^[1-9]$/s/^/0/') MONTH=`echo $DATE | awk -F- '{print $2}'` YEAR=`echo $DATE | awk -F- '{print $3}'` @@ -2778,7 +2796,7 @@ date_spec=${E2FSPROGS_YEAR}.${MONTH_NUM}.${E2FSPROGS_DAY} case $E2FSPROGS_VERSION in *-WIP|pre-*) - E2FSPROGS_PKGVER="$base_ver~WIP-$E2FSPROGS_YEAR-$MONTH_NUM-$E2FSPROGS_DAY" + E2FSPROGS_PKGVER="$base_ver~WIP.$date_spec" ;; *) E2FSPROGS_PKGVER="$base_ver" @@ -3710,9 +3728,6 @@ fi $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : DLOPEN_LIB=-ldl - -$as_echo "#define HAVE_DLOPEN 1" >>confdefs.h - fi @@ -4895,54 +4910,6 @@ fi -# Check whether --enable-compression was given. -if test "${enable_compression+set}" = set; then : - enableval=$enable_compression; if test "$enableval" = "no" -then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling compression support" >&5 -$as_echo "Disabling compression support" >&6; } -else - -$as_echo "#define ENABLE_COMPRESSION 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling compression support" >&5 -$as_echo "Enabling compression support" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Compression support is experimental" >&5 -$as_echo "$as_me: WARNING: Compression support is experimental" >&2;} -fi - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling compression support by default" >&5 -$as_echo "Disabling compression support by default" >&6; } - -fi - - -# Check whether --enable-htree was given. -if test "${enable_htree+set}" = set; then : - enableval=$enable_htree; if test "$enableval" = "no" -then - HTREE_CMT=# - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling htree directory support" >&5 -$as_echo "Disabling htree directory support" >&6; } -else - HTREE_CMT= - $as_echo "#define ENABLE_HTREE 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling htree directory support" >&5 -$as_echo "Enabling htree directory support" >&6; } -fi - -else - HTREE_CMT= -$as_echo "#define ENABLE_HTREE 1" >>confdefs.h - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling htree directory support by default" >&5 -$as_echo "Enabling htree directory support by default" >&6; } - -fi - - E2_PKG_CONFIG_STATIC=--static LDFLAG_DYNAMIC= PRIVATE_LIBS_CMT= @@ -5052,6 +5019,27 @@ fi fi +CFLAGS_SHLIB="${CFLAGS_SHLIB:-$CFLAGS}" +CFLAGS_STLIB="${CFLAGS_STLIB:-$CFLAGS}" +LDFLAGS_SHLIB=${LDFLAGS_SHLIB:-$LDFLAGS} +LDFLAGS_STATIC=${LDFLAGS_STATIC:-$LDFLAGS} +# Check whether --enable-hardening was given. +if test "${enable_hardening+set}" = set; then : + enableval=$enable_hardening; if test "$enableval" = "yes" +then + HARDEN_CFLAGS="-D_FORTIFY_SOURCE=2 -fstack-protector-strong" + HARDEN_LDFLAGS="-Wl,-z,relro -Wl,-z,now" + CFLAGS="$CFLAGS $HARDEN_CFLAGS -fPIE" + CFLAGS_SHLIB="$CFLAGS_SHLIB $HARDEN_CFLAGS" + CFLAGS_STLIB="$CFLAGS_STLIB $HARDEN_CFLAGS -fPIE" + LDFLAGS="$LDFLAGS $HARDEN_LDFLAGS -fPIE -pie" + LDFLAGS_STATIC="$LDFLAGS_STATIC $HARDEN_LDFLAGS" + LDFLAGS_SHLIB="$LDFLAGS_SHLIB $HARDEN_LDFLAGS" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling hardening support" >&5 +$as_echo "Enabling hardening support" >&6; } +fi + +fi @@ -5318,14 +5306,64 @@ $as_echo "Enabling private uuid library" >&6; } fi else - LIBUUID='$(LIB)/libuuid'$LIB_EXT -DEPLIBUUID=$LIBUUID -STATIC_LIBUUID='$(LIB)/libuuid'$STATIC_LIB_EXT -DEPSTATIC_LIBUUID=$STATIC_LIBUUID -PROFILED_LIBUUID='$(LIB)/libuuid'$PROFILED_LIB_EXT -DEPPROFILED_LIBUUID=$PROFILED_LIBUUID -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling private uuid library by default" >&5 + if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5 +$as_echo_n "checking for uuid_generate in -luuid... " >&6; } +if ${ac_cv_lib_uuid_uuid_generate+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-luuid $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char uuid_generate (); +int +main () +{ +return uuid_generate (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_uuid_uuid_generate=yes +else + ac_cv_lib_uuid_uuid_generate=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate" >&5 +$as_echo "$ac_cv_lib_uuid_uuid_generate" >&6; } +if test "x$ac_cv_lib_uuid_uuid_generate" = xyes; then : + LIBUUID=`$PKG_CONFIG --libs uuid`; + STATIC_LIBUUID=`$PKG_CONFIG --static --libs uuid` +fi + +fi +if test -n "$LIBUUID"; then + PROFILED_LIBUUID=$LIBUUID + UUID_CMT=# + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using system uuid by default" >&5 +$as_echo "Using system uuid by default" >&6; } +else + LIBUUID='$(LIB)/libuuid'$LIB_EXT + DEPLIBUUID=$LIBUUID + STATIC_LIBUUID='$(LIB)/libuuid'$STATIC_LIB_EXT + DEPSTATIC_LIBUUID=$STATIC_LIBUUID + PROFILED_LIBUUID='$(LIB)/libuuid'$PROFILED_LIB_EXT + DEPPROFILED_LIBUUID=$PROFILED_LIBUUID + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling private uuid library by default" >&5 $as_echo "Enabling private uuid library by default" >&6; } +fi fi @@ -5533,180 +5571,69 @@ $as_echo "Enabling private blkid library" >&6; } fi else - LIBBLKID='$(LIB)/libblkid'$LIB_EXT -DEPLIBBLKID=$LIBBLKID -STATIC_LIBBLKID='$(LIB)/libblkid'$STATIC_LIB_EXT -DEPSTATIC_LIBBLKID=$STATIC_LIBBLKID -PROFILED_LIBBLKID='$(LIB)/libblkid'$PROFILED_LIB_EXT -DEPPROFILED_LIBBLKID=$PROFILED_LIBBLKID -$as_echo "#define CONFIG_BUILD_FINDFS 1" >>confdefs.h - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling private blkid library by default" >&5 -$as_echo "Enabling private blkid library by default" >&6; } - -fi - - - - - - - - -QUOTA_MAN_COMMENT='.\"' -QUOTA_CMT= - - - - - - - - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : + if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for blkid_get_cache in -lblkid" >&5 +$as_echo_n "checking for blkid_get_cache in -lblkid... " >&6; } +if ${ac_cv_lib_blkid_blkid_get_cache+:} false; then : $as_echo_n "(cached) " >&6 else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - + ac_check_lib_save_LIBS=$LIBS +LIBS="-lblkid $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char blkid_get_cache (); +int +main () +{ +return blkid_get_cache (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_blkid_blkid_get_cache=yes else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac + ac_cv_lib_blkid_blkid_get_cache=no fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi - - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_blkid_blkid_get_cache" >&5 +$as_echo "$ac_cv_lib_blkid_blkid_get_cache" >&6; } +if test "x$ac_cv_lib_blkid_blkid_get_cache" = xyes; then : + LIBBLKID=`$PKG_CONFIG --libs blkid`; + STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid` fi fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - PKG_CONFIG="" - fi -fi - -# Check whether --enable-quota was given. -if test "${enable_quota+set}" = set; then : - enableval=$enable_quota; if test "$enableval" = "no" -then - QUOTA_CMT=# - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling quota support" >&5 -$as_echo "Disabling quota support" >&6; } +if test -n "$LIBBLKID"; then + BLKID_CMT=# + PROFILED_LIBBLKID=$LIBBLKID + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using system blkid library by default" >&5 +$as_echo "Using system blkid library by default" >&6; } else - QUOTA_CMT= - $as_echo "#define CONFIG_QUOTA 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling quota support" >&5 -$as_echo "Enabling quota support" >&6; } - QUOTA_MAN_COMMENT="" + LIBBLKID='$(LIB)/libblkid'$LIB_EXT + DEPLIBBLKID=$LIBBLKID + STATIC_LIBBLKID='$(LIB)/libblkid'$STATIC_LIB_EXT + DEPSTATIC_LIBBLKID=$STATIC_LIBBLKID + PROFILED_LIBBLKID='$(LIB)/libblkid'$PROFILED_LIB_EXT + DEPPROFILED_LIBBLKID=$PROFILED_LIBBLKID + $as_echo "#define CONFIG_BUILD_FINDFS 1" >>confdefs.h + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling private blkid library by default" >&5 +$as_echo "Enabling private blkid library by default" >&6; } fi -else - QUOTA_CMT=# -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling quota support by default" >&5 -$as_echo "Disabling quota support by default" >&6; } - fi -LIBQUOTA='$(LIB)/libquota'$LIB_EXT -DEPLIBQUOTA=$LIBQUOTA -STATIC_LIBQUOTA='$(LIB)/libquota'$STATIC_LIB_EXT -DEPSTATIC_LIBQUOTA=$STATIC_LIBQUOTA -PROFILED_LIBQUOTA='$(LIB)/libquota'$PROFILED_LIB_EXT -DEPPROFILED_LIBQUOTA=$PROFILED_LIBQUOTA @@ -5991,11 +5918,112 @@ fi fi -MAKEFILE_LIBRARY=$srcdir/lib/Makefile.library -GETTEXT_PACKAGE=e2fsprogs -PACKAGE=e2fsprogs -VERSION="$E2FSPROGS_VERSION" +# Check whether --enable-mmp was given. +if test "${enable_mmp+set}" = set; then : + enableval=$enable_mmp; if test "$enableval" = "no" +then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling mmp support" >&5 +$as_echo "Disabling mmp support" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling mmp support" >&5 +$as_echo "Enabling mmp support" >&6; } + $as_echo "#define CONFIG_MMP 1" >>confdefs.h + +fi + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling mmp support by default" >&5 +$as_echo "Enabling mmp support by default" >&6; } +$as_echo "#define CONFIG_MMP 1" >>confdefs.h + + +fi + + +# Check whether --enable-tdb was given. +if test "${enable_tdb+set}" = set; then : + enableval=$enable_tdb; if test "$enableval" = "no" +then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling tdb support" >&5 +$as_echo "Disabling tdb support" >&6; } + TDB_CMT="#" + TDB_MAN_COMMENT='.\"' +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling tdb support" >&5 +$as_echo "Enabling tdb support" >&6; } + $as_echo "#define CONFIG_TDB 1" >>confdefs.h + + TDB_CMT="" + TDB_MAN_COMMENT="" +fi + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling mmp support by default" >&5 +$as_echo "Enabling mmp support by default" >&6; } +$as_echo "#define CONFIG_TDB 1" >>confdefs.h + +TDB_CMT="" +TDB_MAN_COMMENT="" + +fi + + + + +# Check whether --enable-bmap-stats was given. +if test "${enable_bmap_stats+set}" = set; then : + enableval=$enable_bmap_stats; if test "$enableval" = "no" +then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling bitmap statistics support" >&5 +$as_echo "Disabling bitmap statistics support" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling bitmap statistics support" >&5 +$as_echo "Enabling bitmap statistics support" >&6; } + $as_echo "#define ENABLE_BMAP_STATS 1" >>confdefs.h + +fi + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling bitmap statistics support by default" >&5 +$as_echo "Enabling bitmap statistics support by default" >&6; } +$as_echo "#define ENABLE_BMAP_STATS 1" >>confdefs.h + + +fi + + +# Check whether --enable-bmap-stats-ops was given. +if test "${enable_bmap_stats_ops+set}" = set; then : + enableval=$enable_bmap_stats_ops; if test "$enableval" = "no" +then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling additional bitmap statistics" >&5 +$as_echo "Disabling additional bitmap statistics" >&6; } +else + if test "x${enable_bmap_stats}" = "xno"; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "Error --enable-bmap-stats-ops requires bmap-stats +See \`config.log' for more details" "$LINENO" 5; } +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling additional bitmap statistics" >&5 +$as_echo "Enabling additional bitmap statistics" >&6; } + $as_echo "#define ENABLE_BMAP_STATS_OPS 1" >>confdefs.h + +fi + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling additional bitmap statistics by default" >&5 +$as_echo "Disabling additional bitmap statistics by default" >&6; } + +fi + +MAKEFILE_LIBRARY=$srcdir/lib/Makefile.library + +GETTEXT_PACKAGE=e2fsprogs +PACKAGE=e2fsprogs +VERSION="$E2FSPROGS_VERSION" VERSION=0.14.1 cat >>confdefs.h <<_ACEOF @@ -7208,6 +7236,8 @@ main () if (*(data + i) != *(data3 + i)) return 14; close (fd); + free (data); + free (data3); return 0; } _ACEOF @@ -11488,7 +11518,12 @@ if ${_cv_gnu_make_command+:} false; then : $as_echo_n "(cached) " >&6 else _cv_gnu_make_command='' ; - for a in "$MAKE" make gmake gnumake ; do + if test -n "$FORCE_NATIVE_MAKE" ; then + MAKES="make" + else + MAKES="make gmake gnumake" + fi + for a in "$MAKE" $MAKES ; do if test -z "$a" ; then continue ; fi ; if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then _cv_gnu_make_command=$a ; @@ -12273,7 +12308,7 @@ fi if test "_$MAKEINFO" = "_"; then - MAKEINFO="@echo Makeinfo is missing. Info documentation will not be built.;true" + MAKEINFO="echo Makeinfo is missing. Info documentation will not be built." else case "$MAKEINFO" in */missing.*) @@ -12336,7 +12371,7 @@ fi done fi -for ac_header in dirent.h errno.h execinfo.h getopt.h malloc.h mntent.h paths.h semaphore.h setjmp.h signal.h stdarg.h stdint.h stdlib.h termios.h termio.h unistd.h utime.h linux/falloc.h linux/fd.h linux/major.h linux/loop.h net/if_dl.h netinet/in.h sys/disklabel.h sys/disk.h sys/file.h sys/ioctl.h sys/mkdev.h sys/mman.h sys/mount.h sys/prctl.h sys/resource.h sys/select.h sys/socket.h sys/sockio.h sys/stat.h sys/syscall.h sys/sysmacros.h sys/time.h sys/types.h sys/un.h sys/wait.h +for ac_header in attr/xattr.h dirent.h errno.h execinfo.h getopt.h malloc.h mntent.h paths.h semaphore.h setjmp.h signal.h stdarg.h stdint.h stdlib.h termios.h termio.h unistd.h utime.h attr/xattr.h linux/falloc.h linux/fd.h linux/fsmap.h linux/major.h linux/loop.h linux/types.h net/if_dl.h netinet/in.h sys/acl.h sys/disklabel.h sys/disk.h sys/file.h sys/ioctl.h sys/key.h sys/mkdev.h sys/mman.h sys/mount.h sys/prctl.h sys/resource.h sys/select.h sys/socket.h sys/sockio.h sys/stat.h sys/syscall.h sys/sysctl.h sys/sysmacros.h sys/time.h sys/types.h sys/un.h sys/wait.h sys/xattr.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -12349,6 +12384,27 @@ fi done +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a dd(1) program that supports iflag=fullblock" >&5 +$as_echo_n "checking for a dd(1) program that supports iflag=fullblock... " >&6; } +DD= +for i in dd gdd ; do + if "$i" if=/dev/null of=/dev/null count=1 bs=10k 2>/dev/null iflag=fullblock oflag=append ; then + DD=$i + break + fi +done +if test -n "$DD" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DD" >&5 +$as_echo "$DD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found, using dd" >&5 +$as_echo "not found, using dd" >&6; } + DD=dd + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No GNU-compatible dd(1) program found, expect some self-test failures." >&5 +$as_echo "$as_me: WARNING: No GNU-compatible dd(1) program found, expect some self-test failures." >&2;} +fi + + for ac_header in net/if.h do : ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" " @@ -12597,11 +12653,46 @@ cat >>confdefs.h <<_ACEOF _ACEOF +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5 +$as_echo_n "checking size of time_t... " >&6; } +if ${ac_cv_sizeof_time_t+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_time_t" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (time_t) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_time_t=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_time_t" >&5 +$as_echo "$ac_cv_sizeof_time_t" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_TIME_T $ac_cv_sizeof_time_t +_ACEOF + + SIZEOF_SHORT=$ac_cv_sizeof_short SIZEOF_INT=$ac_cv_sizeof_int SIZEOF_LONG=$ac_cv_sizeof_long SIZEOF_LONG_LONG=$ac_cv_sizeof_long_long SIZEOF_OFF_T=$ac_cv_sizeof_off_t +SIZEOF_TIME_T=$ac_cv_sizeof_time_t + @@ -13003,7 +13094,10 @@ if test "$ac_res" != no; then : fi fi -for ac_func in __secure_getenv backtrace blkid_probe_get_topology blkid_probe_enable_partitions chflags fadvise64 fallocate fallocate64 fchown fdatasync fstat64 ftruncate64 futimes getcwd getdtablesize getmntinfo getpwuid_r getrlimit getrusage jrand48 llseek lseek64 mallinfo mbstowcs memalign mempcpy mmap msync nanosleep open64 pathconf posix_fadvise posix_fadvise64 posix_memalign prctl pread pwrite pread64 pwrite64 secure_getenv setmntent setresgid setresuid snprintf srandom stpcpy strcasecmp strdup strnlen strptime strtoull sync_file_range sysconf usleep utime valloc +if test -n "$DLOPEN_LIB" ; then + ac_cv_func_dlopen=yes +fi +for ac_func in __secure_getenv add_key backtrace blkid_probe_get_topology blkid_probe_enable_partitions chflags dlopen fadvise64 fallocate fallocate64 fchown fcntl fdatasync fstat64 fsync ftruncate64 futimes getcwd getdtablesize gethostname getmntinfo getpwuid_r getrlimit getrusage jrand48 keyctl llistxattr llseek lseek64 mallinfo mbstowcs memalign mempcpy mmap msync nanosleep open64 pathconf posix_fadvise posix_fadvise64 posix_memalign prctl pread pwrite pread64 pwrite64 secure_getenv setmntent setresgid setresuid snprintf srandom stpcpy strcasecmp strdup strnlen strptime strtoull sync_file_range sysconf usleep utime utimes valloc do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -13057,6 +13151,370 @@ if test "x$ac_cv_lib_socket_socket" = xyes; then : fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for magic_file in -lmagic" >&5 +$as_echo_n "checking for magic_file in -lmagic... " >&6; } +if ${ac_cv_lib_magic_magic_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmagic $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char magic_file (); +int +main () +{ +return magic_file (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_magic_magic_file=yes +else + ac_cv_lib_magic_magic_file=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_magic_magic_file" >&5 +$as_echo "$ac_cv_lib_magic_magic_file" >&6; } +if test "x$ac_cv_lib_magic_magic_file" = xyes; then : + MAGIC_LIB=-lmagic +for ac_header in magic.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "magic.h" "ac_cv_header_magic_h" "$ac_includes_default" +if test "x$ac_cv_header_magic_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_MAGIC_H 1 +_ACEOF + +fi + +done + +fi + +if test "$ac_cv_func_dlopen" = yes ; then + MAGIC_LIB=$DLOPEN_LIB +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5 +$as_echo_n "checking for clock_gettime in -lrt... " >&6; } +if ${ac_cv_lib_rt_clock_gettime+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lrt $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char clock_gettime (); +int +main () +{ +return clock_gettime (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_rt_clock_gettime=yes +else + ac_cv_lib_rt_clock_gettime=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5 +$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; } +if test "x$ac_cv_lib_rt_clock_gettime" = xyes; then : + CLOCK_GETTIME_LIB=-lrt +fi + + +FUSE_CMT= +FUSE_LIB= +# Check whether --enable-fuse2fs was given. +if test "${enable_fuse2fs+set}" = set; then : + enableval=$enable_fuse2fs; if test "$enableval" = "no" +then + FUSE_CMT="#" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling fuse2fs" >&5 +$as_echo "Disabling fuse2fs" >&6; } +else + for ac_header in pthread.h fuse.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#define _FILE_OFFSET_BITS 64 +#define FUSE_USE_VERSION 29 +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "Cannot find fuse2fs headers. +See \`config.log' for more details" "$LINENO" 5; } +fi + +done + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define FUSE_USE_VERSION 29 +#ifdef __linux__ +#include +#include +#include +#endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "Cannot find fuse2fs Linux headers. +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fuse_main in -losxfuse" >&5 +$as_echo_n "checking for fuse_main in -losxfuse... " >&6; } +if ${ac_cv_lib_osxfuse_fuse_main+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-losxfuse $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char fuse_main (); +int +main () +{ +return fuse_main (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_osxfuse_fuse_main=yes +else + ac_cv_lib_osxfuse_fuse_main=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_osxfuse_fuse_main" >&5 +$as_echo "$ac_cv_lib_osxfuse_fuse_main" >&6; } +if test "x$ac_cv_lib_osxfuse_fuse_main" = xyes; then : + FUSE_LIB=-losxfuse +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fuse_main in -lfuse" >&5 +$as_echo_n "checking for fuse_main in -lfuse... " >&6; } +if ${ac_cv_lib_fuse_fuse_main+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lfuse $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char fuse_main (); +int +main () +{ +return fuse_main (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_fuse_fuse_main=yes +else + ac_cv_lib_fuse_fuse_main=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fuse_fuse_main" >&5 +$as_echo "$ac_cv_lib_fuse_fuse_main" >&6; } +if test "x$ac_cv_lib_fuse_fuse_main" = xyes; then : + FUSE_LIB=-lfuse +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "Cannot find fuse library. +See \`config.log' for more details" "$LINENO" 5; } +fi + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling fuse2fs" >&5 +$as_echo "Enabling fuse2fs" >&6; } +fi + +else + for ac_header in pthread.h fuse.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#define _FILE_OFFSET_BITS 64 +#define FUSE_USE_VERSION 29 +#ifdef __linux__ +# include +# include +# include +#endif +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +else + FUSE_CMT="#" +fi + +done + +if test -z "$FUSE_CMT" +then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fuse_main in -losxfuse" >&5 +$as_echo_n "checking for fuse_main in -losxfuse... " >&6; } +if ${ac_cv_lib_osxfuse_fuse_main+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-losxfuse $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char fuse_main (); +int +main () +{ +return fuse_main (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_osxfuse_fuse_main=yes +else + ac_cv_lib_osxfuse_fuse_main=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_osxfuse_fuse_main" >&5 +$as_echo "$ac_cv_lib_osxfuse_fuse_main" >&6; } +if test "x$ac_cv_lib_osxfuse_fuse_main" = xyes; then : + FUSE_LIB=-losxfuse +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fuse_main in -lfuse" >&5 +$as_echo_n "checking for fuse_main in -lfuse... " >&6; } +if ${ac_cv_lib_fuse_fuse_main+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lfuse $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char fuse_main (); +int +main () +{ +return fuse_main (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_fuse_fuse_main=yes +else + ac_cv_lib_fuse_fuse_main=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fuse_fuse_main" >&5 +$as_echo "$ac_cv_lib_fuse_fuse_main" >&6; } +if test "x$ac_cv_lib_fuse_fuse_main" = xyes; then : + FUSE_LIB=-lfuse +else + FUSE_CMT="#" +fi + +fi + +fi +if test -z "$FUSE_CMT" +then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling fuse2fs by default." >&5 +$as_echo "Enabling fuse2fs by default." >&6; } +fi + +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optreset" >&5 $as_echo_n "checking for optreset... " >&6; } if ${ac_cv_have_optreset+:} false; then : @@ -13085,7 +13543,10 @@ $as_echo "#define HAVE_OPTRESET 1" >>confdefs.h fi SEM_INIT_LIB='' -ac_fn_c_check_func "$LINENO" "sem_init" "ac_cv_func_sem_init" +echo GL_THREADS_API: ${gl_threads_api} +if test "${gl_threads_api}" != none +then + ac_fn_c_check_func "$LINENO" "sem_init" "ac_cv_func_sem_init" if test "x$ac_cv_func_sem_init" = xyes; then : else @@ -13218,6 +13679,7 @@ fi fi fi +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unified diff option" >&5 $as_echo_n "checking for unified diff option... " >&6; } @@ -13332,7 +13794,7 @@ $as_echo_n "checking whether we can link with -static... " >&6; } if ${ac_cv_e2fsprogs_use_static+:} false; then : $as_echo_n "(cached) " >&6 else - SAVE_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -static" + SAVE_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS_STATIC -static" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -13361,9 +13823,8 @@ solaris2.*) esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_e2fsprogs_use_static" >&5 $as_echo "$ac_cv_e2fsprogs_use_static" >&6; } -LDFLAG_STATIC= if test $ac_cv_e2fsprogs_use_static = yes; then - LDFLAG_STATIC=-static + LDFLAGS_STATIC="$LDFLAGS_STATIC -static" fi case "$host_os" in @@ -13375,10 +13836,6 @@ $as_echo "#define _INTL_REDIRECT_MACROS 1" >>confdefs.h ;; esac -SS_DIR=`cd ${srcdir}/lib/ss; pwd` -ET_DIR=`cd ${srcdir}/lib/et; pwd` - - if test "$cross_compiling" = yes ; then DO_TEST_SUITE= else @@ -13415,18 +13872,32 @@ if test $cross_compiling = no; then fi +CFLAGS_SHLIB=${CFLAGS_SHLIB:-$CFLAGS} +CFLAGS_STLIB=${CFLAGS_STLIB:-$CFLAGS} +LDFLAGS_SHLIB=${LDFLAGS_SHLIB:-$LDFLAGS} + + + test -d lib || mkdir lib test -d include || mkdir include test -d include/linux || mkdir include/linux test -d include/asm || mkdir include/asm +if test -z "$UUID_CMT" ; then + uuid_out_list="lib/uuid/Makefile lib/uuid/uuid.pc \ + lib/uuid/uuid_types.h" +fi +if test -z "$BLKID_CMT" ; then + blkid_out_list="lib/blkid/Makefile lib/blkid/blkid.pc \ + lib/blkid/blkid_types.h" +fi for i in MCONFIG Makefile e2fsprogs.spec \ + e2fsprogs-RHEL-6.spec \ + e2fsprogs-SUSE_LINUX-11.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/uuid/Makefile lib/uuid/uuid_types.h \ - lib/blkid/Makefile lib/blkid/blkid_types.h lib/quota/Makefile \ - lib/ss/ss.pc lib/uuid/uuid.pc lib/et/com_err.pc \ - lib/e2p/e2p.pc lib/blkid/blkid.pc lib/ext2fs/ext2fs.pc \ + $uuid_out_list $blkid_out_list lib/support/Makefile \ + 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 \