aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2012-06-09 19:15:36 -0700
committerMark Adler <madler@alumni.caltech.edu>2012-06-09 19:15:36 -0700
commita72bcd5607a6b7f48a78c1485783c55389d18f55 (patch)
treed80d5a6260dea17216ab1f5bbff8bab0832cc6b2
parentf947435b30cf3c10b96eec3024429e7555185452 (diff)
downloadzlib-a72bcd5607a6b7f48a78c1485783c55389d18f55.tar.gz
zlib-a72bcd5607a6b7f48a78c1485783c55389d18f55.tar.bz2
zlib-a72bcd5607a6b7f48a78c1485783c55389d18f55.zip
On Darwin, only use /usr/bin/libtool if libtool is not Apple.
The original change was to always use /usr/bin/libtool on Darwin, in order to avoid using a GNU libtool installed by the user in the path ahead of Apple's libtool. However someone might install a more recent Apple libtool ahead of /usr/bin/libtool. This commit checks to see if libtool is Apple, and uses /usr/bin/libtool if it isn't.
-rwxr-xr-xconfigure6
1 files changed, 5 insertions, 1 deletions
diff --git a/configure b/configure
index 36c7d8e..5e548a9 100755
--- a/configure
+++ b/configure
@@ -231,7 +231,11 @@ if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) >> configure.log 2>&1; then
231 SHAREDLIBV=libz.$VER$shared_ext 231 SHAREDLIBV=libz.$VER$shared_ext
232 SHAREDLIBM=libz.$VER1$shared_ext 232 SHAREDLIBM=libz.$VER1$shared_ext
233 LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"} 233 LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"}
234 AR="/usr/bin/libtool" 234 if test "`libtool -V 2>&1 | grep -c Apple`" != "0"; then
235 AR="libtool"
236 else
237 AR="/usr/bin/libtool"
238 fi
235 ARFLAGS="-o" ;; 239 ARFLAGS="-o" ;;
236 *) LDSHARED=${LDSHARED-"$cc -shared"} ;; 240 *) LDSHARED=${LDSHARED-"$cc -shared"} ;;
237 esac 241 esac