summaryrefslogtreecommitdiff
path: root/Zend
diff options
context:
space:
mode:
authorAdam Dickmeiss <dickmeiss@php.net>2002-02-03 20:42:10 +0000
committerAdam Dickmeiss <dickmeiss@php.net>2002-02-03 20:42:10 +0000
commit493563652160eda6c935db127ae9310248f6719d (patch)
tree7e001bb5b25823c3bc234d9d7aab198d27886fc7 /Zend
parentc4d84aa33390045cd4ff542719a0f79cff52fb7c (diff)
downloadphp-git-493563652160eda6c935db127ae9310248f6719d.tar.gz
Zend config sets ZEND_EXTRA_LIBS. Bugs 14452, 14602, 14616, 14824
Diffstat (limited to 'Zend')
-rw-r--r--Zend/Makefile.am3
-rw-r--r--Zend/configure.in4
2 files changed, 4 insertions, 3 deletions
diff --git a/Zend/Makefile.am b/Zend/Makefile.am
index ee7a738369..ba2180cc6c 100644
--- 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 ea2a24adf3..a999c3a3eb 100644
--- 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: