diff options
| author | Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com> | 2015-05-13 11:31:32 +0000 |
|---|---|---|
| committer | Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com> | 2015-05-13 11:31:32 +0000 |
| commit | c9eeb2c3330dd81e725f03e914fb42171973158d (patch) | |
| tree | 0a10eb531722592a54681a4185c070debdb747bd /zlib/configure | |
| parent | af0c59afb04886614eb925c3fdbf6d33c463c708 (diff) | |
zlib: 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.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@223151 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'zlib/configure')
| -rwxr-xr-x | zlib/configure | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/zlib/configure b/zlib/configure index 1a9d854e8d8..3d1b526782e 100755 --- a/zlib/configure +++ b/zlib/configure @@ -630,6 +630,7 @@ LIBTOOL am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -2826,11 +2827,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 -' @@ -3755,6 +3756,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= @@ -3779,6 +3781,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. @@ -3838,7 +3841,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. @@ -10403,7 +10406,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10406 "configure" +#line 10409 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10509,7 +10512,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10512 "configure" +#line 10515 "configure" #include "confdefs.h" #if HAVE_DLFCN_H |