cvs: php4 / Makefile.global acinclude.m4 /sapi/apache config.m4

markonen Fri Mar 29 22:17:25 2002 EDT Modified files: /php4 Makefile.global acinclude.m4 /php4/sapi/apache config.m4 Log: Enable --with-apxs build on Mac OS X. We build an MH_BUNDLE instead of an MH_DYLIB. As all PPC code is relocatable, we don't use the libtool based shared build but go a static route. Goodbye libtool! # I'm committing this to enable widespear testing. # Anyone have any ideas on how to easily backport this to 4.2.0? Index: php4/Makefile.global diff -u php4/Makefile.global:1.8 php4/Makefile.global:1.9 --- php4/Makefile.global:1.8 Wed Mar 20 08:24:59 2002 +++ php4/Makefile.global Fri Mar 29 22:17:24 2002 @@ -14,6 +14,9 @@ libphp4.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ +libs/libphp4.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) + $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp4.so + php: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(LIBTOOL) --mode=link $(CC) -export-dynamic $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.177 php4/acinclude.m4:1.178 --- php4/acinclude.m4:1.177 Wed Mar 27 06:09:20 2002 +++ php4/acinclude.m4 Fri Mar 29 22:17:24 2002 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.177 2002/03/27 11:09:20 sas Exp $ +dnl $Id: acinclude.m4,v 1.178 2002/03/30 03:17:24 markonen Exp $ dnl dnl This file contains local autoconf functions. @@ -783,6 +783,15 @@ ]) dnl +dnl PHP_BUILD_BUNDLE +dnl +AC_DEFUN(PHP_BUILD_BUNDLE,[ + PHP_BUILD_PROGRAM + OVERALL_TARGET=libs/libphp4.bundle + php_build_target=static +]) + +dnl dnl PHP_BUILD_PROGRAM dnl AC_DEFUN(PHP_BUILD_PROGRAM,[ @@ -1092,6 +1101,7 @@ case "$2" in static) PHP_BUILD_STATIC;; shared) PHP_BUILD_SHARED;; + bundle) PHP_BUILD_BUNDLE;; program) PHP_BUILD_PROGRAM;; esac Index: php4/sapi/apache/config.m4 diff -u php4/sapi/apache/config.m4:1.49 php4/sapi/apache/config.m4:1.50 --- php4/sapi/apache/config.m4:1.49 Fri Mar 29 14:25:55 2002 +++ php4/sapi/apache/config.m4 Fri Mar 29 22:17:25 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.49 2002/03/29 19:25:55 markonen Exp $ +dnl $Id: config.m4,v 1.50 2002/03/30 03:17:25 markonen Exp $ dnl AC_MSG_CHECKING(for Apache 1.x module support via DSO through APXS) @@ -38,8 +38,24 @@ -D*) CPPFLAGS="$CPPFLAGS $flag";; esac done + case $host_alias in + *aix*) + APXS_LIBEXECDIR=$APXS -q LIBEXECDIR + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp" + PHP_SELECT_SAPI(apache, shared, sapi_apache.c mod_php4.c php_apache.c) + ;; + *darwin*) + APXS_HTTPD=$APXS -q SBINDIR/$APXS -q TARGET + MH_BUNDLE_FLAGS="-dynamic -twolevel_namespace -bundle -bundle_loader $APXS_HTTPD" + PHP_SUBST(MH_BUNDLE_FLAGS) + SAPI_SHARED=libs/libphp4.so + PHP_SELECT_SAPI(apache, bundle, sapi_apache.c mod_php4.c php_apache.c) + ;; + *) + PHP_SELECT_SAPI(apache, shared, sapi_apache.c mod_php4.c php_apache.c) + ;; + esac PHP_ADD_INCLUDE($APXS_INCLUDEDIR) - PHP_SELECT_SAPI(apache, shared, sapi_apache.c mod_php4.c php_apache.c) # Test whether apxs support -S option $APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1 @@ -57,17 +73,6 @@ AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ]) AC_DEFINE(HAVE_AP_COMPAT_H,1,[ ]) AC_MSG_RESULT(yes) - case $host_alias in - *aix*) - APXS_LIBEXECDIR=$APXS -q LIBEXECDIR - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp" - ;; - *darwin*) - APXS_HTTPD=$APXS -q SBINDIR/$APXS -q TARGET - MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD" - PHP_SUBST(MH_BUNDLE_FLAGS) - ;; - esac ],[ AC_MSG_RESULT(no) ])