subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1138410 - /subversion/trunk/build/ac-macros/apache.m4
Date Wed, 22 Jun 2011 11:39:03 GMT
Author: philip
Date: Wed Jun 22 11:39:03 2011
New Revision: 1138410

URL: http://svn.apache.org/viewvc?rev=1138410&view=rev
Log:
* build/ac-macros/apache.m4
  (SVN_FIND_APACHE): Change APR compatibility checking, now the
   version of APR obtained via apxs must match that detected by
   configure.

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=1138410&r1=1138409&r2=1138410&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/apache.m4 (original)
+++ subversion/trunk/build/ac-macros/apache.m4 Wed Jun 22 11:39:03 2011
@@ -90,32 +90,15 @@ else
 fi
 
 if test -n "$APXS" && test "$APXS" != "no"; then
-  AC_MSG_CHECKING([whether Apache version is compatible with APR version])
-  apr_major_version="${apr_version%%.*}"
-  case "$apr_major_version" in
-    0)
-      apache_minor_version_wanted_regex="0"
-      ;;
-    1)
-      apache_minor_version_wanted_regex=["[1-4]"]
-      ;;
-    2)
-      apache_minor_version_wanted_regex=["[3-4]"]
-      ;;
-    *)
-      AC_MSG_ERROR([unknown APR version])
-      ;;
-  esac
-  old_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
-  AC_EGREP_CPP([apache_minor_version= *\"$apache_minor_version_wanted_regex\"],
-               [
-#include "$APXS_INCLUDE/ap_release.h"
-apache_minor_version=AP_SERVER_MINORVERSION],
-               [AC_MSG_RESULT([yes])],
-               [AC_MSG_RESULT([no])
-                AC_MSG_ERROR([Apache version incompatible with APR version])])
-  CPPFLAGS="$old_CPPFLAGS"
+    AC_MSG_CHECKING([whether Apache's APR is compatible configure's APR])
+    APXS_APR_CONFIG=`$APXS -q APR_CONFIG`
+    APXS_APR_VERSION=`$APXS_APR_CONFIG --version`
+    if test "$APXS_APR_VERSION" = "$apr_version"; then
+        AC_MSG_RESULT(yes)
+    else
+        AC_MSG_RESULT(no)
+        AC_MSG_ERROR([Apache's APR version $APXS_APR_VERSION doesn't match configure's $apr_version])
+    fi
 fi
 
 AC_ARG_WITH(apache-libexecdir,



Mime
View raw message