diff options
| author | Joel Brobecker <brobecker@adacore.com> | 2015-11-25 15:09:09 -0800 |
|---|---|---|
| committer | Joel Brobecker <brobecker@adacore.com> | 2015-11-25 15:14:47 -0800 |
| commit | da09a436519e8085d328a586c438b5b0a560924d (patch) | |
| tree | 00c45547fe27ee944ef36f7260a241e9d287a17b /zlib/configure | |
| parent | 74b03b91333ccbc8fa70647eca22062e902f797f (diff) | |
| download | gdb-da09a436519e8085d328a586c438b5b0a560924d.zip gdb-da09a436519e8085d328a586c438b5b0a560924d.tar.gz gdb-da09a436519e8085d328a586c438b5b0a560924d.tar.bz2 | |
Import zlib 1.2.8 with local change merged in.
ChangeLog:
* zlib: Update to zlib 1.2.8 with local changes merged in.
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 8378857..9f7b1c6 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 @@ -2828,11 +2829,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 -' @@ -3757,6 +3758,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= @@ -3781,6 +3783,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. @@ -3840,7 +3843,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. @@ -10405,7 +10408,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10408 "configure" +#line 10411 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10511,7 +10514,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10514 "configure" +#line 10517 "configure" #include "confdefs.h" #if HAVE_DLFCN_H |