I think this patch should also go in PHP_4_3 and PHP_5_0.
Moriyoshi
On 2004/12/12, at 11:11, Moriyoshi Koizumi wrote:
moriyoshi Sat Dec 11 21:11:30 2004 EDT
Modified files: /php-src/sapi/apache2handler config.m4 Log: - Fixlet for httpd-2.1 on Darwin platforms
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/config.m4? r1=1.10&r2=1.11&ty=u
Index: php-src/sapi/apache2handler/config.m4
diff -u php-src/sapi/apache2handler/config.m4:1.10 php-src/sapi/apache2handler/config.m4:1.11
--- php-src/sapi/apache2handler/config.m4:1.10 Mon Aug 23 05:01:27 2004
+++ php-src/sapi/apache2handler/config.m4 Sat Dec 11 21:11:27 2004
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.10 2004/08/23 09:01:27 derick Exp $
+dnl $Id: config.m4,v 1.11 2004/12/12 02:11:27 moriyoshi Exp $
dnl
AC_MSG_CHECKING(for Apache 2.0 handler-module support via DSO through APXS)
@@ -89,11 +89,11 @@
dnl the linker does not recursively look at the bundle loader and
dnl pull in its dependencies. Therefore, we must pull in the APR
dnl and APR-util libraries.
- if test -x "$APR_BINDIR/apr-config"; then
- MH_BUNDLE_FLAGS="`$APR_BINDIR/apr-config --ldflags --link-ld --libs`"
+ if test -x "$APR_CONFIG"; then
+ MH_BUNDLE_FLAGS="`$APR_CONFIG --ldflags --link-ld --libs`"
fi
- if test -x "$APU_BINDIR/apu-config"; then
- MH_BUNDLE_FLAGS="`$APU_BINDIR/apu-config --ldflags --link-ld --libs` $MH_BUNDLE_FLAGS"
+ if test -x "$APU_CONFIG"; then
+ MH_BUNDLE_FLAGS="`$APU_CONFIG --ldflags --link-ld --libs` $MH_BUNDLE_FLAGS"
fi
MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS"
PHP_SUBST(MH_BUNDLE_FLAGS)
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
