cvs: php4 / Makefile.global acinclude.m4 configure.in /sapi/cgi config.m4 /sapi/cli config.m4

markonen Tue Aug 6 12:01:35 2002 EDT Modified files: /php4 Makefile.global acinclude.m4 configure.in /php4/sapi/cgi config.m4 /php4/sapi/cli config.m4 Log: Support compiling and linking against Darwin / Mac OS X frameworks Index: php4/Makefile.global diff -u php4/Makefile.global:1.19 php4/Makefile.global:1.20 --- php4/Makefile.global:1.19 Thu Jul 4 04:39:11 2002 +++ php4/Makefile.global Tue Aug 6 12:01:33 2002 @@ -14,7 +14,7 @@ $(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 + $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp4.so php: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(BUILD_CGI) Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.200 php4/acinclude.m4:1.201 --- php4/acinclude.m4:1.200 Thu Jul 25 14:37:16 2002 +++ php4/acinclude.m4 Tue Aug 6 12:01:33 2002 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.200 2002/07/25 18:37:16 sniper Exp $ +dnl $Id: acinclude.m4,v 1.201 2002/08/06 16:01:33 markonen Exp $ dnl dnl This file contains local autoconf functions. @@ -1018,6 +1018,55 @@ ]) dnl +dnl PHP_ADD_FRAMEWORK(framework [,before]) +dnl +dnl add a (Darwin / Mac OS X) framework to the link +dnl line. if before is 1, the framework is added +dnl to the beginning of the line. + +AC_DEFUN(PHP_ADD_FRAMEWORK, [ + AC_PHP_ONCE(FRAMEWORK, $1, [ + if test "$2"; then + PHP_FRAMEWORKS="-framework $1 $PHP_FRAMEWORKS" + else + PHP_FRAMEWORKS="$PHP_FRAMEWORKS -framework $1" + fi + ]) +]) + +dnl +dnl PHP_ADD_FRAMEWORKPATH(path [,before]) +dnl +dnl add a (Darwin / Mac OS X) framework path to the link +dnl and include lines. default paths include (but are +dnl not limited to) /Local/Library/Frameworks and +dnl /System/Library/Frameworks, so these don't need +dnl to be specifically added. if before is 1, the +dnl framework path is added to the beginning of the +dnl relevant lines. + +AC_DEFUN(PHP_ADD_FRAMEWORKPATH, [ + PHP_EXPAND_PATH($1, ai_p) + AC_PHP_ONCE(FRAMEWORKPATH, $ai_p, [ + if test "$2"; then + PHP_FRAMEWORKS="-F$ai_p $PHP_FRAMEWORKS" + else + PHP_FRAMEWORKS="$PHP_FRAMEWORKS -F$ai_p" + fi + ]) +]) + +dnl +dnl PHP_ADD_FRAMEWORK_WITH_PATH(framework, path) +dnl +dnl add a (Darwin / Mac OS X) framework path and the +dnl framework itself to the link and include lines. +AC_DEFUN(PHP_ADD_FRAMEWORK_WITH_PATH, [ + PHP_ADD_FRAMEWORKPATH($2) + PHP_ADD_FRAMEWORK($1) +]) + +dnl dnl Set libtool variable dnl AC_DEFUN(PHP_SET_LIBTOOL_VARIABLE,[ @@ -1401,6 +1450,26 @@ LDFLAGS=$save_old_LDFLAGS $4 ])dnl +]) + +dnl +dnl PHP_CHECK_FRAMEWORK(framework, function [, action-found [, action-not-found ]]) +dnl +dnl El cheapo wrapper for AC_CHECK_LIB +dnl +AC_DEFUN(PHP_CHECK_FRAMEWORK, [ + save_old_LDFLAGS=$LDFLAGS + LDFLAGS="-framework $1 $LDFLAGS" + dnl supplying "c" to AC_CHECK_LIB is technically cheating, but + dnl rewriting AC_CHECK_LIB is overkill and this only affects + dnl the "checking.." output anyway. + AC_CHECK_LIB(c,[$2],[ + LDFLAGS=$save_old_LDFLAGS + $3 + ],[ + LDFLAGS=$save_old_LDFLAGS + $4 + ]) ]) dnl Index: php4/configure.in diff -u php4/configure.in:1.364 php4/configure.in:1.365 --- php4/configure.in:1.364 Mon Jul 22 21:58:52 2002 +++ php4/configure.in Tue Aug 6 12:01:33 2002 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.364 2002/07/23 01:58:52 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.365 2002/08/06 16:01:33 markonen Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -976,6 +976,7 @@ PHP_SUBST(TSRM_DIR) PHP_SUBST(TSRM_LIB) PHP_SUBST(WARNING_LEVEL) +PHP_SUBST(PHP_FRAMEWORKS) PHP_SUBST_OLD(YACC) PHP_SUBST_OLD(SHLIB_SUFFIX_NAME) Index: php4/sapi/cgi/config.m4 diff -u php4/sapi/cgi/config.m4:1.15 php4/sapi/cgi/config.m4:1.16 --- php4/sapi/cgi/config.m4:1.15 Sun Jul 21 10:42:01 2002 +++ php4/sapi/cgi/config.m4 Tue Aug 6 12:01:34 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.15 2002/07/21 14:42:01 markonen Exp $ +dnl $Id: config.m4,v 1.16 2002/08/06 16:01:34 markonen Exp $ dnl AC_DEFUN(PHP_TEST_WRITE_STDOUT,[ @@ -100,7 +100,7 @@ case $host_alias in *darwin*) - BUILD_CGI="\$(CC) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o php" + BUILD_CGI="\$(CC) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o php" ;; *) BUILD_CGI="\$(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 php" Index: php4/sapi/cli/config.m4 diff -u php4/sapi/cli/config.m4:1.8 php4/sapi/cli/config.m4:1.9 --- php4/sapi/cli/config.m4:1.8 Sun Jul 21 10:42:01 2002 +++ php4/sapi/cli/config.m4 Tue Aug 6 12:01:34 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.8 2002/07/21 14:42:01 markonen Exp $ +dnl $Id: config.m4,v 1.9 2002/08/06 16:01:34 markonen Exp $ dnl AC_MSG_CHECKING(for CLI build) @@ -16,7 +16,7 @@ if test "$PHP_SAPI_CLI" != "no"; then case $host_alias in *darwin*) - BUILD_CLI="\$(CC) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o sapi/cli/php" + BUILD_CLI="\$(CC) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o sapi/cli/php" ;; *) BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o sapi/cli/php"