summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Zend/Makefile.am2
-rw-r--r--Zend/libzend.m44
2 files changed, 3 insertions, 3 deletions
diff --git a/Zend/Makefile.am b/Zend/Makefile.am
index 0db31fe826..26c2ed4d2d 100644
--- a/Zend/Makefile.am
+++ b/Zend/Makefile.am
@@ -2,8 +2,6 @@
#CLEANFILES = zend-parser.c zend-parser.h zend-scanner.c zend-parser.output
-ZEND_SCANNER = libzend_$(ZEND_SCANNER_TYPE).la
-
AUTOMAKE_OPTIONS=foreign
EXTRA_LTLIBRARIES=libzend_cc.la libzend_c.la
noinst_LTLIBRARIES=$(ZEND_SCANNER) libzend.la
diff --git a/Zend/libzend.m4 b/Zend/libzend.m4
index 0935be7870..76f1eec707 100644
--- a/Zend/libzend.m4
+++ b/Zend/libzend.m4
@@ -71,7 +71,7 @@ AC_FUNC_ALLOCA
AC_CHECK_FUNCS(memcpy strdup getpid kill strtod strtol)
AC_ZEND_BROKEN_SPRINTF
-AC_SUBST(ZEND_SCANNER_TYPE)
+AC_SUBST(ZEND_SCANNER)
])
@@ -160,6 +160,8 @@ else
ZEND_SCANNER_TYPE=c
fi
+ZEND_SCANNER="libzend_${ZEND_SCANNER_TYPE}.la"
+
if test "$ZEND_MEMORY_LIMIT" = "yes"; then
AC_DEFINE(MEMORY_LIMIT, 1, [Memory limit])
else