diff options
author | Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com> | 2015-05-13 11:08:26 +0000 |
---|---|---|
committer | Michael Haubenwallner <haubi@gcc.gnu.org> | 2015-05-13 11:08:26 +0000 |
commit | 7860443bb01d7b3595eaf75ad41cfeb642f84624 (patch) | |
tree | 9747ff24e24a26081fa233e15f53eab42cdd1fb3 /libjava/libltdl/configure | |
parent | 32ff3768b1f6a48f9c640f7b7f285ab001e44344 (diff) | |
download | gcc-7860443bb01d7b3595eaf75ad41cfeb642f84624.zip gcc-7860443bb01d7b3595eaf75ad41cfeb642f84624.tar.gz gcc-7860443bb01d7b3595eaf75ad41cfeb642f84624.tar.bz2 |
libjava/libltdl: Bump to automake 1.11.6
2015-05-13 Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
* Makefile.in: Regenerated with automake-1.11.6.
* aclocal.m4: Likewise.
* configure: Likewise.
From-SVN: r223137
Diffstat (limited to 'libjava/libltdl/configure')
-rwxr-xr-x | libjava/libltdl/configure | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/libjava/libltdl/configure b/libjava/libltdl/configure index 146ca43..fc3a90a 100755 --- a/libjava/libltdl/configure +++ b/libjava/libltdl/configure @@ -773,6 +773,7 @@ build am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -2935,11 +2936,11 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. +# 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}' -AMTAR=${AMTAR-"${am_missing_run}tar"} - -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -3768,6 +3769,7 @@ fi 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 AMDEP_TRUE= @@ -3792,6 +3794,7 @@ else # 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 mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -3851,7 +3854,7 @@ else break fi ;; - msvisualcpp | msvcmsys) + 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. @@ -4771,7 +4774,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4774 "configure"' > conftest.$ac_ext + echo '#line 4777 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6462,11 +6465,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6465: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6468: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6469: \$? = $ac_status" >&5 + echo "$as_me:6472: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6724,11 +6727,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6727: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6730: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6731: \$? = $ac_status" >&5 + echo "$as_me:6734: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6786,11 +6789,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6789: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6792: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6793: \$? = $ac_status" >&5 + echo "$as_me:6796: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8105,7 +8108,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 8108 "configure"' > conftest.$ac_ext + echo '#line 8111 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8658,7 +8661,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 8661 "configure" +#line 8664 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -8756,7 +8759,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 8759 "configure" +#line 8762 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10597,7 +10600,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10600 "configure" +#line 10603 "configure" #include "confdefs.h" #if HAVE_DLFCN_H |