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

moriyoshi Thu Dec 16 18:14:29 2004 EDT Modified files: (Branch: PHP_4_3) /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.25.2.11&r2=1.25.2.12&ty=u Index: php-src/sapi/apache2filter/config.m4 diff -u php-src/sapi/apache2filter/config.m4:1.25.2.11 php-src/sapi/apache2filter/config.m4:1.25.2.12 --- php-src/sapi/apache2filter/config.m4:1.25.2.11 Thu Oct 21 15:41:54 2004 +++ php-src/sapi/apache2filter/config.m4 Thu Dec 16 18:14:28 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.25.2.11 2004/10/21 19:41:54 jorton Exp $ +dnl $Id: config.m4,v 1.25.2.12 2004/12/16 23:14:28 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.1.2.8&r2=1.1.2.9&ty=u Index: php-src/sapi/apache2handler/config.m4 diff -u php-src/sapi/apache2handler/config.m4:1.1.2.8 php-src/sapi/apache2handler/config.m4:1.1.2.9 --- php-src/sapi/apache2handler/config.m4:1.1.2.8 Thu Oct 21 15:41:55 2004 +++ php-src/sapi/apache2handler/config.m4 Thu Dec 16 18:14:29 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.1.2.8 2004/10/21 19:41:55 jorton Exp $ +dnl $Id: config.m4,v 1.1.2.9 2004/12/16 23:14:29 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)