cvs: php4 / acinclude.m4 /sapi/apache config.m4

sniper Thu Jul 25 14:37:16 2002 EDT Modified files: /php4 acinclude.m4 /php4/sapi/apache config.m4 Log: - Fixed bug: #18560, the macro was not defined always. Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.199 php4/acinclude.m4:1.200 --- php4/acinclude.m4:1.199 Sun Jul 21 10:42:01 2002 +++ php4/acinclude.m4 Thu Jul 25 14:37:16 2002 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.199 2002/07/21 14:42:01 markonen Exp $ +dnl $Id: acinclude.m4,v 1.200 2002/07/25 18:37:16 sniper Exp $ dnl dnl This file contains local autoconf functions. @@ -1538,4 +1538,20 @@ *) PHP_CHECK_FUNC_LIB($@) ;; ]) 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 ]) Index: php4/sapi/apache/config.m4 diff -u php4/sapi/apache/config.m4:1.61 php4/sapi/apache/config.m4:1.62 --- php4/sapi/apache/config.m4:1.61 Thu Jul 11 09:33:22 2002 +++ php4/sapi/apache/config.m4 Thu Jul 25 14:37:16 2002 @@ -1,17 +1,6 @@ dnl -dnl $Id: config.m4,v 1.61 2002/07/11 13:33:22 sas Exp $ +dnl $Id: config.m4,v 1.62 2002/07/25 18:37:16 sniper Exp $ 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,