cvs: php4 / Makefile.in configure.in
| From: | Adam Dickmeiss | Date: | Sun, 03 Feb 2002 20:00:27 +0000 |
| Subject: | cvs: php4 / Makefile.in configure.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-9253@lists.php.net to get a copy of this message | ||
dickmeiss Sun Feb 3 15:00:27 2002 EDT
Modified files:
/php4 configure.in Makefile.in
Log:
Zend config sets ZEND_EXTRA_LIBS. Bugs 14452, 14602, 14616, 14824
Index: php4/configure.in
diff -u php4/configure.in:1.297 php4/configure.in:1.298
--- php4/configure.in:1.297 Sat Feb 2 01:21:58 2002
+++ php4/configure.in Sun Feb 3 15:00:26 2002
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.297 2002/02/02 06:21:58 jon Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.298 2002/02/03 20:00:26 dickmeiss Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -817,6 +817,8 @@
PHP_REGEX
+EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS"
+unset LIBS LDFLAGS
dnl Configuring Zend and TSRM.
dnl -------------------------------------------------------------------------
@@ -841,7 +843,7 @@
INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM"
fi
-EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS"
+ZEND_EXTRA_LIBS="$LIBS"
unset LIBS LDFLAGS
PHP_CONFIGURE_PART(Configuring TSRM)
@@ -993,6 +995,7 @@
PHP_SUBST_OLD(EXTENSION_DIR)
PHP_SUBST(EXTRA_LDFLAGS)
PHP_SUBST_OLD(EXTRA_LIBS)
+PHP_SUBST_OLD(ZEND_EXTRA_LIBS)
PHP_SUBST(INCLUDES)
PHP_SUBST_OLD(INCLUDE_PATH)
PHP_SUBST_OLD(INSTALL_IT)
Index: php4/Makefile.in
diff -u php4/Makefile.in:1.105 php4/Makefile.in:1.106
--- php4/Makefile.in:1.105 Thu Jan 24 07:55:08 2002
+++ php4/Makefile.in Sun Feb 3 15:00:27 2002
@@ -14,7 +14,7 @@
$(TSRM_LIB)
LTLIBRARY_LDFLAGS = -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS)
-LTLIBRARY_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS)
+LTLIBRARY_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS)
PROGRAM_NAME = php
PROGRAM_SOURCES = stub.c