cvs: php-src /sapi/apache2filter config.m4
| From: | Moriyoshi Koizumi | Date: | Sun, 12 Dec 2004 23:06:08 +0000 |
| Subject: | cvs: php-src /sapi/apache2filter config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-29523@lists.php.net to get a copy of this message | ||
moriyoshi Sun Dec 12 18:06:08 2004 EDT
Modified files:
/php-src/sapi/apache2filter config.m4
Log:
- Apply the same fix to apache2filter too.
http://cvs.php.net/diff.php/php-src/sapi/apache2filter/config.m4?r1=1.37&r2=1.38&ty=u
Index: php-src/sapi/apache2filter/config.m4
diff -u php-src/sapi/apache2filter/config.m4:1.37 php-src/sapi/apache2filter/config.m4:1.38
--- php-src/sapi/apache2filter/config.m4:1.37 Mon Aug 23 05:01:27 2004
+++ php-src/sapi/apache2filter/config.m4 Sun Dec 12 18:06:06 2004
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.37 2004/08/23 09:01:27 derick Exp $
+dnl $Id: config.m4,v 1.38 2004/12/12 23:06:06 moriyoshi Exp $
dnl
AC_MSG_CHECKING(for Apache 2.0 filter-module support via DSO through APXS)
@@ -90,11 +90,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)