From: Marko Karppinen <markonen@php.net>
Date: Thu, 4 Jul 2002 08:39:11 +0000 (+0000)
Subject: Moved the cgi link line to sapi/cgi/config.m4 and stopped
X-Git-Tag: xmlrpc_epi_0_51_merge_pt~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6eeec28b63b6661f5b25810f17d7f665daefc22;p=php

Moved the cgi link line to sapi/cgi/config.m4 and stopped
using libtool on Darwin on it
---

diff --git a/Makefile.global b/Makefile.global
index 2755e136dd..ea8c9d262c 100644
--- a/Makefile.global
+++ b/Makefile.global
@@ -17,8 +17,8 @@ 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 $@
-
+	$(BUILD_CGI)
+	
 sapi/cli/php: $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS)
 	$(BUILD_CLI)
 
diff --git a/sapi/cgi/config.m4 b/sapi/cgi/config.m4
index d3aa978264..2613195ab9 100644
--- a/sapi/cgi/config.m4
+++ b/sapi/cgi/config.m4
@@ -97,3 +97,13 @@ INCLUDES="$INCLUDES $FHTTPD_INCLUDE"
 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)