svn commit: r1769973 - /subversion/trunk/build/ac-macros/zlib.m4

[st...@apache.org]

Author: stsp
Date: Wed Nov 16 13:24:23 2016
New Revision: 1769973

URL: http://svn.apache.org/viewvc?rev=1769973&view=rev
Log:
Filter standard library directories from $SVN_ZLIB_LIBS obtained by pkg-config.

Before:
$ grep ZLIB config.log
SVN_ZLIB_INCLUDES='-I/usr/include'
SVN_ZLIB_LIBS='-L/usr/lib -lz'

After:
$ grep ZLIB config.log
SVN_ZLIB_INCLUDES='-I/usr/include'
SVN_ZLIB_LIBS='-lz'

* build/ac-macros/zlib.m4: After detecting zlib via pkg-config, filter out
   standard library directories to avoid potentially picking up conflicting
   libraries from there, e.g. when using self-compiled dependencies installed
   in non-standard locations.
   (We do this for all our dependencies, not just zlib, because libtool...)

Modified:
    subversion/trunk/build/ac-macros/zlib.m4

Modified: subversion/trunk/build/ac-macros/zlib.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/zlib.m4?rev=1769973&r1=1769972&r2=1769973&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/zlib.m4 (original)
+++ subversion/trunk/build/ac-macros/zlib.m4 Wed Nov 16 13:24:23 2016
@@ -94,6 +94,7 @@ AC_DEFUN(SVN_ZLIB_PKG_CONFIG,
       zlib_found=yes
       SVN_ZLIB_INCLUDES=`$PKG_CONFIG zlib --cflags`
       SVN_ZLIB_LIBS=`$PKG_CONFIG zlib --libs`
+      SVN_ZLIB_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($SVN_ZLIB_LIBS)`"
     else
       AC_MSG_RESULT([no])
     fi