Patch by Justin Erenkrantz <jerenkrantz@apache.org> for enabling

--with-apxs2 build on Darwin. Omitting the change to start linking
with libtool for now, though.

diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4
index 396f29186c8a2c7f73c00033f1299569f53bc616..7a3b91b04f1437b36f22b26224e92c105e8616c9 100644 (file)
--- a/sapi/apache2filter/config.m4
+++ b/sapi/apache2filter/config.m4
@@ -57,7 +57,18 @@ AC_ARG_WITH(apxs2,
     INSTALL_IT="$APXS -i -a -n php4 $SAPI_LIBTOOL" 
     ;;
   *darwin*)
-    MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD"
+    dnl When using bundles on Darwin, we must resolve all symbols.  However,
+    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.
+    APXS_BINDIR=`$APXS -q BINDIR`
+    if test -f $APXS_BINDIR/apr-config; then
+        MH_BUNDLE_FLAGS="`$APXS_BINDIR/apr-config --ldflags --link-ld --libs`"
+    fi
+    if test -f $APXS_BINDIR/apu-config; then
+        MH_BUNDLE_FLAGS="`$APXS_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)
     PHP_SELECT_SAPI(apache2filter, bundle, sapi_apache2.c apache_config.c php_functions.c)
     SAPI_SHARED=libs/libphp4.so