cvs: php-src(PHP_5_0) /sapi/apache2filter config.m4 /sapi/apache2handler config.m4

moriyoshi Thu Dec 16 18:18:14 2004 EDT Modified files: (Branch: PHP_5_0) /php-src/sapi/apache2filter config.m4 /php-src/sapi/apache2handler config.m4 Log: - MFH http://cvs.php.net/diff.php/php-src/sapi/apache2filter/config.m4?r1=1.36.2.1&r2=1.36.2.2&ty=u Index: php-src/sapi/apache2filter/config.m4 diff -u php-src/sapi/apache2filter/config.m4:1.36.2.1 php-src/sapi/apache2filter/config.m4:1.36.2.2 --- php-src/sapi/apache2filter/config.m4:1.36.2.1 Mon Aug 23 05:00:09 2004 +++ php-src/sapi/apache2filter/config.m4 Thu Dec 16 18:18:13 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.36.2.1 2004/08/23 09:00:09 derick Exp $ +dnl $Id: config.m4,v 1.36.2.2 2004/12/16 23:18:13 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) http://cvs.php.net/diff.php/php-src/sapi/apache2handler/config.m4?r1=1.9.2.1&r2=1.9.2.2&ty=u Index: php-src/sapi/apache2handler/config.m4 diff -u php-src/sapi/apache2handler/config.m4:1.9.2.1 php-src/sapi/apache2handler/config.m4:1.9.2.2 --- php-src/sapi/apache2handler/config.m4:1.9.2.1 Mon Aug 23 05:00:09 2004 +++ php-src/sapi/apache2handler/config.m4 Thu Dec 16 18:18:14 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.9.2.1 2004/08/23 09:00:09 derick Exp $ +dnl $Id: config.m4,v 1.9.2.2 2004/12/16 23:18:14 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)