cvs: php4 / Makefile.global /sapi/cli config.m4
| From: | Marko Karppinen | Date: | Mon, 01 Jul 2002 21:17:41 +0000 |
| Subject: | cvs: php4 / Makefile.global /sapi/cli config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-12652@lists.php.net to get a copy of this message | ||
markonen Mon Jul 1 17:17:41 2002 EDT
Modified files:
/php4 Makefile.global
/php4/sapi/cli config.m4
Log:
- You don't need libtool to build sapi/cli on Darwin.
- We don't need libtool to build sapi/cli on Darwin.
- You want the sapi/cli build line to be in sapi/cli, not Makefile.global.
- We want the sapi/cli build line to be in sapi/cli, not Makefile.global.
- He can go about his business.
- You can go about your business.
- Move along.
- Move along. Move along.
Index: php4/Makefile.global
diff -u php4/Makefile.global:1.16 php4/Makefile.global:1.17
--- php4/Makefile.global:1.16 Sun Jun 30 00:26:05 2002
+++ php4/Makefile.global Mon Jul 1 17:17:39 2002
@@ -20,7 +20,7 @@
$(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 $@
sapi/cli/php: $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS)
- $(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 $@
+ $(BUILD_CLI)
install: $(install_targets)
Index: php4/sapi/cli/config.m4
diff -u php4/sapi/cli/config.m4:1.6 php4/sapi/cli/config.m4:1.7
--- php4/sapi/cli/config.m4:1.6 Tue Jun 11 05:35:59 2002
+++ php4/sapi/cli/config.m4 Mon Jul 1 17:17:39 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.6 2002/06/11 09:35:59 edink Exp $
+dnl $Id: config.m4,v 1.7 2002/07/01 21:17:39 markonen Exp $
dnl
AC_MSG_CHECKING(for CLI build)
@@ -14,7 +14,16 @@
])
if test "$PHP_SAPI_CLI" != "no"; then
+ case $host_alias in
+ *darwin*)
+ BUILD_CLI="\$(CC) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS)
\$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(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"
+ ;;
+ esac
INSTALL_CLI="\$(INSTALL) -m 0755 sapi/cli/php \$(INSTALL_ROOT)\$(bindir)/php"
+ PHP_SUBST(BUILD_CLI)
PHP_SUBST(INSTALL_CLI)
else
PHP_DISABLE_CLI