subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1138375 - /subversion/trunk/build/ac-macros/apache.m4
Date Wed, 22 Jun 2011 10:09:17 GMT
Author: philip
Date: Wed Jun 22 10:09:17 2011
New Revision: 1138375

URL: http://svn.apache.org/viewvc?rev=1138375&view=rev
Log:
* build/ac-macros/apache.m4
  (SVN_FIND_APACHE): Fix APR version checking, it was erroneously
   checking for any one character in the rather than the whole
   line.  Make Apache-2.4 a requirement for using APR-2.

Modified:
    subversion/trunk/build/ac-macros/apache.m4

Modified: subversion/trunk/build/ac-macros/apache.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/apache.m4?rev=1138375&r1=1138374&r2=1138375&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/apache.m4 (original)
+++ subversion/trunk/build/ac-macros/apache.m4 Wed Jun 22 10:09:17 2011
@@ -100,7 +100,7 @@ if test -n "$APXS" && test "$APXS" != "n
       apache_minor_version_wanted_regex=["[1-4]"]
       ;;
     2)
-      apache_minor_version_wanted_regex="0"
+      apache_minor_version_wanted_regex="4"
       ;;
     *)
       AC_MSG_ERROR([unknown APR version])
@@ -108,7 +108,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],



Mime
View raw message