You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2014/05/13 14:31:18 UTC
svn commit: r1594213 - in /subversion/branches/1.6.x-r1138375: ./
build/ac-macros/apache.m4
Author: stsp
Date: Tue May 13 12:31:18 2014
New Revision: 1594213
URL: http://svn.apache.org/r1594213
Log:
On the 1.6.x-r1138375 branch, merge r1138375 from trunk.
This merges the second hunk from the diff of r1138375, allowing
1.6.x to be compiled with APR 1.5.
Modified:
subversion/branches/1.6.x-r1138375/ (props changed)
subversion/branches/1.6.x-r1138375/build/ac-macros/apache.m4
Propchange: subversion/branches/1.6.x-r1138375/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1138375
Modified: subversion/branches/1.6.x-r1138375/build/ac-macros/apache.m4
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-r1138375/build/ac-macros/apache.m4?rev=1594213&r1=1594212&r2=1594213&view=diff
==============================================================================
--- subversion/branches/1.6.x-r1138375/build/ac-macros/apache.m4 (original)
+++ subversion/branches/1.6.x-r1138375/build/ac-macros/apache.m4 Tue May 13 12:31:18 2014
@@ -87,7 +87,7 @@ if test -n "$APXS" && test "$APXS" != "n
esac
old_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
- AC_EGREP_CPP([[apache_minor_version= *"$apache_minor_version_wanted_regex"]],
+ AC_EGREP_CPP([apache_minor_version= *\"$apache_minor_version_wanted_regex\"],
[
#include "$APXS_INCLUDE/ap_release.h"
apache_minor_version=AP_SERVER_MINORVERSION],