You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2015/07/28 19:27:21 UTC
svn commit: r1693135 - /subversion/trunk/build/ac-macros/apache.m4
Author: philip
Date: Tue Jul 28 17:27:21 2015
New Revision: 1693135
URL: http://svn.apache.org/r1693135
Log:
* build/ac-macros/apache.m4 (SVN_FIND_APACHE): Extract the httpd version
from the header file rather than the executable output as the form of
the executable output is hard to predict.
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=1693135&r1=1693134&r2=1693135&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/apache.m4 (original)
+++ subversion/trunk/build/ac-macros/apache.m4 Tue Jul 28 17:27:21 2015
@@ -162,11 +162,10 @@ if test -n "$APXS" && test "$APXS" != "n
BUILD_APACHE_RULE=apache-mod
INSTALL_APACHE_RULE=install-mods-shared
INSTALL_APACHE_MODS=true
- HTTPD="`$APXS -q sbindir`/`$APXS -q PROGNAME`"
- if ! test -e $HTTPD ; then
- HTTPD="`$APXS -q bindir`/`$APXS -q PROGNAME`"
- fi
- HTTPD_VERSION=["`$HTTPD -v | $SED -e 's/^.*\/\([0-9.]*\).*$/\1/' -e 1q`"]
+ 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_VERSION="${HTTPD_MAJOR}.${HTTPD_MINOR}.${HTTPD_PATCH}"
AC_ARG_ENABLE(broken-httpd-auth,
AS_HELP_STRING([--enable-broken-httpd-auth],
[Allow building against httpd 2.4 with broken auth]),
Re: svn commit: r1693135 - /subversion/trunk/build/ac-macros/apache.m4
Posted by Branko Čibej <br...@wandisco.com>.
On 28.07.2015 19:27, philip@apache.org wrote:
> Author: philip
> Date: Tue Jul 28 17:27:21 2015
> New Revision: 1693135
>
> URL: http://svn.apache.org/r1693135
> Log:
> * build/ac-macros/apache.m4 (SVN_FIND_APACHE): Extract the httpd version
> from the header file rather than the executable output as the form of
> the executable output is hard to predict.
>
> 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=1693135&r1=1693134&r2=1693135&view=diff
> ==============================================================================
> --- subversion/trunk/build/ac-macros/apache.m4 (original)
> +++ subversion/trunk/build/ac-macros/apache.m4 Tue Jul 28 17:27:21 2015
> @@ -162,11 +162,10 @@ if test -n "$APXS" && test "$APXS" != "n
> BUILD_APACHE_RULE=apache-mod
> INSTALL_APACHE_RULE=install-mods-shared
> INSTALL_APACHE_MODS=true
> - HTTPD="`$APXS -q sbindir`/`$APXS -q PROGNAME`"
> - if ! test -e $HTTPD ; then
> - HTTPD="`$APXS -q bindir`/`$APXS -q PROGNAME`"
> - fi
> - HTTPD_VERSION=["`$HTTPD -v | $SED -e 's/^.*\/\([0-9.]*\).*$/\1/' -e 1q`"]
> + 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_VERSION="${HTTPD_MAJOR}.${HTTPD_MINOR}.${HTTPD_PATCH}"
> AC_ARG_ENABLE(broken-httpd-auth,
> AS_HELP_STRING([--enable-broken-httpd-auth],
> [Allow building against httpd 2.4 with broken auth]),
This breaks all the OSX builds. The error is:
sed: command garbled: /^#define AP_SERVER_MAJORVERSION_NUMBER/{s/^.*NUMBER *//;p}
sed: command garbled: /^#define AP_SERVER_MINORVERSION_NUMBER/{s/^.*NUMBER *//;p}
sed: command garbled: /^#define AP_SERVER_PATCHLEVEL_NUMBER/{s/^.*NUMBER *//;p}
configure: error: Apache httpd version .. not recognised
-- Brane