- Use the correct paths to apu-config / apr-config

diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4
index 53e9e61eda2ba4b5e3fccdcecc1360cc674768aa..7cbe7ede7243eb44a9beada24b7ec64f9aa3043f 100644 (file)
--- a/sapi/apache2filter/config.m4
+++ b/sapi/apache2filter/config.m4
@@ -36,9 +36,11 @@ AC_ARG_WITH(apxs2filter,
   APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
   APXS_CFLAGS=`$APXS -q CFLAGS`
   APXS_MPM=`$APXS -q MPM_NAME`
+  APU_BINDIR=`$APXS -q APU_BINDIR`
+  APR_BINDIR=`$APXS -q APR_BINDIR`
 
-  APU_INCLUDEDIR="`$APXS_BINDIR/apu-config --includes`"
-  APR_INCLUDEDIR="`$APXS_BINDIR/apr-config --includes`"
+  APU_INCLUDEDIR="`$APU_BINDIR/apu-config --includes`"
+  APR_INCLUDEDIR="`$APR_BINDIR/apr-config --includes`"
 
   for flag in $APXS_CFLAGS; do
     case $flag in
@@ -81,11 +83,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 "$APXS_BINDIR/apr-config"; then
-        MH_BUNDLE_FLAGS="`$APXS_BINDIR/apr-config --ldflags --link-ld --libs`"
+    if test -x "$APR_BINDIR/apr-config"; then
+        MH_BUNDLE_FLAGS="`$APR_BINDIR/apr-config --ldflags --link-ld --libs`"
     fi
-    if test -x "$APXS_BINDIR/apu-config"; then
-        MH_BUNDLE_FLAGS="`$APXS_BINDIR/apu-config --ldflags --link-ld --libs` $MH_BUNDLE_FLAGS"
+    if test -x "$APU_BINDIR/apu-config"; then
+        MH_BUNDLE_FLAGS="`$APU_BINDIR/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 a69e903625ba0f193a4216d3fcf55bd5a1d20c5d..8ea91ded3e7a3810d0bb4c27eb34390313b104e6 100644 (file)
--- a/sapi/apache2handler/config.m4
+++ b/sapi/apache2handler/config.m4
@@ -36,9 +36,11 @@ AC_ARG_WITH(apxs2,
   APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
   APXS_CFLAGS=`$APXS -q CFLAGS`
   APXS_MPM=`$APXS -q MPM_NAME`
+  APU_BINDIR=`$APXS -q APU_BINDIR`
+  APR_BINDIR=`$APXS -q APR_BINDIR`
 
-  APU_INCLUDEDIR="`$APXS_BINDIR/apu-config --includes`"
-  APR_INCLUDEDIR="`$APXS_BINDIR/apr-config --includes`"
+  APU_INCLUDEDIR="`$APU_BINDIR/apu-config --includes`"
+  APR_INCLUDEDIR="`$APR_BINDIR/apr-config --includes`"
 
   for flag in $APXS_CFLAGS; do
     case $flag in
@@ -81,11 +83,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 "$APXS_BINDIR/apr-config"; then
-        MH_BUNDLE_FLAGS="`$APXS_BINDIR/apr-config --ldflags --link-ld --libs`"
+    if test -x "$APR_BINDIR/apr-config"; then
+        MH_BUNDLE_FLAGS="`$APR_BINDIR/apr-config --ldflags --link-ld --libs`"
     fi
-    if test -x "$APXS_BINDIR/apu-config"; then
-        MH_BUNDLE_FLAGS="`$APXS_BINDIR/apu-config --ldflags --link-ld --libs` $MH_BUNDLE_FLAGS"
+    if test -x "$APU_BINDIR/apu-config"; then
+        MH_BUNDLE_FLAGS="`$APU_BINDIR/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)