Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 389540 Details for
Bug 529580
sys-devel/autoconf-2.69 sometimes generates broken configure script: @am__isrc@ is not substituted (race condition)?
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
configure.diff
configure.diff (text/plain), 34.71 KB, created by
Andrew Savchenko
on 2014-11-16 22:23:11 UTC
(
hide
)
Description:
configure.diff
Filename:
MIME Type:
Creator:
Andrew Savchenko
Created:
2014-11-16 22:23:11 UTC
Size:
34.71 KB
patch
obsolete
>--- good/configure 2014-11-15 19:01:00.000000000 +0300 >+++ bad/configure 2014-11-15 18:31:00.000000000 +0300 >@@ -622,9 +622,7 @@ > # include <unistd.h> > #endif" > >-ac_subst_vars='am__EXEEXT_FALSE >-am__EXEEXT_TRUE >-LTLIBOBJS >+ac_subst_vars='LTLIBOBJS > LIBOBJS > INSTALLED_SGML2XML_ISOENT > INSTALLED_DB2X_XSLTPROC >@@ -658,7 +656,6 @@ > am__fastdepCC_FALSE > am__fastdepCC_TRUE > CCDEPMODE >-am__nodep > AMDEPBACKSLASH > AMDEP_FALSE > AMDEP_TRUE >@@ -675,10 +672,6 @@ > XSLT_PROCESSOR > HAVE_HTML_XSL_FALSE > HAVE_HTML_XSL_TRUE >-AM_BACKSLASH >-AM_DEFAULT_VERBOSITY >-AM_DEFAULT_V >-AM_V > am__untar > am__tar > AMTAR >@@ -686,7 +679,6 @@ > SET_MAKE > AWK > mkdir_p >-MKDIR_P > INSTALL_STRIP_PROGRAM > STRIP > install_sh >@@ -698,7 +690,6 @@ > VERSION > PACKAGE > CYGPATH_W >-am__isrc > INSTALL_DATA > INSTALL_SCRIPT > INSTALL_PROGRAM >@@ -743,7 +734,6 @@ > ac_subst_files='' > ac_user_opts=' > enable_option_checking >-enable_silent_rules > with_html_xsl > with_xslt_processor > with_resolver_jars >@@ -1374,12 +1364,8 @@ > --disable-option-checking ignore unrecognized --enable/--with options > --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) > --enable-FEATURE[=ARG] include FEATURE [ARG=yes] >- --enable-silent-rules less verbose build output (undo: "make V=1") >- --disable-silent-rules verbose build output (undo: "make V=0") >- --enable-dependency-tracking >- do not reject slow dependency extractors >- --disable-dependency-tracking >- speeds up one-time build >+ --disable-dependency-tracking speeds up one-time build >+ --enable-dependency-tracking do not reject slow dependency extractors > > Optional Packages: > --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] >@@ -2190,8 +2176,7 @@ > > > >-am__api_version='1.14' >- >+am__api_version="1.9" > ac_aux_dir= > for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do > if test -f "$ac_dir/install-sh"; then >@@ -2316,50 +2301,32 @@ > > { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 > $as_echo_n "checking whether build environment is sane... " >&6; } >-# Reject unsafe characters in $srcdir or the absolute working directory >-# name. Accept space and tab only in the latter. >-am_lf=' >-' >-case `pwd` in >- *[\\\"\#\$\&\'\`$am_lf]*) >- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; >-esac >-case $srcdir in >- *[\\\"\#\$\&\'\`$am_lf\ \ ]*) >- as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; >-esac >- >-# Do 'set' in a subshell so we don't clobber the current shell's >+# Just in case >+sleep 1 >+echo timestamp > conftest.file >+# Do `set' in a subshell so we don't clobber the current shell's > # arguments. Must try -L first in case configure is actually a > # symlink; some systems play weird games with the mod time of symlinks > # (eg FreeBSD returns the mod time of the symlink's containing > # directory). > if ( >- am_has_slept=no >- for am_try in 1 2; do >- echo "timestamp, slept: $am_has_slept" > conftest.file >- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` >- if test "$*" = "X"; then >- # -L didn't work. >- set X `ls -t "$srcdir/configure" conftest.file` >- fi >- if test "$*" != "X $srcdir/configure conftest.file" \ >- && test "$*" != "X conftest.file $srcdir/configure"; then >+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` >+ if test "$*" = "X"; then >+ # -L didn't work. >+ set X `ls -t $srcdir/configure conftest.file` >+ fi >+ rm -f conftest.file >+ if test "$*" != "X $srcdir/configure conftest.file" \ >+ && test "$*" != "X conftest.file $srcdir/configure"; then >+ >+ # If neither matched, then we have a broken ls. This can happen >+ # if, for instance, CONFIG_SHELL is bash and it inherits a >+ # broken ls alias from the environment. This has actually >+ # happened. Such a system could not be considered "sane". >+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken >+alias in your environment" "$LINENO" 5 >+ fi > >- # If neither matched, then we have a broken ls. This can happen >- # if, for instance, CONFIG_SHELL is bash and it inherits a >- # broken ls alias from the environment. This has actually >- # happened. Such a system could not be considered "sane". >- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken >- alias in your environment" "$LINENO" 5 >- fi >- if test "$2" = conftest.file || test $am_try -eq 2; then >- break >- fi >- # Just in case. >- sleep 1 >- am_has_slept=yes >- done > test "$2" = conftest.file > ) > then >@@ -2371,16 +2338,6 @@ > fi > { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 > $as_echo "yes" >&6; } >-# If we didn't sleep, we still need to ensure time stamps of config.status and >-# generated files are strictly newer. >-am_sleep_pid= >-if grep 'slept: no' conftest.file >/dev/null 2>&1; then >- ( sleep 1 ) & >- am_sleep_pid=$! >-fi >- >-rm -f conftest.file >- > test "$program_prefix" != NONE && > program_transform_name="s&^&$program_prefix&;$program_transform_name" > # Use a double $ so make ignores it. >@@ -2394,173 +2351,48 @@ > # expand $ac_aux_dir to an absolute path > am_aux_dir=`cd $ac_aux_dir && pwd` > >-if test x"${MISSING+set}" != xset; then >- case $am_aux_dir in >- *\ * | *\ *) >- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; >- *) >- MISSING="\${SHELL} $am_aux_dir/missing" ;; >- esac >-fi >+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" > # Use eval to expand $SHELL >-if eval "$MISSING --is-lightweight"; then >- am_missing_run="$MISSING " >+if eval "$MISSING --run true"; then >+ am_missing_run="$MISSING --run " > else > am_missing_run= >- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 >-$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} >-fi >- >-if test x"${install_sh}" != xset; then >- case $am_aux_dir in >- *\ * | *\ *) >- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; >- *) >- install_sh="\${SHELL} $am_aux_dir/install-sh" >- esac >-fi >- >-# Installed binaries are usually stripped using 'strip' when the user >-# run "make install-strip". However 'strip' might not be the right >-# tool to use in cross-compilation environments, therefore Automake >-# will honor the 'STRIP' environment variable to overrule this program. >-if test "$cross_compiling" != no; then >- if test -n "$ac_tool_prefix"; then >- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. >-set dummy ${ac_tool_prefix}strip; 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_prog_STRIP+:} false; then : >- $as_echo_n "(cached) " >&6 >-else >- if test -n "$STRIP"; then >- ac_cv_prog_STRIP="$STRIP" # Let the user override the test. >-else >-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_prog_STRIP="${ac_tool_prefix}strip" >- $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 >- >-fi >-fi >-STRIP=$ac_cv_prog_STRIP >-if test -n "$STRIP"; then >- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 >-$as_echo "$STRIP" >&6; } >-else >- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 >-$as_echo "no" >&6; } >-fi >- >- >-fi >-if test -z "$ac_cv_prog_STRIP"; then >- ac_ct_STRIP=$STRIP >- # Extract the first word of "strip", so it can be a program name with args. >-set dummy strip; 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_prog_ac_ct_STRIP+:} false; then : >- $as_echo_n "(cached) " >&6 >-else >- if test -n "$ac_ct_STRIP"; then >- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. >-else >-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_prog_ac_ct_STRIP="strip" >- $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 >- >-fi >-fi >-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP >-if test -n "$ac_ct_STRIP"; then >- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 >-$as_echo "$ac_ct_STRIP" >&6; } >-else >- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 >-$as_echo "no" >&6; } >-fi >- >- if test "x$ac_ct_STRIP" = x; then >- STRIP=":" >- 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 >- STRIP=$ac_ct_STRIP >- fi >-else >- STRIP="$ac_cv_prog_STRIP" >-fi >- >+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 >+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} > fi >-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" > >-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 >-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } >-if test -z "$MKDIR_P"; then >- if ${ac_cv_path_mkdir+:} false; then : >- $as_echo_n "(cached) " >&6 >+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then >+ # We used to keeping the `.' as first argument, in order to >+ # allow $(mkdir_p) to be used without argument. As in >+ # $(mkdir_p) $(somedir) >+ # where $(somedir) is conditionally defined. However this is wrong >+ # for two reasons: >+ # 1. if the package is installed by a user who cannot write `.' >+ # make install will fail, >+ # 2. the above comment should most certainly read >+ # $(mkdir_p) $(DESTDIR)$(somedir) >+ # so it does not work when $(somedir) is undefined and >+ # $(DESTDIR) is not. >+ # To support the latter case, we have to write >+ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), >+ # so the `.' trick is pointless. >+ mkdir_p='mkdir -p --' > else >- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR >-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin >-do >- IFS=$as_save_IFS >- test -z "$as_dir" && as_dir=. >- for ac_prog in mkdir gmkdir; do >- for ac_exec_ext in '' $ac_executable_extensions; do >- as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue >- case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( >- 'mkdir (GNU coreutils) '* | \ >- 'mkdir (coreutils) '* | \ >- 'mkdir (fileutils) '4.1*) >- ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext >- break 3;; >- esac >- done >- done >+ # On NextStep and OpenStep, the `mkdir' command does not >+ # recognize any option. It will interpret all options as >+ # directories to create, and then abort because `.' already >+ # exists. >+ for d in ./-p ./--version; >+ do >+ test -d $d && rmdir $d > done >-IFS=$as_save_IFS >- >-fi >- >- test -d ./--version && rmdir ./--version >- if test "${ac_cv_path_mkdir+set}" = set; then >- MKDIR_P="$ac_cv_path_mkdir -p" >+ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. >+ if test -f "$ac_aux_dir/mkinstalldirs"; then >+ mkdir_p='$(mkinstalldirs)' > else >- # As a last resort, use the slow shell script. Don't cache a >- # value for MKDIR_P within a source directory, because that will >- # break other packages using the cache if that directory is >- # removed, or if the value is a relative name. >- MKDIR_P="$ac_install_sh -d" >+ mkdir_p='$(install_sh) -d' > fi > fi >-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 >-$as_echo "$MKDIR_P" >&6; } > > for ac_prog in gawk mawk nawk awk > do >@@ -2644,53 +2476,10 @@ > fi > rmdir .tst 2>/dev/null > >-# Check whether --enable-silent-rules was given. >-if test "${enable_silent_rules+set}" = set; then : >- enableval=$enable_silent_rules; >-fi >- >-case $enable_silent_rules in # ((( >- yes) AM_DEFAULT_VERBOSITY=0;; >- no) AM_DEFAULT_VERBOSITY=1;; >- *) AM_DEFAULT_VERBOSITY=1;; >-esac >-am_make=${MAKE-make} >-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 >-$as_echo_n "checking whether $am_make supports nested variables... " >&6; } >-if ${am_cv_make_support_nested_variables+:} false; then : >- $as_echo_n "(cached) " >&6 >-else >- if $as_echo 'TRUE=$(BAR$(V)) >-BAR0=false >-BAR1=true >-V=1 >-am__doit: >- @$(TRUE) >-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then >- am_cv_make_support_nested_variables=yes >-else >- am_cv_make_support_nested_variables=no >-fi >-fi >-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 >-$as_echo "$am_cv_make_support_nested_variables" >&6; } >-if test $am_cv_make_support_nested_variables = yes; then >- AM_V='$(V)' >- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' >-else >- AM_V=$AM_DEFAULT_VERBOSITY >- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY >-fi >-AM_BACKSLASH='\' >- >-if test "`cd $srcdir && pwd`" != "`pwd`"; then >- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output >- # is not polluted with repeated "-I." >- am__isrc=' -I$(srcdir)' >- # test to see if srcdir already configured >- if test -f $srcdir/config.status; then >- as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 >- fi >+# test to see if srcdir already configured >+if test "`cd $srcdir && pwd`" != "`pwd`" && >+ test -f $srcdir/config.status; then >+ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 > fi > > # test whether we have cygpath >@@ -2704,7 +2493,6 @@ > > > # Define the identity of the package. >- > PACKAGE=docbook2X > VERSION=0.8.8 > >@@ -2734,70 +2522,120 @@ > > MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} > >-# 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> >-mkdir_p='$(MKDIR_P)' >- >-# We need awk for the "check" target. The system "awk" is bad on >-# some platforms. >-# Always define AMTAR for backward compatibility. Yes, it's still used >-# in the wild :-( We should find a proper way to deprecate it ... >-AMTAR='$${TAR-tar}' >+install_sh=${install_sh-"$am_aux_dir/install-sh"} > >+# Installed binaries are usually stripped using `strip' when the user >+# run `make install-strip'. However `strip' might not be the right >+# tool to use in cross-compilation environments, therefore Automake >+# will honor the `STRIP' environment variable to overrule this program. >+if test "$cross_compiling" != no; then >+ if test -n "$ac_tool_prefix"; then >+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. >+set dummy ${ac_tool_prefix}strip; 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_prog_STRIP+:} false; then : >+ $as_echo_n "(cached) " >&6 >+else >+ if test -n "$STRIP"; then >+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test. >+else >+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_prog_STRIP="${ac_tool_prefix}strip" >+ $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 > >-# We'll loop over all known methods to create a tar archive until one works. >-_am_tools='gnutar pax cpio none' >+fi >+fi >+STRIP=$ac_cv_prog_STRIP >+if test -n "$STRIP"; then >+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 >+$as_echo "$STRIP" >&6; } >+else >+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 >+$as_echo "no" >&6; } >+fi > >-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' > >+fi >+if test -z "$ac_cv_prog_STRIP"; then >+ ac_ct_STRIP=$STRIP >+ # Extract the first word of "strip", so it can be a program name with args. >+set dummy strip; 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_prog_ac_ct_STRIP+:} false; then : >+ $as_echo_n "(cached) " >&6 >+else >+ if test -n "$ac_ct_STRIP"; then >+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. >+else >+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_prog_ac_ct_STRIP="strip" >+ $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 > >+fi >+fi >+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP >+if test -n "$ac_ct_STRIP"; then >+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 >+$as_echo "$ac_ct_STRIP" >&6; } >+else >+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 >+$as_echo "no" >&6; } >+fi > >+ if test "x$ac_ct_STRIP" = x; then >+ STRIP=":" >+ 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 >+ STRIP=$ac_ct_STRIP >+ fi >+else >+ STRIP="$ac_cv_prog_STRIP" >+fi > >+fi >+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" > >+# We need awk for the "check" target. The system "awk" is bad on >+# some platforms. >+# Always define AMTAR for backward compatibility. > >-# POSIX will say in a future version that running "rm -f" with no argument >-# is OK; and we want to be able to make that assumption in our Makefile >-# recipes. So use an aggressive probe to check that the usage we want is >-# actually supported "in the wild" to an acceptable degree. >-# See automake bug#10828. >-# To make any issue more visible, cause the running configure to be aborted >-# by default if the 'rm' program in use doesn't match our expectations; the >-# user can still override this though. >-if rm -f && rm -fr && rm -rf; then : OK; else >- cat >&2 <<'END' >-Oops! >+AMTAR=${AMTAR-"${am_missing_run}tar"} > >-Your 'rm' program seems unable to run without file operands specified >-on the command line, even when the '-f' option is present. This is contrary >-to the behaviour of most rm programs out there, and not conforming with >-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> >+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' > >-Please tell bug-automake@gnu.org about your system, including the value >-of your $PATH and any error possibly output before this message. This >-can help us improve future automake versions. > >-END >- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then >- echo 'Configuration will proceed anyway, since you have set the' >&2 >- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 >- echo >&2 >- else >- cat >&2 <<'END' >-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/>. > >-If you want to complete the configuration process using your problematic >-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM >-to "yes", and re-run configure. > >-END >- as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 >- fi >-fi > > XSLT_PROCESSOR="libxslt" > >@@ -2844,7 +2682,9 @@ > > > >- if test "x$HTML_XSL" != "xno"; then >+ >+ >+if test "x$HTML_XSL" != "xno"; then > HAVE_HTML_XSL_TRUE= > HAVE_HTML_XSL_FALSE='#' > else >@@ -3642,65 +3482,6 @@ > ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' > ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' > ac_compiler_gnu=$ac_cv_c_compiler_gnu >- >-ac_ext=c >-ac_cpp='$CPP $CPPFLAGS' >-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' >-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' >-ac_compiler_gnu=$ac_cv_c_compiler_gnu >-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 >-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } >-if ${am_cv_prog_cc_c_o+:} false; then : >- $as_echo_n "(cached) " >&6 >-else >- cat confdefs.h - <<_ACEOF >conftest.$ac_ext >-/* end confdefs.h. */ >- >-int >-main () >-{ >- >- ; >- return 0; >-} >-_ACEOF >- # Make sure it works both with $CC and with simple cc. >- # Following AC_PROG_CC_C_O, we do the test twice because some >- # compilers refuse to overwrite an existing .o file with -o, >- # though they will create one. >- am_cv_prog_cc_c_o=yes >- for am_i in 1 2; do >- if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 >- ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); } \ >- && test -f conftest2.$ac_objext; then >- : OK >- else >- am_cv_prog_cc_c_o=no >- break >- fi >- done >- rm -f core conftest* >- unset am_i >-fi >-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 >-$as_echo "$am_cv_prog_cc_c_o" >&6; } >-if test "$am_cv_prog_cc_c_o" != yes; then >- # Losing compiler, so override with the script. >- # FIXME: It is wrong to rewrite CC. >- # But if we don't then we get into trouble of one sort or another. >- # A longer-term fix would be to have automake use am__CC in this case, >- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" >- CC="$am_aux_dir/compile $CC" >-fi >-ac_ext=c >-ac_cpp='$CPP $CPPFLAGS' >-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' >-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' >-ac_compiler_gnu=$ac_cv_c_compiler_gnu >- > DEPDIR="${am__leading_dot}deps" > > ac_config_commands="$ac_config_commands depfiles" >@@ -3709,7 +3490,7 @@ > am_make=${MAKE-make} > cat > confinc << 'END' > am__doit: >- @echo this is the am__doit target >+ @echo done > .PHONY: am__doit > END > # If we don't find an include directive, just comment out the code. >@@ -3720,24 +3501,24 @@ > _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 >+# We grep out `Entering directory' and `Leaving directory' >+# messages which can occur if `w' ends up in MAKEFLAGS. >+# In particular we don't look at `^make:' because GNU make might >+# be invoked under some other name (usually "gmake"), in which >+# case it prints its new name instead of `make'. >+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then >+ am__include=include >+ am__quote= >+ _am_result=GNU >+fi > # 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 >+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then >+ am__include=.include >+ am__quote="\"" >+ _am_result=BSD >+ fi > fi > > >@@ -3753,9 +3534,10 @@ > if test "x$enable_dependency_tracking" != xno; then > am_depcomp="$ac_aux_dir/depcomp" > AMDEPBACKSLASH='\' >- am__nodep='_no' > fi >- if test "x$enable_dependency_tracking" != xno; then >+ >+ >+if test "x$enable_dependency_tracking" != xno; then > AMDEP_TRUE= > AMDEP_FALSE='#' > else >@@ -3765,6 +3547,7 @@ > > > >+ > depcc="$CC" am_compiler_list= > > { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 >@@ -3776,9 +3559,8 @@ > # We make a subdir and do the tests there. Otherwise we can end up > # making bogus files that we don't know about and never remove. For > # instance it was reported that on HP-UX the gcc test will end up >- # making a dummy file named 'D' -- because '-MD' means "put the output >- # in D". >- rm -rf conftest.dir >+ # making a dummy file named `D' -- because `-MD' means `put the output >+ # in D'. > mkdir conftest.dir > # Copy depcomp to subdir because otherwise we won't find it if we're > # using a relative directory. >@@ -3796,11 +3578,6 @@ > if test "$am_compiler_list" = ""; then > am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` > fi >- am__universal=false >- case " $depcc " in #( >- *\ -arch\ *\ -arch\ *) am__universal=true ;; >- esac >- > for depmode in $am_compiler_list; do > # Setup a source with many dependencies, because some compilers > # like to wrap large dependency lists on column 80 (with \), and >@@ -3812,49 +3589,34 @@ > : > sub/conftest.c > for i in 1 2 3 4 5 6; do > echo '#include "conftst'$i'.h"' >> sub/conftest.c >- # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with >- # Solaris 10 /bin/sh. >- echo '/* dummy */' > sub/conftst$i.h >+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with >+ # Solaris 8's {/usr,}/bin/sh. >+ touch sub/conftst$i.h > done > echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf > >- # We check with '-c' and '-o' for the sake of the "dashmstdout" >- # mode. It turns out that the SunPro C++ compiler does not properly >- # handle '-M -o', and we need to detect this. Also, some Intel >- # versions had trouble with output in subdirs. >- am__obj=sub/conftest.${OBJEXT-o} >- am__minus_obj="-o $am__obj" > case $depmode in >- gcc) >- # This depmode causes a compiler race in universal mode. >- test "$am__universal" = false || continue >- ;; > nosideeffect) >- # After this tag, mechanisms are not by side-effect, so they'll >- # only be used when explicitly requested. >+ # after this tag, mechanisms are not by side-effect, so they'll >+ # only be used when explicitly requested > if test "x$enable_dependency_tracking" = xyes; then > continue > else > break > fi > ;; >- msvc7 | msvc7msys | msvisualcpp | msvcmsys) >- # This compiler won't grok '-c -o', but also, the minuso test has >- # not run yet. These depmodes are late enough in the game, and >- # so weak that their functioning should not be impacted. >- am__obj=conftest.${OBJEXT-o} >- am__minus_obj= >- ;; > none) break ;; > esac >+ # We check with `-c' and `-o' for the sake of the "dashmstdout" >+ # mode. It turns out that the SunPro C++ compiler does not properly >+ # handle `-M -o', and we need to detect this. > if depmode=$depmode \ >- source=sub/conftest.c object=$am__obj \ >+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ > depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ >- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ >+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ > >/dev/null 2>conftest.err && >- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && > grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && >- grep $am__obj sub/conftest.Po > /dev/null 2>&1 && >+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && > ${MAKE-make} -s -f confmf > /dev/null 2>&1; then > # icc doesn't choke on unknown options, it will just issue warnings > # or remarks (even with -Werror). So we grep stderr for any message >@@ -3882,7 +3644,9 @@ > $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } > CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type > >- if >+ >+ >+if > test "x$enable_dependency_tracking" != xno \ > && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then > am__fastdepCC_TRUE= >@@ -4145,7 +3909,9 @@ > fi > > >- if test -n "$GROFF"; then >+ >+ >+if test -n "$GROFF"; then > HAVE_GROFF_TRUE= > HAVE_GROFF_FALSE='#' > else >@@ -4194,7 +3960,9 @@ > fi > > >- if test -n "$XMLLINT"; then >+ >+ >+if test -n "$XMLLINT"; then > HAVE_XMLLINT_TRUE= > HAVE_XMLLINT_FALSE='#' > else >@@ -4243,7 +4011,9 @@ > fi > > >- if test -n "$TIDY"; then >+ >+ >+if test -n "$TIDY"; then > HAVE_TIDY_TRUE= > HAVE_TIDY_FALSE='#' > else >@@ -5096,22 +4866,6 @@ > LTLIBOBJS=$ac_ltlibobjs > > >-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 >-$as_echo_n "checking that generated files are newer than configure... " >&6; } >- if test -n "$am_sleep_pid"; then >- # Hide warnings about reused PIDs. >- wait $am_sleep_pid 2>/dev/null >- fi >- { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 >-$as_echo "done" >&6; } >- if test -n "$EXEEXT"; then >- am__EXEEXT_TRUE= >- am__EXEEXT_FALSE='#' >-else >- am__EXEEXT_TRUE='#' >- am__EXEEXT_FALSE= >-fi >- > if test -z "${HAVE_HTML_XSL_TRUE}" && test -z "${HAVE_HTML_XSL_FALSE}"; then > as_fn_error $? "conditional \"HAVE_HTML_XSL\" was never defined. > Usually this means the macro was only invoked conditionally." "$LINENO" 5 >@@ -5610,7 +5364,6 @@ > ac_pwd='$ac_pwd' > srcdir='$srcdir' > INSTALL='$INSTALL' >-MKDIR_P='$MKDIR_P' > AWK='$AWK' > test -n "\$AWK" || AWK=awk > _ACEOF >@@ -6198,11 +5951,6 @@ > [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; > *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; > esac >- ac_MKDIR_P=$MKDIR_P >- case $MKDIR_P in >- [\\/$]* | ?:[\\/]* ) ;; >- */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; >- esac > _ACEOF > > cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 >@@ -6257,7 +6005,6 @@ > s&@abs_builddir@&$ac_abs_builddir&;t t > s&@abs_top_builddir@&$ac_abs_top_builddir&;t t > s&@INSTALL@&$ac_INSTALL&;t t >-s&@MKDIR_P@&$ac_MKDIR_P&;t t > $ac_datarootdir_hack > " > eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ >@@ -6303,22 +6050,21 @@ > || as_fn_error $? "could not create -" "$LINENO" 5 > fi > # Compute "$ac_file"'s index in $config_headers. >-_am_arg="$ac_file" > _am_stamp_count=1 > for _am_header in $config_headers :; do > case $_am_header in >- $_am_arg | $_am_arg:* ) >+ "$ac_file" | "$ac_file":* ) > break ;; > * ) > _am_stamp_count=`expr $_am_stamp_count + 1` ;; > esac > done >-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || >-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ >- X"$_am_arg" : 'X\(//\)[^/]' \| \ >- X"$_am_arg" : 'X\(//\)$' \| \ >- X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || >-$as_echo X"$_am_arg" | >+echo "timestamp for "$ac_file"" >`$as_dirname -- "$ac_file" || >+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ >+ X"$ac_file" : 'X\(//\)[^/]' \| \ >+ X"$ac_file" : 'X\(//\)$' \| \ >+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || >+$as_echo X"$ac_file" | > sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ > s//\1/ > q >@@ -6345,28 +6091,17 @@ > > > case $ac_file$ac_mode in >- "depfiles":C) test x"$AMDEP_TRUE" != x"" || { >- # 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 >- shift >- for 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 >- # 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" || >+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; 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. >+ # So let's grep whole file. >+ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then >+ dirpart=`$as_dirname -- "$mf" || > $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ > X"$mf" : 'X\(//\)[^/]' \| \ > X"$mf" : 'X\(//\)$' \| \ >@@ -6389,26 +6124,28 @@ > 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" || >+ 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"` >+ # When using ansi2knr, U may be empty or an underscore; expand it >+ U=`sed -n 's/^U = //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' -e 's/\$U/'"$U"'/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\(//\)$' \| \ >@@ -6431,12 +6168,11 @@ > q > } > s/.*/./; q'` >- as_dir=$dirpart/$fdir; as_fn_mkdir_p >- # echo "creating $dirpart/$file" >- echo '# dummy' > "$dirpart/$file" >- done >+ as_dir=$dirpart/$fdir; as_fn_mkdir_p >+ # echo "creating $dirpart/$file" >+ echo '# dummy' > "$dirpart/$file" > done >-} >+done > ;; > > esac
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 529580
: 389540 |
389542
|
389544
|
389546
|
389548