cvs: php4 /sapi/apache2filter config.m4

markonen Mon Apr 22 11:25:19 2002 EDT Modified files: /php4/sapi/apache2filter config.m4 Log: Merged the Mac OS X compile changes from the Apache 1.3 SAPI. --with-apxs2 should now work on Mac OS X / Darwin. # Not tested, though. So shoot me! :) Index: php4/sapi/apache2filter/config.m4 diff -u php4/sapi/apache2filter/config.m4:1.9 php4/sapi/apache2filter/config.m4:1.10 --- php4/sapi/apache2filter/config.m4:1.9 Fri Apr 12 18:59:07 2002 +++ php4/sapi/apache2filter/config.m4 Mon Apr 22 11:25:17 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.9 2002/04/12 22:59:07 sniper Exp $ +dnl $Id: config.m4,v 1.10 2002/04/22 15:25:17 markonen Exp $ dnl AC_MSG_CHECKING(for Apache 2.0 module support via DSO through APXS) @@ -38,7 +38,24 @@ -D*) CPPFLAGS="$CPPFLAGS $flag";; esac done - + + case $host_alias in + *aix*) + APXS_SBINDIR=$APXS -q SBINDIR + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-bI:$APXS_SBINDIR/httpd.exp" + PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c php_functions.c) + ;; + *darwin*) + APXS_HTTPD=$APXS -q SBINDIR/$APXS -q TARGET + MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD" + PHP_SUBST(MH_BUNDLE_FLAGS) + PHP_SELECT_SAPI(apache2filter, bundle, sapi_apache2.c apache_config.c php_functions.c) + ;; + *) + PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c php_functions.c) + ;; + esac + # Test that we're trying to configure with apache 2.x if test ! -f "$APXS_INCLUDEDIR/ap_mpm.h"; then AC_MSG_ERROR([Use --with-apxs with Apache 1.3.x!]) @@ -47,14 +64,7 @@ PHP_ADD_INCLUDE($APXS_INCLUDEDIR) INSTALL_IT="$APXS -i -a -n php4 $SAPI_LIBTOOL" PHP_BUILD_THREAD_SAFE - PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c php_functions.c) AC_MSG_RESULT(yes) - case $host_alias in - *aix*) - APXS_SBINDIR=$APXS -q SBINDIR - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-bI:$APXS_SBINDIR/httpd.exp" - ;; - esac ],[ AC_MSG_RESULT(no) ])