X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=configure;h=1ac065413ac5a66a2bcfb023fc15b50ef7e3dc19;hb=b7bb80dc7033776149bb1f33c81a753fe21a2f89;hp=03e24d14d777a99a8da7d3c470b47c063243672d;hpb=c94da0475a8d389eb8c0213148021978eeeb1ebf;p=tools%2Fe2fsprogs.git diff --git a/configure b/configure index 03e24d1..1ac0654 100755 --- a/configure +++ b/configure @@ -630,11 +630,8 @@ CFLAGS_STLIB CFLAGS_SHLIB BUILD_LDFLAGS BUILD_CFLAGS -MKINSTALLDIRS INCLUDES DO_TEST_SUITE -ET_DIR -SS_DIR LDFLAGS_STATIC root_sysconfdir root_libdir @@ -657,6 +654,7 @@ SIZEOF_LONG_LONG SIZEOF_LONG SIZEOF_INT SIZEOF_SHORT +DD BUILD_CC MAKEINFO STRIP @@ -743,6 +741,8 @@ DEFRAG_CMT RESIZER_CMT IMAGER_CMT DEBUGFS_CMT +SUBSET_CMT +ALL_CMT BLKID_CMT DEPPROFILED_LIBBLKID PROFILED_LIBBLKID @@ -870,6 +870,7 @@ enable_blkid_debug enable_testio_debug enable_libuuid enable_libblkid +enable_subset enable_backtrace enable_debugfs enable_imager @@ -1544,6 +1545,7 @@ Optional Features: --disable-testio-debug disable the use of the test I/O manager for debugging --enable-libuuid build and use private uuid library --enable-libblkid build and use private blkid library + --enable-subset enable subset-only build --disable-backtrace disable use backtrace --disable-debugfs disable support of debugfs program --disable-imager disable support of e2image program @@ -5642,6 +5644,25 @@ fi +ALL_CMT= +SUBSET_CMT= +# Check whether --enable-subset was given. +if test "${enable_subset+set}" = set; then : + enableval=$enable_subset; if test "$enableval" = "no" +then + SUBSET_CMT=# + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling subset-only build" >&5 +$as_echo "Disabling subset-only build" >&6; } +else + ALL_CMT=# + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling subset-only-build" >&5 +$as_echo "Enabling subset-only-build" >&6; } +fi + +fi + + + # Check whether --enable-backtrace was given. if test "${enable_backtrace+set}" = set; then : @@ -7237,6 +7258,8 @@ main () if (*(data + i) != *(data3 + i)) return 14; close (fd); + free (data); + free (data3); return 0; } _ACEOF @@ -11517,7 +11540,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 ; @@ -11581,6 +11609,7 @@ $as_echo "no" >&6; } fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 $as_echo_n "checking whether ln -s works... " >&6; } LN_S=$as_ln_s @@ -12302,7 +12331,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.*) @@ -12365,7 +12394,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 attr/xattr.h linux/falloc.h linux/fd.h linux/major.h linux/loop.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 +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 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" @@ -12378,6 +12407,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" " @@ -13070,7 +13120,7 @@ fi 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 fdatasync fstat64 ftruncate64 futimes getcwd getdtablesize 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 +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" @@ -13516,7 +13566,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 @@ -13649,6 +13702,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; } @@ -13805,10 +13859,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 @@ -13826,19 +13876,6 @@ if test -n "$WITH_DIET_LIBC" ; then INCLUDES="$INCLUDES -D_REENTRANT" fi - - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - case "$ac_aux_dir" in - /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;; - *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;; - esac - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - - if test $cross_compiling = no; then BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H" BUILD_LDFLAGS="$LDFLAGS" @@ -13863,7 +13900,7 @@ 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 \ +for i in MCONFIG Makefile \ 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 \