diff options
| -rw-r--r-- | acinclude.m4 | 16 | ||||
| -rw-r--r-- | sapi/apache/config.m4 | 11 |
2 files changed, 16 insertions, 11 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 5cd89337a0..71a7423c4d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1539,3 +1539,19 @@ AC_DEFUN(PHP_CHECK_FUNC,[ ]) esac ]) + +dnl +dnl PHP_AP_EXTRACT_VERSION(/path/httpd) +dnl This macro is used to get a comparable +dnl version for apache1/2. +dnl +AC_DEFUN(PHP_AP_EXTRACT_VERSION,[ + ac_output=`$1 -v 2>&1` + ac_IFS=$IFS +IFS="- /. +" + set $ac_output + IFS=$ac_IFS + + APACHE_VERSION=`expr [$]4 \* 1000000 + [$]5 \* 1000 + [$]6` +]) diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4 index a652ee1440..63c2aa5c5d 100644 --- a/sapi/apache/config.m4 +++ b/sapi/apache/config.m4 @@ -2,17 +2,6 @@ dnl dnl $Id$ dnl -AC_DEFUN(PHP_AP_EXTRACT_VERSION,[ - ac_output=`$1 -v 2>&1` - ac_IFS=$IFS -IFS="- /. -" - set $ac_output - IFS=$ac_IFS - - APACHE_VERSION=`expr [$]4 \* 1000000 + [$]5 \* 1000 + [$]6` -]) - AC_MSG_CHECKING(for Apache 1.x module support via DSO through APXS) AC_ARG_WITH(apxs, [ --with-apxs[=FILE] Build shared Apache 1.x module. FILE is the optional |