[SVN-4670] SVN_SERF_INCLUDES in build/ac-macros/serf.m4 cuts off directories with '-D' in the name

• Type: Bug
• Status: Resolved
• Priority: Minor
• Resolution: Fixed
• Affects Version/s: 1.8.17
• Component/s: compile
• Labels: easyfix patch

Environment

Linux

• Assignee: Unassigned
• Reporter: Ian Miller
• Created: 19/Jan/17 21:30
• Updated: 27/Oct/18 18:56
• Resolved: 27/Oct/18 18:56

Description

SED parses out the end of the directory if '-D' is used anywhere in the source directory tree (with SERF enabled). For example:

Running the build here:
/root/my-Directory/subversion-1.8.9

Causes the serf includes to be truncated to:
-I/root/my

I noticed this because my Jenkin's pipeline build appended a hash to the directory name starting with '-D'

Here's the fix:

diff -Naur a/build/ac-macros/serf.m4 b/build/ac-macros/serf.m4
--- a/build/ac-macros/serf.m4   2017-01-19 13:51:38.878936415 -0500
+++ b/build/ac-macros/serf.m4   2017-01-19 16:14:08.984860301 -0500
@@ -143,7 +143,7 @@
         if $PKG_CONFIG $serf_major --atleast-version=$serf_check_version; then
           AC_MSG_RESULT([yes])
           serf_found=yes
-          SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_major --cflags | $SED -e 's/-D[^ ]*//g'`]
+          SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_major --cflags-only-I`]
           SVN_SERF_LIBS=`$PKG_CONFIG $serf_major --libs` 
           break
         else