diff --git a/Makefile.frag b/Makefile.frag index fb4f6f5..77aaeaa 100644 --- a/Makefile.frag +++ b/Makefile.frag @@ -11,7 +11,7 @@ $(XCACHE_INCLUDES_I): $(XCACHE_INCLUDES_SRC) $(srcdir)/xcache.h $(XCACHE_STRUCTINFO_OUT): $(XCACHE_INCLUDES_I) $(srcdir)/mkstructinfo.awk @echo $(XCACHE_STRUCTINFO_OUT) is optional if XCache test is not enabled, feel free if it awk failed to produce it - -$(AWK) -f $(srcdir)/mkstructinfo.awk < $(XCACHE_INCLUDES_I) > $(XCACHE_STRUCTINFO_OUT).tmp && mv -f $(XCACHE_STRUCTINFO_OUT).tmp $(XCACHE_STRUCTINFO_OUT) + -$(XCACHE_AWK) -f $(srcdir)/mkstructinfo.awk < $(XCACHE_INCLUDES_I) > $(XCACHE_STRUCTINFO_OUT).tmp && mv -f $(XCACHE_STRUCTINFO_OUT).tmp $(XCACHE_STRUCTINFO_OUT) $(XCACHE_PROC_OUT): $(XCACHE_PROC_SRC) $(XCACHE_STRUCTINFO_OUT) $(XCACHE_PROC_SOURCES) $(M4) -D srcdir="$(srcdir)" -D builddir="$(builddir)" $(XCACHE_ENABLE_TEST) $(XCACHE_PROC_SRC) > $(XCACHE_PROC_OUT).tmp diff --git a/config.m4 b/config.m4 index a667666..acc9ad5 100644 --- a/config.m4 +++ b/config.m4 @@ -63,16 +63,16 @@ if test "$PHP_XCACHE" != "no"; then AC_DEFINE([HAVE_XCACHE_DPRINT], 1, [Define to enable XCache debug print functions]) fi - AC_PATH_PROGS([AWK], [gawk awk]) + AC_PATH_PROGS([XCACHE_AWK], [gawk awk]) dnl clean locale for gawk 3.1.5 assertion bug - if echo | LANG=C "$AWK" -- '' > /dev/null 2>&1 ; then - AWK="LANG=C $AWK" + if echo | LANG=C "$XCACHE_AWK" -- '' > /dev/null 2>&1 ; then + XCACHE_AWK="LANG=C $XCACHE_AWK" else - if echo | /usr/bin/env - "$AWK" -- '' > /dev/null 2>&1 ; then - AWK="/usr/bin/env - $AWK" + if echo | /usr/bin/env - "$XCACHE_AWK" -- '' > /dev/null 2>&1 ; then + XCACHE_AWK="/usr/bin/env - $XCACHE_AWK" fi fi - PHP_SUBST([AWK]) + PHP_SUBST([XCACHE_AWK]) AC_PATH_PROGS([M4], [m4]) if echo | "$M4" -E > /dev/null 2>&1 ; then M4="$M4 -E" diff --git a/config.w32 b/config.w32 index e81df3b..49af645 100644 --- a/config.w32 +++ b/config.w32 @@ -56,7 +56,7 @@ if (PHP_XCACHE != "no") { ERROR(apps[i] + " is currently required to build XCache"); } } - PATH_PROG("gawk", null, "AWK") || PATH_PROG("awk", null, "AWK"); + PATH_PROG("gawk", null, "XCACHE_AWK") || PATH_PROG("awk", null, "XCACHE_AWK"); // the cygwin indent is known broken on our output var indent = false; // PATH_PROG("indent");