subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1693159 - /subversion/trunk/build/ac-macros/apache.m4
Date Tue, 28 Jul 2015 20:53:05 GMT
Author: philip
Date: Tue Jul 28 20:53:04 2015
New Revision: 1693159

URL: http://svn.apache.org/r1693159
Log:
* build/ac-macros/apache.m4 (SVN_FIND_APACHE): Extract version with two
   simpler sed commands to support Solaris and OSX sed.

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=1693159&r1=1693158&r2=1693159&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/apache.m4 (original)
+++ subversion/trunk/build/ac-macros/apache.m4 Tue Jul 28 20:53:04 2015
@@ -97,9 +97,9 @@ fi
 # PR 55397: https://issues.apache.org/bugzilla/show_bug.cgi?id=55397
 if test -n "$APXS" && test "$APXS" != "no"; then
   AC_MSG_CHECKING([mod_dav version])
-  HTTPD_MAJOR=`$SED -ne '/^#define AP_SERVER_MAJORVERSION_NUMBER/{s/^.*NUMBER *//;p}' "$APXS_INCLUDE/ap_release.h"`
-  HTTPD_MINOR=`$SED -ne '/^#define AP_SERVER_MINORVERSION_NUMBER/{s/^.*NUMBER *//;p}' "$APXS_INCLUDE/ap_release.h"`
-  HTTPD_PATCH=`$SED -ne '/^#define AP_SERVER_PATCHLEVEL_NUMBER/{s/^.*NUMBER *//;p}' "$APXS_INCLUDE/ap_release.h"`
+  HTTPD_MAJOR=`$SED -ne '/^#define AP_SERVER_MAJORVERSION_NUMBER/p' "$APXS_INCLUDE/ap_release.h"
| $SED -e 's/^.*NUMBER *//'`
+  HTTPD_MINOR=`$SED -ne '/^#define AP_SERVER_MINORVERSION_NUMBER/p' "$APXS_INCLUDE/ap_release.h"
| $SED -e 's/^.*NUMBER *//'`
+  HTTPD_PATCH=`$SED -ne '/^#define AP_SERVER_PATCHLEVEL_NUMBER/p' "$APXS_INCLUDE/ap_release.h"
| $SED -e 's/^.*NUMBER *//'`
   HTTPD_VERSION="${HTTPD_MAJOR}.${HTTPD_MINOR}.${HTTPD_PATCH}"
   case "$HTTPD_VERSION" in
     2.2.25 | 2.4.[[5-6]])



Mime
View raw message