cvs: php-src(PHP_4_3) / configure.in /sapi/cgi config9.m4 /sapi/cli config.m4

From: Date: Mon, 08 Sep 2003 13:10:35 +0000
Subject: cvs: php-src(PHP_4_3) / configure.in /sapi/cgi config9.m4 /sapi/cli config.m4
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-23682@lists.php.net to get a copy of this message
sniper Mon Sep 8 09:10:35 2003 EDT Modified files: (Branch: PHP_4_3) /php-src configure.in /php-src/sapi/cli config.m4 /php-src/sapi/cgi config9.m4 Log: - MFH: build problems fix with CLI Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.74 php-src/configure.in:1.396.2.75 --- php-src/configure.in:1.396.2.74 Tue Sep 2 15:42:02 2003 +++ php-src/configure.in Mon Sep 8 09:10:33 2003 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.74 2003/09/02 19:42:02 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.75 2003/09/08 13:10:33 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -894,6 +894,7 @@ TSRM_THREADS_CHECKS fi EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LDFLAGS" +EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $LDFLAGS" EXTRA_LIBS="$EXTRA_LIBS $LIBS" unset LIBS LDFLAGS @@ -993,6 +994,7 @@ fi EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS" +EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS" PHP_BUILD_DATE=date '+%Y-%m-%d' AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date]) @@ -1048,6 +1050,7 @@ PHP_SUBST(DEFS) PHP_SUBST_OLD(EXTENSION_DIR) PHP_SUBST_OLD(EXTRA_LDFLAGS) +PHP_SUBST_OLD(EXTRA_LDFLAGS_PROGRAM) PHP_SUBST_OLD(EXTRA_LIBS) PHP_SUBST_OLD(ZEND_EXTRA_LIBS) PHP_SUBST_OLD(INCLUDES) Index: php-src/sapi/cli/config.m4 diff -u php-src/sapi/cli/config.m4:1.11.2.4 php-src/sapi/cli/config.m4:1.11.2.5 --- php-src/sapi/cli/config.m4:1.11.2.4 Tue Feb 11 23:39:30 2003 +++ php-src/sapi/cli/config.m4 Mon Sep 8 09:10:34 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.11.2.4 2003/02/12 04:39:30 sniper Exp $ +dnl $Id: config.m4,v 1.11.2.5 2003/09/08 13:10:34 sniper Exp $ dnl AC_MSG_CHECKING(for CLI build) @@ -20,14 +20,14 @@ case $host_alias in *darwin*) - BUILD_CLI="\$(CC) \$(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_PATH)" + BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" ;; *cygwin*) SAPI_CLI_PATH=sapi/cli/php.exe - BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" + BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" ;; *) - BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" + BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" ;; esac INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/php" Index: php-src/sapi/cgi/config9.m4 diff -u php-src/sapi/cgi/config9.m4:1.1.2.9 php-src/sapi/cgi/config9.m4:1.1.2.10 --- php-src/sapi/cgi/config9.m4:1.1.2.9 Tue Jul 1 22:48:16 2003 +++ php-src/sapi/cgi/config9.m4 Mon Sep 8 09:10:34 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config9.m4,v 1.1.2.9 2003/07/02 02:48:16 sniper Exp $ +dnl $Id: config9.m4,v 1.1.2.10 2003/09/08 13:10:34 sniper Exp $ dnl AC_ARG_ENABLE(cgi, @@ -153,10 +153,10 @@ case $host_alias in *darwin*) - BUILD_CGI="\$(CC) \$(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 \$(SAPI_CGI_PATH)" + BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" ;; *) - BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" + BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" ;; esac

« previous php.cvs (#23682) next »