diff options
| author | Adam Dickmeiss <dickmeiss@php.net> | 2002-02-03 20:00:27 +0000 |
|---|---|---|
| committer | Adam Dickmeiss <dickmeiss@php.net> | 2002-02-03 20:00:27 +0000 |
| commit | c4d84aa33390045cd4ff542719a0f79cff52fb7c (patch) | |
| tree | 731ea46d252f073396e598abc34946cf9517e956 | |
| parent | bd32363e2f632a44d2a2e0e8f326c4cb6cfaee89 (diff) | |
| download | php-git-c4d84aa33390045cd4ff542719a0f79cff52fb7c.tar.gz | |
Zend config sets ZEND_EXTRA_LIBS. Bugs 14452, 14602, 14616, 14824
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | configure.in | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index b15f0f1440..e2168a0ff6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,7 +14,7 @@ LTLIBRARY_DEPENDENCIES = \ $(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 diff --git a/configure.in b/configure.in index 624fb04bcd..1abefb46d5 100644 --- a/configure.in +++ b/configure.in @@ -817,6 +817,8 @@ fi PHP_REGEX +EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS" +unset LIBS LDFLAGS dnl Configuring Zend and TSRM. dnl ------------------------------------------------------------------------- @@ -841,7 +843,7 @@ if test "$abs_srcdir" != "$abs_builddir"; then 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(DEFS) 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) |