mirror of
https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git
synced 2024-11-23 01:53:47 +08:00
configure: regenerate
Run autoreconf. Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Eric Biggers
Theodore Ts'o
parent
b3d180e205
commit
6eb00fb7e8
34
aclocal.m4
vendored
34
aclocal.m4
vendored
@ -3277,8 +3277,8 @@ AC_DEFUN([AM_NLS],
|
||||
AC_SUBST([USE_NLS])
|
||||
])
|
||||
|
||||
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
|
||||
# serial 11 (pkg-config-0.29.1)
|
||||
# pkg.m4 - Macros to locate and use pkg-config. -*- Autoconf -*-
|
||||
# serial 12 (pkg-config-0.29.2)
|
||||
|
||||
dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
|
||||
dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
|
||||
@ -3320,7 +3320,7 @@ dnl
|
||||
dnl See the "Since" comment for each macro you use to see what version
|
||||
dnl of the macros you require.
|
||||
m4_defun([PKG_PREREQ],
|
||||
[m4_define([PKG_MACROS_VERSION], [0.29.1])
|
||||
[m4_define([PKG_MACROS_VERSION], [0.29.2])
|
||||
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
|
||||
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
|
||||
])dnl PKG_PREREQ
|
||||
@ -3365,7 +3365,7 @@ dnl Check to see whether a particular set of modules exists. Similar to
|
||||
dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
|
||||
dnl
|
||||
dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
dnl only at the first occurence in configure.ac, so if the first place
|
||||
dnl only at the first occurrence in configure.ac, so if the first place
|
||||
dnl it's called might be skipped (such as if it is within an "if", you
|
||||
dnl have to call PKG_CHECK_EXISTS manually
|
||||
AC_DEFUN([PKG_CHECK_EXISTS],
|
||||
@ -3421,7 +3421,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
|
||||
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
|
||||
|
||||
pkg_failed=no
|
||||
AC_MSG_CHECKING([for $1])
|
||||
AC_MSG_CHECKING([for $2])
|
||||
|
||||
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
|
||||
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
|
||||
@ -3431,17 +3431,17 @@ and $1[]_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.])
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
AC_MSG_RESULT([no])
|
||||
AC_MSG_RESULT([no])
|
||||
_PKG_SHORT_ERRORS_SUPPORTED
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
|
||||
else
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
|
||||
else
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
|
||||
|
||||
m4_default([$4], [AC_MSG_ERROR(
|
||||
m4_default([$4], [AC_MSG_ERROR(
|
||||
[Package requirements ($2) were not met:
|
||||
|
||||
$$1_PKG_ERRORS
|
||||
@ -3452,8 +3452,8 @@ installed software in a non-standard prefix.
|
||||
_PKG_TEXT])[]dnl
|
||||
])
|
||||
elif test $pkg_failed = untried; then
|
||||
AC_MSG_RESULT([no])
|
||||
m4_default([$4], [AC_MSG_FAILURE(
|
||||
AC_MSG_RESULT([no])
|
||||
m4_default([$4], [AC_MSG_FAILURE(
|
||||
[The pkg-config script could not be found or is too old. Make sure it
|
||||
is in your PATH or set the PKG_CONFIG environment variable to the full
|
||||
path to pkg-config.
|
||||
@ -3463,10 +3463,10 @@ _PKG_TEXT
|
||||
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
|
||||
])
|
||||
else
|
||||
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
|
||||
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
|
||||
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
|
||||
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
|
||||
AC_MSG_RESULT([yes])
|
||||
$3
|
||||
$3
|
||||
fi[]dnl
|
||||
])dnl PKG_CHECK_MODULES
|
||||
|
||||
|
||||
113
configure
vendored
113
configure
vendored
@ -7956,32 +7956,48 @@ fi
|
||||
# Check whether --enable-tdb was given.
|
||||
if test ${enable_tdb+y}
|
||||
then :
|
||||
enableval=$enable_tdb; if test "$enableval" = "no"
|
||||
enableval=$enable_tdb;
|
||||
if test "$enableval" = "no"
|
||||
then
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Disabling tdb support" >&5
|
||||
printf "%s\n" "Disabling tdb support" >&6; }
|
||||
TDB_CMT="#"
|
||||
TDB_MAN_COMMENT='.\"'
|
||||
CONFIG_TDB=0
|
||||
else
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Enabling tdb support" >&5
|
||||
printf "%s\n" "Enabling tdb support" >&6; }
|
||||
CONFIG_TDB=1
|
||||
fi
|
||||
|
||||
|
||||
else $as_nop
|
||||
|
||||
case "$host_os" in
|
||||
mingw*)
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Disabling tdb support by default" >&5
|
||||
printf "%s\n" "Disabling tdb support by default" >&6; }
|
||||
CONFIG_TDB=0
|
||||
;;
|
||||
*)
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Enabling tdb support by default" >&5
|
||||
printf "%s\n" "Enabling tdb support by default" >&6; }
|
||||
CONFIG_TDB=1
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
fi
|
||||
|
||||
if test "$CONFIG_TDB" = "1"
|
||||
then
|
||||
printf "%s\n" "#define CONFIG_TDB 1" >>confdefs.h
|
||||
|
||||
TDB_CMT=""
|
||||
TDB_MAN_COMMENT=""
|
||||
else
|
||||
TDB_CMT="#"
|
||||
TDB_MAN_COMMENT='.\"'
|
||||
fi
|
||||
|
||||
else $as_nop
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Enabling mmp support by default" >&5
|
||||
printf "%s\n" "Enabling mmp support by default" >&6; }
|
||||
printf "%s\n" "#define CONFIG_TDB 1" >>confdefs.h
|
||||
|
||||
TDB_CMT=""
|
||||
TDB_MAN_COMMENT=""
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-bmap-stats was given.
|
||||
@ -12117,6 +12133,22 @@ then :
|
||||
|
||||
fi
|
||||
|
||||
case "$host_os" in
|
||||
mingw*)
|
||||
# The above checks only detect system headers, not the headers in
|
||||
# ./include/mingw/, so explicitly define them to be available.
|
||||
printf "%s\n" "#define HAVE_LINUX_TYPES_H 1" >>confdefs.h
|
||||
|
||||
printf "%s\n" "#define HAVE_SYS_STAT_H 1" >>confdefs.h
|
||||
|
||||
printf "%s\n" "#define HAVE_SYS_SYSMACROS_H 1" >>confdefs.h
|
||||
|
||||
printf "%s\n" "#define HAVE_SYS_TYPES_H 1" >>confdefs.h
|
||||
|
||||
printf "%s\n" "#define HAVE_UNISTD_H 1" >>confdefs.h
|
||||
|
||||
;;
|
||||
esac
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a dd(1) program that supports iflag=fullblock" >&5
|
||||
printf %s "checking for a dd(1) program that supports iflag=fullblock... " >&6; }
|
||||
DD=
|
||||
@ -14028,12 +14060,14 @@ printf "%s\n" "$e2_cv_bsd_qsort_r" >&6; }
|
||||
case "$e2_cv_gnu_qsort_r:$e2_cv_bsd_qsort_r" in #(
|
||||
yes:no) :
|
||||
|
||||
printf "%s\n" "#define HAVE_GNU_QSORT_R 1" >>confdefs.h
|
||||
|
||||
printf "%s\n" "#define HAVE_GNU_QSORT_R 1" >>confdefs.h
|
||||
|
||||
;; #(
|
||||
no:yes) :
|
||||
|
||||
printf "%s\n" "#define HAVE_BSD_QSORT_R 1" >>confdefs.h
|
||||
|
||||
printf "%s\n" "#define HAVE_BSD_QSORT_R 1" >>confdefs.h
|
||||
|
||||
;; #(
|
||||
*) :
|
||||
@ -14740,11 +14774,11 @@ if test x$ac_prog_cxx_stdcxx = xno
|
||||
then :
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
|
||||
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
|
||||
if test ${ac_cv_prog_cxx_11+y}
|
||||
if test ${ac_cv_prog_cxx_cxx11+y}
|
||||
then :
|
||||
printf %s "(cached) " >&6
|
||||
else $as_nop
|
||||
ac_cv_prog_cxx_11=no
|
||||
ac_cv_prog_cxx_cxx11=no
|
||||
ac_save_CXX=$CXX
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
@ -14786,11 +14820,11 @@ if test x$ac_prog_cxx_stdcxx = xno
|
||||
then :
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
|
||||
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
|
||||
if test ${ac_cv_prog_cxx_98+y}
|
||||
if test ${ac_cv_prog_cxx_cxx98+y}
|
||||
then :
|
||||
printf %s "(cached) " >&6
|
||||
else $as_nop
|
||||
ac_cv_prog_cxx_98=no
|
||||
ac_cv_prog_cxx_cxx98=no
|
||||
ac_save_CXX=$CXX
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
@ -15053,6 +15087,11 @@ fi
|
||||
if test -n "$WITH_DIET_LIBC" ; then
|
||||
INCLUDES="$INCLUDES -D_REENTRANT"
|
||||
fi
|
||||
case "$host_os" in
|
||||
mingw*)
|
||||
INCLUDES=$INCLUDES' -I$(top_srcdir)/include/mingw'
|
||||
;;
|
||||
esac
|
||||
|
||||
if test $cross_compiling = no; then
|
||||
BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H"
|
||||
@ -15125,7 +15164,7 @@ fi
|
||||
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
printf "%s\n" "no" >&6; }
|
||||
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
@ -15134,25 +15173,25 @@ else
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
udev_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "udev" 2>&1`
|
||||
udev_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "udev" 2>&1`
|
||||
else
|
||||
udev_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "udev" 2>&1`
|
||||
udev_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "udev" 2>&1`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$udev_PKG_ERRORS" >&5
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$udev_PKG_ERRORS" >&5
|
||||
|
||||
|
||||
with_udev_rules_dir=""
|
||||
|
||||
elif test $pkg_failed = untried; then
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
printf "%s\n" "no" >&6; }
|
||||
|
||||
with_udev_rules_dir=""
|
||||
|
||||
else
|
||||
udev_CFLAGS=$pkg_cv_udev_CFLAGS
|
||||
udev_LIBS=$pkg_cv_udev_LIBS
|
||||
udev_CFLAGS=$pkg_cv_udev_CFLAGS
|
||||
udev_LIBS=$pkg_cv_udev_LIBS
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
printf "%s\n" "yes" >&6; }
|
||||
|
||||
@ -15294,7 +15333,7 @@ fi
|
||||
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
printf "%s\n" "no" >&6; }
|
||||
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
@ -15303,25 +15342,25 @@ else
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
systemd_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "systemd" 2>&1`
|
||||
systemd_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "systemd" 2>&1`
|
||||
else
|
||||
systemd_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "systemd" 2>&1`
|
||||
systemd_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "systemd" 2>&1`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$systemd_PKG_ERRORS" >&5
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$systemd_PKG_ERRORS" >&5
|
||||
|
||||
|
||||
with_systemd_unit_dir=""
|
||||
|
||||
elif test $pkg_failed = untried; then
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
printf "%s\n" "no" >&6; }
|
||||
|
||||
with_systemd_unit_dir=""
|
||||
|
||||
else
|
||||
systemd_CFLAGS=$pkg_cv_systemd_CFLAGS
|
||||
systemd_LIBS=$pkg_cv_systemd_LIBS
|
||||
systemd_CFLAGS=$pkg_cv_systemd_CFLAGS
|
||||
systemd_LIBS=$pkg_cv_systemd_LIBS
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
printf "%s\n" "yes" >&6; }
|
||||
|
||||
@ -15358,7 +15397,7 @@ fi
|
||||
|
||||
OS_IO_FILE=""
|
||||
case "$host_os" in
|
||||
cigwin*|mingw*|msys*)
|
||||
mingw*)
|
||||
OS_IO_FILE=windows_io
|
||||
;;
|
||||
*)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user