cvs: php4 / Makefile.global /sapi/cgi config.m4

markonen Thu Jul 4 04:39:12 2002 EDT Modified files: /php4 Makefile.global /php4/sapi/cgi config.m4 Log: Moved the cgi link line to sapi/cgi/config.m4 and stopped using libtool on Darwin on it Index: php4/Makefile.global diff -u php4/Makefile.global:1.18 php4/Makefile.global:1.19 --- php4/Makefile.global:1.18 Wed Jul 3 18:12:12 2002 +++ php4/Makefile.global Thu Jul 4 04:39:11 2002 @@ -17,8 +17,8 @@ $(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 $@ - + $(BUILD_CGI) + sapi/cli/php: $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS) $(BUILD_CLI) Index: php4/sapi/cgi/config.m4 diff -u php4/sapi/cgi/config.m4:1.13 php4/sapi/cgi/config.m4:1.14 --- php4/sapi/cgi/config.m4:1.13 Thu Mar 7 09:19:51 2002 +++ php4/sapi/cgi/config.m4 Thu Jul 4 04:39:11 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.13 2002/03/07 14:19:51 sas Exp $ +dnl $Id: config.m4,v 1.14 2002/07/04 08:39:11 markonen Exp $ dnl AC_DEFUN(PHP_TEST_WRITE_STDOUT,[ @@ -97,3 +97,13 @@ dnl## AC_SUBST(FHTTPD_INCLUDE) PHP_SUBST(FHTTPD_LIB) PHP_SUBST(FHTTPD_TARGET) + +case $host_alias in + *darwin*) + BUILD_CGI="\$(CC) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(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" + ;; +esac +PHP_SUBST(BUILD_CGI)