| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From f1b6e49f12a18eabe88eb732b578a16281d09499 Mon Sep 17 00:00:00 2001 |
| 2 | From: Jose Lamego <jose.a.lamego@linux.intel.com> |
| 3 | Date: Thu, 2 Jul 2015 11:37:43 +0000 |
| 4 | Subject: [PATCH] serf.m4: Regex modified to allow '-D' in paths |
| 5 | |
| 6 | Upstream-Status: Accepted |
| 7 | |
| 8 | The patch is merged by subversion upstream with replacing '[[:space:]]' with ' '. |
| 9 | |
| 10 | http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/serf.m4?r1=1594156&r2=1689824 |
| 11 | |
| 12 | Signed-off-by: Jose Lamego <jose.a.lamego@linux.intel.com> |
| 13 | --- |
| 14 | build/ac-macros/serf.m4 | 2 +- |
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 16 | |
| 17 | diff --git a/build/ac-macros/serf.m4 b/build/ac-macros/serf.m4 |
| 18 | index ae11e75..ff8cbae 100644 |
| 19 | --- a/build/ac-macros/serf.m4 |
| 20 | +++ b/build/ac-macros/serf.m4 |
| 21 | @@ -168,7 +168,7 @@ |
| 22 | if $PKG_CONFIG $serf_pc_arg --atleast-version=$serf_check_version; then |
| 23 | AC_MSG_RESULT([yes]) |
| 24 | serf_found=yes |
| 25 | - SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags | $SED -e 's/-D[^ ]*//g'`] |
| 26 | + SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags | $SED -e 's/ -D[^ ]*//g' -e 's/^-D[^ ]*//g'`] |
| 27 | SVN_SERF_LIBS=`$PKG_CONFIG $serf_pc_arg --libs-only-l` |
| 28 | dnl don't use --libs-only-L because then we might miss some options |
| 29 | LDFLAGS=["$LDFLAGS `$PKG_CONFIG $serf_pc_arg --libs | $SED -e 's/-l[^ ]*//g'`"] |
| 30 | -- |
| 31 | 1.8.4.5 |
| 32 | |