- MFH

diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4
index decdd803cfe56c94e17bf90c1a41f3cc20ac2c58..d3e95afc87c2714ceaf7fee8b46d180d3207fb91 100644 (file)
--- a/sapi/apache2filter/config.m4
+++ b/sapi/apache2filter/config.m4
@@ -90,11 +90,11 @@ AC_ARG_WITH(apxs2filter,
     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)

diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
index b370aa99abca5adaaa402d907e7e22fd294c3825..61be53e4452ae2d5395ddda8d539b4755fd9b38e 100644 (file)
--- a/sapi/apache2handler/config.m4
+++ b/sapi/apache2handler/config.m4
@@ -89,11 +89,11 @@ AC_ARG_WITH(apxs2,
     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)