[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Improve the regex of sed command of SVN_SERF_INCLUDES macro

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Wed, 08 Jul 2015 10:11:47 +0100

Kang Kai <Kai.Kang_at_windriver.com> writes:

> Index: build/ac-macros/serf.m4
> ===================================================================
> --- build/ac-macros/serf.m4 (revision 1689799)
> +++ build/ac-macros/serf.m4 (working copy)
> @@ -168,7 +168,7 @@
> 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/[[:space:]]-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'`"]

I changed [:space:] to a literal space for consistency with the rest of
the regex. I suppose we could switch [:space:] everwhere but I don't
think that is necessary. Comitted as r1689824. Thanks!

-- 
Philip Martin | Subversion Committer
WANdisco // *Non-Stop Data*
Received on 2015-07-08 11:12:05 CEST

This is an archived mail posted to the Subversion Dev mailing list.