cvs: php4 /sapi/apache2filter config.m4

markonen Mon May 13 17:38:03 2002 EDT Modified files: /php4/sapi/apache2filter config.m4 Log: 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. Index: php4/sapi/apache2filter/config.m4 diff -u php4/sapi/apache2filter/config.m4:1.15 php4/sapi/apache2filter/config.m4:1.16 --- php4/sapi/apache2filter/config.m4:1.15 Sun May 5 05:52:39 2002 +++ php4/sapi/apache2filter/config.m4 Mon May 13 17:37:52 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.15 2002/05/05 09:52:39 markonen Exp $ +dnl $Id: config.m4,v 1.16 2002/05/13 21:37:52 markonen Exp $ dnl AC_MSG_CHECKING(for Apache 2.0 module support via DSO through APXS) @@ -57,7 +57,18 @@ 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