From: Sascha Schumann Date: Sat, 18 Dec 1999 22:30:23 +0000 (+0000) Subject: automake created illegal target names due to the ZEND_SCANNER definition. X-Git-Tag: PRE_LIBZEND_TO_ZEND~20 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=11c9545416b6fe768fdb45b6279e745e5f307b2d;p=php automake created illegal target names due to the ZEND_SCANNER definition. We now substitute @ZEND_SCANNER@ directly --- 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