Commit 08b157e

committed

Check Apache HTTP Server command-line utility

The Apache HTTP server command-line tool (/usr/sbin/apache2) might be part of a separate package, such as apache2-bin or similar. If not installed, the configure script can still find the apxs tool, but previously didn't check for the HTTP server tool separately. Otherwise, configure syntax errors (integer expression expected) are thrown when checking for the Apache version.

1 parent 05b9345 commit 08b157eCopy full SHA for 08b157e

File tree

2 files changed

-0

lines changed

build
- php.m4
sapi/apache2handler
- config.m4

2 files changed

-0

lines changed

`‎build/php.m4`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2040,6 +2040,7 @@ dnl`
`2040`	`2040`	`dnl This macro is used to get a comparable version for Apache.`
`2041`	`2041`	`dnl`
`2042`	`2042`	`AC_DEFUN([PHP_AP_EXTRACT_VERSION],[`
	`2043`	`+AS_IF([test -x "1ドル"], [`
`2043`	`2044`	ac_output=`1ドル -v 2>&1 \| grep version \| $SED -e 's/Oracle-HTTP-//'`
`2044`	`2045`	`ac_IFS=$IFS`
`2045`	`2046`	`IFS="- /.`
`@@ -2049,6 +2050,7 @@ IFS="- /.`
`2049`	`2050`
`2050`	`2051`	APACHE_VERSION=`expr [$]4 \* 1000000 + [$]5 \* 1000 + [$]6`
`2051`	`2052`	`])`
	`2053`	`+])`
`2052`	`2054`
`2053`	`2055`	`dnl`
`2054`	`2056`	`dnl PHP_CONFIG_NICE(filename)`

`‎sapi/apache2handler/config.m4`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,11 @@ if test "$PHP_APXS2" != "no"; then`
`34`	`34`
`35`	`35`	APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR`
`36`	`36`	APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
	`37`	`+ AS_IF([test ! -x "$APXS_HTTPD"], [AC_MSG_ERROR([m4_normalize([`
	`38`	`+ $APXS_HTTPD executable not found. Please, install Apache HTTP Server`
	`39`	`+ command-line utility.`
	`40`	`+ ])])])`
	`41`	`+`
`37`	`42`	APXS_CFLAGS=`$APXS -q CFLAGS`
`38`	`43`	APU_BINDIR=`$APXS -q APU_BINDIR`
`39`	`44`	APR_BINDIR=`$APXS -q APR_BINDIR`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 08b157e

File tree

2 files changed

2 files changed

`‎build/php.m4`

`‎sapi/apache2handler/config.m4`

0 commit comments