diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2012-06-09 19:15:36 -0700 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2012-06-09 19:15:36 -0700 |
| commit | a72bcd5607a6b7f48a78c1485783c55389d18f55 (patch) | |
| tree | d80d5a6260dea17216ab1f5bbff8bab0832cc6b2 /configure | |
| parent | f947435b30cf3c10b96eec3024429e7555185452 (diff) | |
| download | zlib-a72bcd5607a6b7f48a78c1485783c55389d18f55.tar.gz | |
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.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -231,7 +231,11 @@ if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) >> configure.log 2>&1; then SHAREDLIBV=libz.$VER$shared_ext SHAREDLIBM=libz.$VER1$shared_ext LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"} - AR="/usr/bin/libtool" + if test "`libtool -V 2>&1 | grep -c Apple`" != "0"; then + AR="libtool" + else + AR="/usr/bin/libtool" + fi ARFLAGS="-o" ;; *) LDSHARED=${LDSHARED-"$cc -shared"} ;; esac |