You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by br...@apache.org on 2018/10/27 18:55:54 UTC

svn commit: r1844983 - /subversion/trunk/build/ac-macros/serf.m4

Author: brane
Date: Sat Oct 27 18:55:54 2018
New Revision: 1844983

URL: http://svn.apache.org/viewvc?rev=1844983&view=rev
Log:
Fix search for Serf via pkg-config when the include directory contains '-D'.

* build/ac-macros/serf.m4
  (SVN_SERF_PKG_CONFIG): Use "pkg-config --cflags-only-I". 

Patch by: Ian Miller
Fixes #4670

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

Modified: subversion/trunk/build/ac-macros/serf.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/serf.m4?rev=1844983&r1=1844982&r2=1844983&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/serf.m4 (original)
+++ subversion/trunk/build/ac-macros/serf.m4 Sat Oct 27 18:55:54 2018
@@ -168,8 +168,8 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG,
         if $PKG_CONFIG $serf_pc_arg --atleast-version=$serf_check_version; then
           AC_MSG_RESULT([yes])
           serf_found=yes
-          SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags | $SED -e 's/ -D[^ ]*//g' -e 's/^-D[^ ]*//g'`]
-          SVN_SERF_LIBS=`$PKG_CONFIG $serf_pc_arg --libs-only-l` 
+          SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags-only-I`]
+          SVN_SERF_LIBS=[`$PKG_CONFIG $serf_pc_arg --libs-only-l`]
           dnl don't use --libs-only-L because then we might miss some options
           LDFLAGS=["$LDFLAGS `$PKG_CONFIG $serf_pc_arg --libs | $SED -e 's/-l[^ ]*//g'`"]
           break