Zend config sets ZEND_EXTRA_LIBS. Bugs 14452, 14602, 14616, 14824

diff --git a/Zend/Makefile.am b/Zend/Makefile.am
index ee7a7383695a50e591b363881639404d5492d6bf..ba2180cc6cb6f1964f9bcc11397f8664c5ee1b10 100644 (file)
--- a/Zend/Makefile.am
+++ b/Zend/Makefile.am
@@ -15,7 +15,8 @@ libZend_la_SOURCES=\
        zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
        zend_ini.c zend_qsort.c zend_objects.c
 
-libZend_la_LDFLAGS = @EXTRA_LIBS@
+libZend_la_LDFLAGS =
+libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
 
 # automake isn't too clever about "non-standard" use of lex and yacc
 

diff --git a/Zend/configure.in b/Zend/configure.in
index ea2a24adf302a9bb81d9bb9c4f8b725b4535d82e..a999c3a3eb54fcce306180609f82f6cfe65ac6c3 100644 (file)
--- a/Zend/configure.in
+++ b/Zend/configure.in
@@ -35,9 +35,9 @@ fi
 LIBZEND_ENABLE_DEBUG
 LIBZEND_OTHER_CHECKS
 
-EXTRA_LIBS="$LIBS"
+ZEND_EXTRA_LIBS="$LIBS"
 LIBS=""
-AC_SUBST(EXTRA_LIBS)
+AC_SUBST(ZEND_EXTRA_LIBS)
 AC_OUTPUT(Makefile)
 
 # Local Variables: