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

[ph...@apache.org]

Author: philip
Date: Wed Jul  8 09:09:38 2015
New Revision: 1689824

URL: http://svn.apache.org/r1689824
Log:
* build/ac-macros/serf.m4
  (SVN_SERF_PKG_CONFIG): Tweak sed regex.  The regex was too simple, it
   mangled any "-D", for example, a path "My-Demo" was removed. Improve
   the regex to only delete the -D after a space or at start of the line.

Patch by: <Kai.Kang{_AT_}windriver.com>

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=1689824&r1=1689823&r2=1689824&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/serf.m4 (original)
+++ subversion/trunk/build/ac-macros/serf.m4 Wed Jul  8 09:09:38 2015
@@ -168,7 +168,7 @@ 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'`]
+          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` 
           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'`"]