@@ -644,7 +644,6 @@ am__nodep
644644AMDEPBACKSLASH
645645AMDEP_FALSE
646646AMDEP_TRUE
647- am__quote
648647am__include
649648DEPDIR
650649OBJEXT
@@ -721,7 +720,8 @@ PACKAGE_VERSION
721720PACKAGE_TARNAME
722721PACKAGE_NAME
723722PATH_SEPARATOR
724- SHELL'
723+ SHELL
724+ am__quote'
725725ac_subst_files=' '
726726ac_user_opts='
727727enable_option_checking
@@ -2134,7 +2134,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
21342134ac_compiler_gnu=$ac_cv_c_compiler_gnu
21352135
21362136
2137- am__api_version=' 1.15 '
2137+ am__api_version=' 1.16 '
21382138
21392139ac_aux_dir=
21402140for ac_dir in " $srcdir " " $srcdir /.." " $srcdir /../.." ; do
@@ -2679,8 +2679,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
26792679
26802680# For better backward compatibility. To be removed once Automake 1.9.x
26812681# dies out for good. For more background, see:
2682- # <http ://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
2683- # <http ://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
2682+ # <https ://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
2683+ # <https ://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
26842684mkdir_p=' $(MKDIR_P)'
26852685
26862686# We need awk for the "check" target (and possibly the TAP driver). The
@@ -2731,7 +2731,7 @@ END
27312731Aborting the configuration process, to ensure you take notice of the issue.
27322732
27332733You can download and install GNU coreutils to get an 'rm' implementation
2734- that behaves properly: <http ://www.gnu.org/software/coreutils/>.
2734+ that behaves properly: <https ://www.gnu.org/software/coreutils/>.
27352735
27362736If you want to complete the configuration process using your problematic
27372737'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -3281,45 +3281,45 @@ DEPDIR="${am__leading_dot}deps"
32813281
32823282ac_config_commands=" $ac_config_commands depfiles"
32833283
3284-
3285- am_make= $ {MAKE-make}
3286- cat > confinc << 'END '
3284+ { $as_echo " $as_me : ${as_lineno- $LINENO } : checking whether ${MAKE-make} supports the include directive " >&5
3285+ $as_echo_n " checking whether $ {MAKE-make} supports the include directive... " >&6 ; }
3286+ cat > confinc.mk << 'END '
32873287am__doit:
3288- @echo this is the am__doit target
3288+ @echo this is the am__doit target >confinc.out
32893289.PHONY: am__doit
32903290END
3291- # If we don't find an include directive, just comment out the code.
3292- { $as_echo " $as_me :${as_lineno-$LINENO } : checking for style of include used by $am_make " >&5
3293- $as_echo_n " checking for style of include used by $am_make ... " >&6 ; }
32943291am__include=" #"
32953292am__quote=
3296- _am_result=none
3297- # First try GNU make style include.
3298- echo " include confinc" > confmf
3299- # Ignore all kinds of additional output from 'make'.
3300- case ` $am_make -s -f confmf 2> /dev/null` in # (
3301- * the\ am__doit\ target* )
3302- am__include=include
3303- am__quote=
3304- _am_result=GNU
3305- ;;
3306- esac
3307- # Now try BSD make style include.
3308- if test " $am__include " " #" ; then
3309- echo ' .include "confinc"' > confmf
3310- case ` $am_make -s -f confmf 2> /dev/null` in # (
3311- * the\ am__doit\ target* )
3312- am__include=.include
3313- am__quote=" \" "
3314- _am_result=BSD
3293+ # BSD make does it like this.
3294+ echo ' .include "confinc.mk" # ignored' > confmf.BSD
3295+ # Other make implementations (GNU, Solaris 10, AIX) do it like this.
3296+ echo ' include confinc.mk # ignored' > confmf.GNU
3297+ _am_result=no
3298+ for s in GNU BSD; do
3299+ { echo " $as_me :$LINENO : ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
3300+ (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
3301+ ac_status=$?
3302+ echo " $as_me :$LINENO : \$ ? = $ac_status " >&5
3303+ (exit $ac_status ); }
3304+ case $? :` cat confinc.out 2> /dev/null` in # (
3305+ ' 0:this is the am__doit target' :
3306+ case $s in # (
3307+ BSD) :
3308+ am__include=' .include' ' "' # (
3309+ * ) :
3310+ am__include=' include' ' '
3311+ esac ;; # (
3312+ * ) :
33153313 ;;
3316- esac
3317- fi
3318-
3319-
3320- { $as_echo " $as_me :${as_lineno-$LINENO } : result: $_am_result " >&5
3321- $as_echo " $_am_result " >&6 ; }
3322- rm -f confinc confmf
3314+ esac
3315+ if test " $am__include " ! = " #" ; then
3316+ _am_result=" yes ($s style)"
3317+ break
3318+ fi
3319+ done
3320+ rm -f confinc.* confmf.*
3321+ { $as_echo " $as_me :${as_lineno-$LINENO } : result: ${_am_result} " >&5
3322+ $as_echo " ${_am_result} " >&6 ; }
33233323
33243324# Check whether --enable-dependency-tracking was given.
33253325if test " ${enable_dependency_tracking+set} " set ; then :
@@ -5683,7 +5683,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
56835683#
56845684# INIT-COMMANDS
56855685#
5686- AMDEP_TRUE=" $AMDEP_TRUE " ac_aux_dir =" $ac_aux_dir "
5686+ AMDEP_TRUE=" $AMDEP_TRUE " MAKE =" ${MAKE-make} "
56875687
56885688_ACEOF
56895689
@@ -6297,29 +6297,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
62976297 # Older Autoconf quotes --file arguments for eval, but not when files
62986298 # are listed without --file. Let's play safe and only enable the eval
62996299 # if we detect the quoting.
6300- case $CONFIG_FILES in
6301- *\'*) eval set x "$CONFIG_FILES " ;;
6302- *) set x $CONFIG_FILES ;;
6303- esac
6300+ # TODO: see whether this extra hack can be removed once we start
6301+ # requiring Autoconf 2.70 or later.
6302+ case $CONFIG_FILES in #(
6303+ *\'*) :
6304+ eval set x "$CONFIG_FILES " ;; #(
6305+ *) :
6306+ set x $CONFIG_FILES ;; #(
6307+ *) :
6308+ ;;
6309+ esac
63046310 shift
6305- for mf
6311+ # Used to flag and report bootstrapping failures.
6312+ am_rc=0
6313+ for am_mf
63066314 do
63076315 # Strip MF so we end up with the name of the file.
6308- mf=` echo " $mf " | sed -e ' s/:.*$//' `
6309- # Check whether this is an Automake generated Makefile or not.
6310- # We used to match only the files named 'Makefile.in', but
6311- # some people rename them; so instead we look at the file content.
6312- # Grep'ing the first line is not enough: some people post-process
6313- # each Makefile.in and add a new line on top of each file to say so.
6314- # Grep'ing the whole file is not good either: AIX grep has a line
6316+ am_mf=` $as_echo " $am_mf " | sed -e ' s/:.*$//' `
6317+ # Check whether this is an Automake generated Makefile which includes
6318+ # dependency-tracking related rules and includes.
6319+ # Grep'ing the whole file directly is not great: AIX grep has a line
63156320 # limit of 2048, but all sed's we know have understand at least 4000.
6316- if sed -n 's,^#.*generated by automake.*,X,p' "$mf " | grep X >/dev/null 2>&1; then
6317- dirpart=` $as_dirname -- " $mf " ||
6318- $as_expr X" $mf " : ' X\(.*[^/]\)//*[^/][^/]*/*$' \| \
6319- X" $mf " : ' X\(//\)[^/]' \| \
6320- X" $mf " : ' X\(//\)$' \| \
6321- X" $mf " : ' X\(/\)' \| . 2> /dev/null ||
6322- $as_echo X" $mf " |
6321+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf " | grep X >/dev/null 2>&1 \
6322+ || continue
6323+ am_dirpart=` $as_dirname -- " $am_mf " ||
6324+ $as_expr X" $am_mf " : ' X\(.*[^/]\)//*[^/][^/]*/*$' \| \
6325+ X" $am_mf " : ' X\(//\)[^/]' \| \
6326+ X" $am_mf " : ' X\(//\)$' \| \
6327+ X" $am_mf " : ' X\(/\)' \| . 2> /dev/null ||
6328+ $as_echo X" $am_mf " |
63236329 sed ' /^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
63246330 s//\1/
63256331 q
@@ -6337,53 +6343,48 @@ $as_echo X"$mf" |
63376343 q
63386344 }
63396345 s/.*/./; q' `
6340- else
6341- continue
6342- fi
6343- # Extract the definition of DEPDIR, am__include, and am__quote
6344- # from the Makefile without running 'make'.
6345- DEPDIR=` sed -n ' s/^DEPDIR = //p' < " $mf " `
6346- test -z "$DEPDIR " && continue
6347- am__include=` sed -n ' s/^am__include = //p' < " $mf " `
6348- test -z "$am__include " && continue
6349- am__quote=` sed -n ' s/^am__quote = //p' < " $mf " `
6350- # Find all dependency output files, they are included files with
6351- # $( DEPDIR)
6352- # simplest approach to changing $( DEPDIR)
6353- # expansion.
6354- for file in ` sed -n "
6355- s/^$am__include $am__quote \(.*(DEPDIR).*\)$am__quote " ' $/\1/p' < " $mf " | \
6356- sed -e ' s/\$(DEPDIR)/' " $DEPDIR " ' /g' ` ; do
6357- # Make sure the directory exists.
6358- test -f "$dirpart /$file " && continue
6359- fdir=` $as_dirname -- " $file " ||
6360- $as_expr X" $file " : ' X\(.*[^/]\)//*[^/][^/]*/*$' \| \
6361- X" $file " : ' X\(//\)[^/]' \| \
6362- X" $file " : ' X\(//\)$' \| \
6363- X" $file " : ' X\(/\)' \| . 2> /dev/null ||
6364- $as_echo X" $file " |
6365- sed ' /^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
6366- s//\1/
6367- q
6368- }
6369- /^X\(\/\/\)[^/].*/{
6346+ am_filepart=` $as_basename -- " $am_mf " ||
6347+ $as_expr X/" $am_mf " : ' .*/\([^/][^/]*\)/*$' \| \
6348+ X" $am_mf " : ' X\(//\)$' \| \
6349+ X" $am_mf " : ' X\(/\)' \| . 2> /dev/null ||
6350+ $as_echo X/" $am_mf " |
6351+ sed ' /^.*\/\([^/][^/]*\)\/*$/{
63706352 s//\1/
63716353 q
63726354 }
6373- /^X\(\/\/\)$/{
6355+ /^X\/\ (\/\/\)$/{
63746356 s//\1/
63756357 q
63766358 }
6377- /^X\(\/\).*/{
6359+ /^X\/\ (\/\).*/{
63786360 s//\1/
63796361 q
63806362 }
63816363 s/.*/./; q' `
6382- as_dir=$dirpart /$fdir ; as_fn_mkdir_p
6383- # echo "creating $dirpart /$file "
6384- echo '# dummy' > "$dirpart /$file "
6385- done
6364+ { echo "$as_me :$LINENO : cd "$am_dirpart " \
6365+ && sed -e '/# am--include-marker/d' "$am_filepart " \
6366+ | $MAKE -f - am--depfiles" >&5
6367+ (cd "$am_dirpart " \
6368+ && sed -e '/# am--include-marker/d' "$am_filepart " \
6369+ | $MAKE -f - am--depfiles) >&5 2>&5
6370+ ac_status=$?
6371+ echo "$as_me :$LINENO : \$ ? = $ac_status " >&5
6372+ (exit $ac_status ); } || am_rc=$?
63866373 done
6374+ if test $am_rc -ne 0; then
6375+ { { $as_echo "$as_me :${as_lineno-$LINENO } : error: in \` $ac_pwd ':" >&5
6376+ $as_echo "$as_me : error: in \` $ac_pwd ':" >&2;}
6377+ as_fn_error $? "Something went wrong bootstrapping makefile fragments
6378+ for automatic dependency tracking. Try re-running configure with the
6379+ '--disable-dependency-tracking' option to at least be able to build
6380+ the package (albeit without support for automatic dependency tracking).
6381+ See \` config.log' for more details" "$LINENO " 5; }
6382+ fi
6383+ { am_dirpart=; unset am_dirpart;}
6384+ { am_filepart=; unset am_filepart;}
6385+ { am_mf=; unset am_mf;}
6386+ { am_rc=; unset am_rc;}
6387+ rm -f conftest-deps.mk
63876388}
63886389 ;;
63896390
0 commit comments