1017 lines
34 KiB
Diff
1017 lines
34 KiB
Diff
--- a/aclocal.m4
|
|
+++ b/aclocal.m4
|
|
@@ -1,6 +1,6 @@
|
|
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
|
|
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
|
|
|
|
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
|
|
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
|
|
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
@@ -20,7 +20,7 @@
|
|
If you have problems, you may need to regenerate the build system entirely.
|
|
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
|
|
|
|
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
|
|
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
@@ -32,10 +32,10 @@
|
|
# generated from the m4 files accompanying Automake X.Y.
|
|
# (This private macro should not be called outside this file.)
|
|
AC_DEFUN([AM_AUTOMAKE_VERSION],
|
|
-[am__api_version='1.15'
|
|
+[am__api_version='1.16'
|
|
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
|
|
dnl require some minimum version. Point them to the right macro.
|
|
-m4_if([$1], [1.15.1], [],
|
|
+m4_if([$1], [1.16.1], [],
|
|
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
|
|
])
|
|
|
|
@@ -51,12 +51,12 @@
|
|
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
|
|
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
|
|
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
|
|
-[AM_AUTOMAKE_VERSION([1.15.1])dnl
|
|
+[AM_AUTOMAKE_VERSION([1.16.1])dnl
|
|
m4_ifndef([AC_AUTOCONF_VERSION],
|
|
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
|
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
|
|
|
|
-# Copyright (C) 2011-2017 Free Software Foundation, Inc.
|
|
+# Copyright (C) 2011-2018 Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
@@ -118,7 +118,7 @@
|
|
|
|
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
|
|
|
|
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
|
|
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
@@ -170,7 +170,7 @@
|
|
|
|
# AM_CONDITIONAL -*- Autoconf -*-
|
|
|
|
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
|
|
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
@@ -201,7 +201,7 @@
|
|
Usually this means the macro was only invoked conditionally.]])
|
|
fi])])
|
|
|
|
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
|
|
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
@@ -392,13 +392,12 @@
|
|
|
|
# Generate code to set up dependency tracking. -*- Autoconf -*-
|
|
|
|
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
|
|
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
-
|
|
# _AM_OUTPUT_DEPENDENCY_COMMANDS
|
|
# ------------------------------
|
|
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
|
|
@@ -406,49 +405,41 @@
|
|
# Older Autoconf quotes --file arguments for eval, but not when files
|
|
# are listed without --file. Let's play safe and only enable the eval
|
|
# if we detect the quoting.
|
|
- case $CONFIG_FILES in
|
|
- *\'*) eval set x "$CONFIG_FILES" ;;
|
|
- *) set x $CONFIG_FILES ;;
|
|
- esac
|
|
+ # TODO: see whether this extra hack can be removed once we start
|
|
+ # requiring Autoconf 2.70 or later.
|
|
+ AS_CASE([$CONFIG_FILES],
|
|
+ [*\'*], [eval set x "$CONFIG_FILES"],
|
|
+ [*], [set x $CONFIG_FILES])
|
|
shift
|
|
- for mf
|
|
+ # Used to flag and report bootstrapping failures.
|
|
+ am_rc=0
|
|
+ for am_mf
|
|
do
|
|
# Strip MF so we end up with the name of the file.
|
|
- mf=`echo "$mf" | sed -e 's/:.*$//'`
|
|
- # Check whether this is an Automake generated Makefile or not.
|
|
- # We used to match only the files named 'Makefile.in', but
|
|
- # some people rename them; so instead we look at the file content.
|
|
- # Grep'ing the first line is not enough: some people post-process
|
|
- # each Makefile.in and add a new line on top of each file to say so.
|
|
- # Grep'ing the whole file is not good either: AIX grep has a line
|
|
+ am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
|
|
+ # Check whether this is an Automake generated Makefile which includes
|
|
+ # dependency-tracking related rules and includes.
|
|
+ # Grep'ing the whole file directly is not great: AIX grep has a line
|
|
# limit of 2048, but all sed's we know have understand at least 4000.
|
|
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
|
|
- dirpart=`AS_DIRNAME("$mf")`
|
|
- else
|
|
- continue
|
|
- fi
|
|
- # Extract the definition of DEPDIR, am__include, and am__quote
|
|
- # from the Makefile without running 'make'.
|
|
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
|
|
- test -z "$DEPDIR" && continue
|
|
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
|
|
- test -z "$am__include" && continue
|
|
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
|
|
- # Find all dependency output files, they are included files with
|
|
- # $(DEPDIR) in their names. We invoke sed twice because it is the
|
|
- # simplest approach to changing $(DEPDIR) to its actual value in the
|
|
- # expansion.
|
|
- for file in `sed -n "
|
|
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
|
|
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
|
|
- # Make sure the directory exists.
|
|
- test -f "$dirpart/$file" && continue
|
|
- fdir=`AS_DIRNAME(["$file"])`
|
|
- AS_MKDIR_P([$dirpart/$fdir])
|
|
- # echo "creating $dirpart/$file"
|
|
- echo '# dummy' > "$dirpart/$file"
|
|
- done
|
|
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
|
|
+ || continue
|
|
+ am_dirpart=`AS_DIRNAME(["$am_mf"])`
|
|
+ am_filepart=`AS_BASENAME(["$am_mf"])`
|
|
+ AM_RUN_LOG([cd "$am_dirpart" \
|
|
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
|
|
+ | $MAKE -f - am--depfiles]) || am_rc=$?
|
|
done
|
|
+ if test $am_rc -ne 0; then
|
|
+ AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
|
|
+ for automatic dependency tracking. Try re-running configure with the
|
|
+ '--disable-dependency-tracking' option to at least be able to build
|
|
+ the package (albeit without support for automatic dependency tracking).])
|
|
+ fi
|
|
+ AS_UNSET([am_dirpart])
|
|
+ AS_UNSET([am_filepart])
|
|
+ AS_UNSET([am_mf])
|
|
+ AS_UNSET([am_rc])
|
|
+ rm -f conftest-deps.mk
|
|
}
|
|
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
|
|
|
|
@@ -457,18 +448,17 @@
|
|
# -----------------------------
|
|
# This macro should only be invoked once -- use via AC_REQUIRE.
|
|
#
|
|
-# This code is only required when automatic dependency tracking
|
|
-# is enabled. FIXME. This creates each '.P' file that we will
|
|
-# need in order to bootstrap the dependency handling code.
|
|
+# This code is only required when automatic dependency tracking is enabled.
|
|
+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
|
|
+# order to bootstrap the dependency handling code.
|
|
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
|
|
[AC_CONFIG_COMMANDS([depfiles],
|
|
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
|
|
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
|
|
-])
|
|
+ [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
|
|
|
|
# Do all the work for Automake. -*- Autoconf -*-
|
|
|
|
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
|
|
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
@@ -555,8 +545,8 @@
|
|
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
|
|
# For better backward compatibility. To be removed once Automake 1.9.x
|
|
# dies out for good. For more background, see:
|
|
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
|
|
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
|
|
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
|
|
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
|
|
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
|
|
# We need awk for the "check" target (and possibly the TAP driver). The
|
|
# system "awk" is bad on some platforms.
|
|
@@ -623,7 +613,7 @@
|
|
Aborting the configuration process, to ensure you take notice of the issue.
|
|
|
|
You can download and install GNU coreutils to get an 'rm' implementation
|
|
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
|
|
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
|
|
|
|
If you want to complete the configuration process using your problematic
|
|
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
|
|
@@ -665,7 +655,7 @@
|
|
done
|
|
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
|
|
|
|
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
|
|
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
@@ -686,7 +676,7 @@
|
|
fi
|
|
AC_SUBST([install_sh])])
|
|
|
|
-# Copyright (C) 2003-2017 Free Software Foundation, Inc.
|
|
+# Copyright (C) 2003-2018 Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
@@ -707,7 +697,7 @@
|
|
|
|
# Check to see how 'make' treats includes. -*- Autoconf -*-
|
|
|
|
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
|
|
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
@@ -715,49 +705,42 @@
|
|
|
|
# AM_MAKE_INCLUDE()
|
|
# -----------------
|
|
-# Check to see how make treats includes.
|
|
+# Check whether make has an 'include' directive that can support all
|
|
+# the idioms we need for our automatic dependency tracking code.
|
|
AC_DEFUN([AM_MAKE_INCLUDE],
|
|
-[am_make=${MAKE-make}
|
|
-cat > confinc << 'END'
|
|
+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
|
|
+cat > confinc.mk << 'END'
|
|
am__doit:
|
|
- @echo this is the am__doit target
|
|
+ @echo this is the am__doit target >confinc.out
|
|
.PHONY: am__doit
|
|
END
|
|
-# If we don't find an include directive, just comment out the code.
|
|
-AC_MSG_CHECKING([for style of include used by $am_make])
|
|
am__include="#"
|
|
am__quote=
|
|
-_am_result=none
|
|
-# First try GNU make style include.
|
|
-echo "include confinc" > confmf
|
|
-# Ignore all kinds of additional output from 'make'.
|
|
-case `$am_make -s -f confmf 2> /dev/null` in #(
|
|
-*the\ am__doit\ target*)
|
|
- am__include=include
|
|
- am__quote=
|
|
- _am_result=GNU
|
|
- ;;
|
|
-esac
|
|
-# Now try BSD make style include.
|
|
-if test "$am__include" = "#"; then
|
|
- echo '.include "confinc"' > confmf
|
|
- case `$am_make -s -f confmf 2> /dev/null` in #(
|
|
- *the\ am__doit\ target*)
|
|
- am__include=.include
|
|
- am__quote="\""
|
|
- _am_result=BSD
|
|
- ;;
|
|
- esac
|
|
-fi
|
|
-AC_SUBST([am__include])
|
|
-AC_SUBST([am__quote])
|
|
-AC_MSG_RESULT([$_am_result])
|
|
-rm -f confinc confmf
|
|
-])
|
|
+# BSD make does it like this.
|
|
+echo '.include "confinc.mk" # ignored' > confmf.BSD
|
|
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
|
|
+echo 'include confinc.mk # ignored' > confmf.GNU
|
|
+_am_result=no
|
|
+for s in GNU BSD; do
|
|
+ AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
|
|
+ AS_CASE([$?:`cat confinc.out 2>/dev/null`],
|
|
+ ['0:this is the am__doit target'],
|
|
+ [AS_CASE([$s],
|
|
+ [BSD], [am__include='.include' am__quote='"'],
|
|
+ [am__include='include' am__quote=''])])
|
|
+ if test "$am__include" != "#"; then
|
|
+ _am_result="yes ($s style)"
|
|
+ break
|
|
+ fi
|
|
+done
|
|
+rm -f confinc.* confmf.*
|
|
+AC_MSG_RESULT([${_am_result}])
|
|
+AC_SUBST([am__include])])
|
|
+AC_SUBST([am__quote])])
|
|
|
|
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
|
|
|
|
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
|
|
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
@@ -796,7 +779,7 @@
|
|
|
|
# Helper functions for option handling. -*- Autoconf -*-
|
|
|
|
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
|
|
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
@@ -825,7 +808,7 @@
|
|
AC_DEFUN([_AM_IF_OPTION],
|
|
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
|
|
|
|
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
|
|
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
@@ -872,7 +855,7 @@
|
|
# For backward compatibility.
|
|
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
|
|
|
|
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
|
|
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
@@ -905,10 +888,12 @@
|
|
[
|
|
dnl Find a Python interpreter. Python versions prior to 2.0 are not
|
|
dnl supported. (2.0 was released on October 16, 2000).
|
|
- dnl FIXME: Remove the need to hard-code Python versions here.
|
|
m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
|
|
-[python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 dnl
|
|
- python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0])
|
|
+[python python2 python3 dnl
|
|
+ python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 dnl
|
|
+ python3.2 python3.1 python3.0 dnl
|
|
+ python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 dnl
|
|
+ python2.0])
|
|
|
|
AC_ARG_VAR([PYTHON], [the Python interpreter])
|
|
|
|
@@ -1108,7 +1093,7 @@
|
|
sys.exit(sys.hexversion < minverhex)"
|
|
AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
|
|
|
|
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
|
|
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
@@ -1127,7 +1112,7 @@
|
|
|
|
# Check to make sure that the build environment is sane. -*- Autoconf -*-
|
|
|
|
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
|
|
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
@@ -1208,7 +1193,7 @@
|
|
rm -f conftest.file
|
|
])
|
|
|
|
-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
|
|
+# Copyright (C) 2009-2018 Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
@@ -1268,7 +1253,7 @@
|
|
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
|
|
])
|
|
|
|
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
|
|
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
@@ -1296,7 +1281,7 @@
|
|
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
|
|
AC_SUBST([INSTALL_STRIP_PROGRAM])])
|
|
|
|
-# Copyright (C) 2006-2017 Free Software Foundation, Inc.
|
|
+# Copyright (C) 2006-2018 Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
@@ -1315,7 +1300,7 @@
|
|
|
|
# Check how to create a tarball. -*- Autoconf -*-
|
|
|
|
-# Copyright (C) 2004-2017 Free Software Foundation, Inc.
|
|
+# Copyright (C) 2004-2018 Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -637,6 +637,10 @@
|
|
LIBOBJS
|
|
MAJOR_VER
|
|
skip_patterns
|
|
+NDCTL_LIBS
|
|
+NDCTL_CFLAGS
|
|
+UUID_LIBS
|
|
+UUID_CFLAGS
|
|
BYTESIZE_LIBS
|
|
BYTESIZE_CFLAGS
|
|
PARTED_FS_LIBS
|
|
@@ -665,6 +669,9 @@
|
|
GLIB_CFLAGS
|
|
WITH_PART_O_WITH_FS_FALSE
|
|
WITH_PART_O_WITH_FS_TRUE
|
|
+WITH_NVDIMM_FALSE
|
|
+WITH_NVDIMM_TRUE
|
|
+WITH_NVDIMM
|
|
WITH_FS_FALSE
|
|
WITH_FS_TRUE
|
|
WITH_FS
|
|
@@ -767,7 +774,6 @@
|
|
AMDEPBACKSLASH
|
|
AMDEP_FALSE
|
|
AMDEP_TRUE
|
|
-am__quote
|
|
am__include
|
|
DEPDIR
|
|
OBJEXT
|
|
@@ -852,7 +858,8 @@
|
|
PACKAGE_TARNAME
|
|
PACKAGE_NAME
|
|
PATH_SEPARATOR
|
|
-SHELL'
|
|
+SHELL
|
|
+am__quote'
|
|
ac_subst_files=''
|
|
ac_user_opts='
|
|
enable_option_checking
|
|
@@ -884,6 +891,7 @@
|
|
with_kbd
|
|
with_part
|
|
with_fs
|
|
+with_nvdimm
|
|
'
|
|
ac_precious_vars='build_alias
|
|
host_alias
|
|
@@ -924,7 +932,11 @@
|
|
PARTED_FS_CFLAGS
|
|
PARTED_FS_LIBS
|
|
BYTESIZE_CFLAGS
|
|
-BYTESIZE_LIBS'
|
|
+BYTESIZE_LIBS
|
|
+UUID_CFLAGS
|
|
+UUID_LIBS
|
|
+NDCTL_CFLAGS
|
|
+NDCTL_LIBS'
|
|
|
|
|
|
# Initialize some variables set by options.
|
|
@@ -1585,6 +1597,7 @@
|
|
--with-kbd support kbd [default=yes]
|
|
--with-part support part [default=yes]
|
|
--with-fs support fs [default=yes]
|
|
+ --with-nvdimm support nvdimm [default=yes]
|
|
|
|
Some influential environment variables:
|
|
PYTHON the Python interpreter
|
|
@@ -1642,6 +1655,11 @@
|
|
C compiler flags for BYTESIZE, overriding pkg-config
|
|
BYTESIZE_LIBS
|
|
linker flags for BYTESIZE, overriding pkg-config
|
|
+ UUID_CFLAGS C compiler flags for UUID, overriding pkg-config
|
|
+ UUID_LIBS linker flags for UUID, overriding pkg-config
|
|
+ NDCTL_CFLAGS
|
|
+ C compiler flags for NDCTL, overriding pkg-config
|
|
+ NDCTL_LIBS linker flags for NDCTL, overriding pkg-config
|
|
|
|
Use these variables to override the choices made by `configure' or to help
|
|
it to find libraries and programs with nonstandard names/locations.
|
|
@@ -2461,7 +2479,7 @@
|
|
|
|
|
|
|
|
-am__api_version='1.15'
|
|
+am__api_version='1.16'
|
|
|
|
ac_aux_dir=
|
|
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
|
|
@@ -3006,8 +3024,8 @@
|
|
|
|
# For better backward compatibility. To be removed once Automake 1.9.x
|
|
# dies out for good. For more background, see:
|
|
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
|
|
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
|
|
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
|
|
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
|
|
mkdir_p='$(MKDIR_P)'
|
|
|
|
# We need awk for the "check" target (and possibly the TAP driver). The
|
|
@@ -3058,7 +3076,7 @@
|
|
Aborting the configuration process, to ensure you take notice of the issue.
|
|
|
|
You can download and install GNU coreutils to get an 'rm' implementation
|
|
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
|
|
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
|
|
|
|
If you want to complete the configuration process using your problematic
|
|
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
|
|
@@ -3079,7 +3097,7 @@
|
|
|
|
# Find any Python interpreter.
|
|
if test -z "$PYTHON"; then
|
|
- for ac_prog in python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
|
|
+ for ac_prog in python python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
|
|
do
|
|
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
set dummy $ac_prog; ac_word=$2
|
|
@@ -3283,45 +3301,45 @@
|
|
|
|
ac_config_commands="$ac_config_commands depfiles"
|
|
|
|
-
|
|
-am_make=${MAKE-make}
|
|
-cat > confinc << 'END'
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
|
|
+$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
|
|
+cat > confinc.mk << 'END'
|
|
am__doit:
|
|
- @echo this is the am__doit target
|
|
+ @echo this is the am__doit target >confinc.out
|
|
.PHONY: am__doit
|
|
END
|
|
-# If we don't find an include directive, just comment out the code.
|
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
|
|
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
|
|
am__include="#"
|
|
am__quote=
|
|
-_am_result=none
|
|
-# First try GNU make style include.
|
|
-echo "include confinc" > confmf
|
|
-# Ignore all kinds of additional output from 'make'.
|
|
-case `$am_make -s -f confmf 2> /dev/null` in #(
|
|
-*the\ am__doit\ target*)
|
|
- am__include=include
|
|
- am__quote=
|
|
- _am_result=GNU
|
|
- ;;
|
|
-esac
|
|
-# Now try BSD make style include.
|
|
-if test "$am__include" = "#"; then
|
|
- echo '.include "confinc"' > confmf
|
|
- case `$am_make -s -f confmf 2> /dev/null` in #(
|
|
- *the\ am__doit\ target*)
|
|
- am__include=.include
|
|
- am__quote="\""
|
|
- _am_result=BSD
|
|
+# BSD make does it like this.
|
|
+echo '.include "confinc.mk" # ignored' > confmf.BSD
|
|
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
|
|
+echo 'include confinc.mk # ignored' > confmf.GNU
|
|
+_am_result=no
|
|
+for s in GNU BSD; do
|
|
+ { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
|
|
+ (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
|
|
+ ac_status=$?
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); }
|
|
+ case $?:`cat confinc.out 2>/dev/null` in #(
|
|
+ '0:this is the am__doit target') :
|
|
+ case $s in #(
|
|
+ BSD) :
|
|
+ am__include='.include' am__quote='"' ;; #(
|
|
+ *) :
|
|
+ am__include='include' am__quote='' ;;
|
|
+esac ;; #(
|
|
+ *) :
|
|
;;
|
|
- esac
|
|
-fi
|
|
-
|
|
-
|
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
|
|
-$as_echo "$_am_result" >&6; }
|
|
-rm -f confinc confmf
|
|
+esac
|
|
+ if test "$am__include" != "#"; then
|
|
+ _am_result="yes ($s style)"
|
|
+ break
|
|
+ fi
|
|
+done
|
|
+rm -f confinc.* confmf.*
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
|
|
+$as_echo "${_am_result}" >&6; }
|
|
|
|
# Check whether --enable-dependency-tracking was given.
|
|
if test "${enable_dependency_tracking+set}" = set; then :
|
|
@@ -14088,6 +14106,32 @@
|
|
fi
|
|
|
|
|
|
+# Check whether --with-nvdimm was given.
|
|
+if test "${with_nvdimm+set}" = set; then :
|
|
+ withval=$with_nvdimm;
|
|
+else
|
|
+ with_nvdimm=yes
|
|
+fi
|
|
+
|
|
+
|
|
+WITH_NVDIMM=0
|
|
+
|
|
+ if test "x$with_nvdimm" != "xno"; then
|
|
+ WITH_NVDIMM_TRUE=
|
|
+ WITH_NVDIMM_FALSE='#'
|
|
+else
|
|
+ WITH_NVDIMM_TRUE='#'
|
|
+ WITH_NVDIMM_FALSE=
|
|
+fi
|
|
+
|
|
+if test "x$with_nvdimm" != "xno"; then :
|
|
+
|
|
+$as_echo "#define WITH_BD_NVDIMM /**/" >>confdefs.h
|
|
+ WITH_NVDIMM=1
|
|
+
|
|
+fi
|
|
+
|
|
+
|
|
if test "x$with_part" != "xno" -o "x$with_fs" != "xno"; then
|
|
WITH_PART_O_WITH_FS_TRUE=
|
|
WITH_PART_O_WITH_FS_FALSE='#'
|
|
@@ -14603,6 +14647,10 @@
|
|
|
|
fi
|
|
|
|
+ if $PKG_CONFIG --atleast-version=2.0 libcryptsetup; then :
|
|
+ $as_echo "#define LIBCRYPTSETUP_PIM_SUPPORT 1" >>confdefs.h
|
|
+
|
|
+fi
|
|
|
|
pkg_failed=no
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSS" >&5
|
|
@@ -14694,7 +14742,7 @@
|
|
status=$?
|
|
rm -f $temp_file
|
|
rm -f $(basename ${temp_file%%.c}.o)
|
|
-if test $status == 0; then
|
|
+if test $status = 0; then
|
|
echo yes
|
|
else
|
|
echo no
|
|
@@ -14800,7 +14848,7 @@
|
|
status=$?
|
|
rm -f $temp_file
|
|
rm -f $(basename ${temp_file%%.c}.o)
|
|
-if test $status == 0; then
|
|
+if test $status = 0; then
|
|
echo yes
|
|
else
|
|
echo no
|
|
@@ -15263,6 +15311,178 @@
|
|
|
|
fi
|
|
|
|
+if test "x$with_nvdimm" != "xno"; then :
|
|
+
|
|
+pkg_failed=no
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UUID" >&5
|
|
+$as_echo_n "checking for UUID... " >&6; }
|
|
+
|
|
+if test -n "$UUID_CFLAGS"; then
|
|
+ pkg_cv_UUID_CFLAGS="$UUID_CFLAGS"
|
|
+ elif test -n "$PKG_CONFIG"; then
|
|
+ if test -n "$PKG_CONFIG" && \
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"uuid\""; } >&5
|
|
+ ($PKG_CONFIG --exists --print-errors "uuid") 2>&5
|
|
+ ac_status=$?
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }; then
|
|
+ pkg_cv_UUID_CFLAGS=`$PKG_CONFIG --cflags "uuid" 2>/dev/null`
|
|
+ test "x$?" != "x0" && pkg_failed=yes
|
|
+else
|
|
+ pkg_failed=yes
|
|
+fi
|
|
+ else
|
|
+ pkg_failed=untried
|
|
+fi
|
|
+if test -n "$UUID_LIBS"; then
|
|
+ pkg_cv_UUID_LIBS="$UUID_LIBS"
|
|
+ elif test -n "$PKG_CONFIG"; then
|
|
+ if test -n "$PKG_CONFIG" && \
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"uuid\""; } >&5
|
|
+ ($PKG_CONFIG --exists --print-errors "uuid") 2>&5
|
|
+ ac_status=$?
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }; then
|
|
+ pkg_cv_UUID_LIBS=`$PKG_CONFIG --libs "uuid" 2>/dev/null`
|
|
+ test "x$?" != "x0" && pkg_failed=yes
|
|
+else
|
|
+ pkg_failed=yes
|
|
+fi
|
|
+ else
|
|
+ pkg_failed=untried
|
|
+fi
|
|
+
|
|
+
|
|
+
|
|
+if test $pkg_failed = yes; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
+
|
|
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
|
+ _pkg_short_errors_supported=yes
|
|
+else
|
|
+ _pkg_short_errors_supported=no
|
|
+fi
|
|
+ if test $_pkg_short_errors_supported = yes; then
|
|
+ UUID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "uuid" 2>&1`
|
|
+ else
|
|
+ UUID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "uuid" 2>&1`
|
|
+ fi
|
|
+ # Put the nasty error message in config.log where it belongs
|
|
+ echo "$UUID_PKG_ERRORS" >&5
|
|
+
|
|
+ if test x"$libblockdev_failure_messages" = x; then :
|
|
+ libblockdev_failure_messages="$UUID_PKG_ERRORS"
|
|
+else
|
|
+ libblockdev_failure_messages="$libblockdev_failure_messages
|
|
+$UUID_PKG_ERRORS"
|
|
+
|
|
+fi
|
|
+elif test $pkg_failed = untried; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
+ if test x"$libblockdev_failure_messages" = x; then :
|
|
+ libblockdev_failure_messages="$UUID_PKG_ERRORS"
|
|
+else
|
|
+ libblockdev_failure_messages="$libblockdev_failure_messages
|
|
+$UUID_PKG_ERRORS"
|
|
+
|
|
+fi
|
|
+else
|
|
+ UUID_CFLAGS=$pkg_cv_UUID_CFLAGS
|
|
+ UUID_LIBS=$pkg_cv_UUID_LIBS
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
+$as_echo "yes" >&6; }
|
|
+
|
|
+fi
|
|
+
|
|
+
|
|
+pkg_failed=no
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NDCTL" >&5
|
|
+$as_echo_n "checking for NDCTL... " >&6; }
|
|
+
|
|
+if test -n "$NDCTL_CFLAGS"; then
|
|
+ pkg_cv_NDCTL_CFLAGS="$NDCTL_CFLAGS"
|
|
+ elif test -n "$PKG_CONFIG"; then
|
|
+ if test -n "$PKG_CONFIG" && \
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libndctl\""; } >&5
|
|
+ ($PKG_CONFIG --exists --print-errors "libndctl") 2>&5
|
|
+ ac_status=$?
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }; then
|
|
+ pkg_cv_NDCTL_CFLAGS=`$PKG_CONFIG --cflags "libndctl" 2>/dev/null`
|
|
+ test "x$?" != "x0" && pkg_failed=yes
|
|
+else
|
|
+ pkg_failed=yes
|
|
+fi
|
|
+ else
|
|
+ pkg_failed=untried
|
|
+fi
|
|
+if test -n "$NDCTL_LIBS"; then
|
|
+ pkg_cv_NDCTL_LIBS="$NDCTL_LIBS"
|
|
+ elif test -n "$PKG_CONFIG"; then
|
|
+ if test -n "$PKG_CONFIG" && \
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libndctl\""; } >&5
|
|
+ ($PKG_CONFIG --exists --print-errors "libndctl") 2>&5
|
|
+ ac_status=$?
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }; then
|
|
+ pkg_cv_NDCTL_LIBS=`$PKG_CONFIG --libs "libndctl" 2>/dev/null`
|
|
+ test "x$?" != "x0" && pkg_failed=yes
|
|
+else
|
|
+ pkg_failed=yes
|
|
+fi
|
|
+ else
|
|
+ pkg_failed=untried
|
|
+fi
|
|
+
|
|
+
|
|
+
|
|
+if test $pkg_failed = yes; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
+
|
|
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
|
+ _pkg_short_errors_supported=yes
|
|
+else
|
|
+ _pkg_short_errors_supported=no
|
|
+fi
|
|
+ if test $_pkg_short_errors_supported = yes; then
|
|
+ NDCTL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libndctl" 2>&1`
|
|
+ else
|
|
+ NDCTL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libndctl" 2>&1`
|
|
+ fi
|
|
+ # Put the nasty error message in config.log where it belongs
|
|
+ echo "$NDCTL_PKG_ERRORS" >&5
|
|
+
|
|
+ if test x"$libblockdev_failure_messages" = x; then :
|
|
+ libblockdev_failure_messages="$NDCTL_PKG_ERRORS"
|
|
+else
|
|
+ libblockdev_failure_messages="$libblockdev_failure_messages
|
|
+$NDCTL_PKG_ERRORS"
|
|
+
|
|
+fi
|
|
+elif test $pkg_failed = untried; then
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
+ if test x"$libblockdev_failure_messages" = x; then :
|
|
+ libblockdev_failure_messages="$NDCTL_PKG_ERRORS"
|
|
+else
|
|
+ libblockdev_failure_messages="$libblockdev_failure_messages
|
|
+$NDCTL_PKG_ERRORS"
|
|
+
|
|
+fi
|
|
+else
|
|
+ NDCTL_CFLAGS=$pkg_cv_NDCTL_CFLAGS
|
|
+ NDCTL_LIBS=$pkg_cv_NDCTL_LIBS
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
+$as_echo "yes" >&6; }
|
|
+
|
|
+fi
|
|
+
|
|
+
|
|
+fi
|
|
+
|
|
skip_patterns=$skip_patterns
|
|
|
|
MAJOR_VER=\"2\"
|
|
@@ -15527,6 +15747,10 @@
|
|
as_fn_error $? "conditional \"WITH_FS\" was never defined.
|
|
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
fi
|
|
+if test -z "${WITH_NVDIMM_TRUE}" && test -z "${WITH_NVDIMM_FALSE}"; then
|
|
+ as_fn_error $? "conditional \"WITH_NVDIMM\" was never defined.
|
|
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
+fi
|
|
if test -z "${WITH_PART_O_WITH_FS_TRUE}" && test -z "${WITH_PART_O_WITH_FS_FALSE}"; then
|
|
as_fn_error $? "conditional \"WITH_PART_O_WITH_FS\" was never defined.
|
|
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
@@ -16093,7 +16317,7 @@
|
|
#
|
|
# INIT-COMMANDS
|
|
#
|
|
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
|
|
+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
|
|
|
|
|
|
# The HP-UX ksh and POSIX shell print the target directory to stdout
|
|
@@ -16843,29 +17067,35 @@
|
|
# Older Autoconf quotes --file arguments for eval, but not when files
|
|
# are listed without --file. Let's play safe and only enable the eval
|
|
# if we detect the quoting.
|
|
- case $CONFIG_FILES in
|
|
- *\'*) eval set x "$CONFIG_FILES" ;;
|
|
- *) set x $CONFIG_FILES ;;
|
|
- esac
|
|
+ # TODO: see whether this extra hack can be removed once we start
|
|
+ # requiring Autoconf 2.70 or later.
|
|
+ case $CONFIG_FILES in #(
|
|
+ *\'*) :
|
|
+ eval set x "$CONFIG_FILES" ;; #(
|
|
+ *) :
|
|
+ set x $CONFIG_FILES ;; #(
|
|
+ *) :
|
|
+ ;;
|
|
+esac
|
|
shift
|
|
- for mf
|
|
+ # Used to flag and report bootstrapping failures.
|
|
+ am_rc=0
|
|
+ for am_mf
|
|
do
|
|
# Strip MF so we end up with the name of the file.
|
|
- mf=`echo "$mf" | sed -e 's/:.*$//'`
|
|
- # Check whether this is an Automake generated Makefile or not.
|
|
- # We used to match only the files named 'Makefile.in', but
|
|
- # some people rename them; so instead we look at the file content.
|
|
- # Grep'ing the first line is not enough: some people post-process
|
|
- # each Makefile.in and add a new line on top of each file to say so.
|
|
- # Grep'ing the whole file is not good either: AIX grep has a line
|
|
+ am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
|
|
+ # Check whether this is an Automake generated Makefile which includes
|
|
+ # dependency-tracking related rules and includes.
|
|
+ # Grep'ing the whole file directly is not great: AIX grep has a line
|
|
# limit of 2048, but all sed's we know have understand at least 4000.
|
|
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
|
|
- dirpart=`$as_dirname -- "$mf" ||
|
|
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
- X"$mf" : 'X\(//\)[^/]' \| \
|
|
- X"$mf" : 'X\(//\)$' \| \
|
|
- X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
|
|
-$as_echo X"$mf" |
|
|
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
|
|
+ || continue
|
|
+ am_dirpart=`$as_dirname -- "$am_mf" ||
|
|
+$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
+ X"$am_mf" : 'X\(//\)[^/]' \| \
|
|
+ X"$am_mf" : 'X\(//\)$' \| \
|
|
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
|
|
+$as_echo X"$am_mf" |
|
|
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
s//\1/
|
|
q
|
|
@@ -16883,53 +17113,48 @@
|
|
q
|
|
}
|
|
s/.*/./; q'`
|
|
- else
|
|
- continue
|
|
- fi
|
|
- # Extract the definition of DEPDIR, am__include, and am__quote
|
|
- # from the Makefile without running 'make'.
|
|
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
|
|
- test -z "$DEPDIR" && continue
|
|
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
|
|
- test -z "$am__include" && continue
|
|
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
|
|
- # Find all dependency output files, they are included files with
|
|
- # $(DEPDIR) in their names. We invoke sed twice because it is the
|
|
- # simplest approach to changing $(DEPDIR) to its actual value in the
|
|
- # expansion.
|
|
- for file in `sed -n "
|
|
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
|
|
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
|
|
- # Make sure the directory exists.
|
|
- test -f "$dirpart/$file" && continue
|
|
- fdir=`$as_dirname -- "$file" ||
|
|
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
- X"$file" : 'X\(//\)[^/]' \| \
|
|
- X"$file" : 'X\(//\)$' \| \
|
|
- X"$file" : 'X\(/\)' \| . 2>/dev/null ||
|
|
-$as_echo X"$file" |
|
|
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
- s//\1/
|
|
- q
|
|
- }
|
|
- /^X\(\/\/\)[^/].*/{
|
|
+ am_filepart=`$as_basename -- "$am_mf" ||
|
|
+$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
|
|
+ X"$am_mf" : 'X\(//\)$' \| \
|
|
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
|
|
+$as_echo X/"$am_mf" |
|
|
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
|
|
s//\1/
|
|
q
|
|
}
|
|
- /^X\(\/\/\)$/{
|
|
+ /^X\/\(\/\/\)$/{
|
|
s//\1/
|
|
q
|
|
}
|
|
- /^X\(\/\).*/{
|
|
+ /^X\/\(\/\).*/{
|
|
s//\1/
|
|
q
|
|
}
|
|
s/.*/./; q'`
|
|
- as_dir=$dirpart/$fdir; as_fn_mkdir_p
|
|
- # echo "creating $dirpart/$file"
|
|
- echo '# dummy' > "$dirpart/$file"
|
|
- done
|
|
+ { echo "$as_me:$LINENO: cd "$am_dirpart" \
|
|
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
|
|
+ | $MAKE -f - am--depfiles" >&5
|
|
+ (cd "$am_dirpart" \
|
|
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
|
|
+ | $MAKE -f - am--depfiles) >&5 2>&5
|
|
+ ac_status=$?
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); } || am_rc=$?
|
|
done
|
|
+ if test $am_rc -ne 0; 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 $? "Something went wrong bootstrapping makefile fragments
|
|
+ for automatic dependency tracking. Try re-running configure with the
|
|
+ '--disable-dependency-tracking' option to at least be able to build
|
|
+ the package (albeit without support for automatic dependency tracking).
|
|
+See \`config.log' for more details" "$LINENO" 5; }
|
|
+ fi
|
|
+ { am_dirpart=; unset am_dirpart;}
|
|
+ { am_filepart=; unset am_filepart;}
|
|
+ { am_mf=; unset am_mf;}
|
|
+ { am_rc=; unset am_rc;}
|
|
+ rm -f conftest-deps.mk
|
|
}
|
|
;;
|
|
"libtool":C)
|