diff --git a/Makefile.frag b/Makefile.frag index 6cecc2a..8a49ffa 100644 --- a/Makefile.frag +++ b/Makefile.frag @@ -14,11 +14,11 @@ $(XCACHE_STRUCTINFO_OUT): $(XCACHE_INCLUDES_I) $(srcdir)/mkstructinfo.awk -$(XCACHE_AWK) -f $(srcdir)/mkstructinfo.awk < $(XCACHE_INCLUDES_I) > $(XCACHE_STRUCTINFO_OUT).tmp && mv $(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 + $(M4) -D srcdir=$(XCACHE_BACKTICK)"$(srcdir)'" -D builddir=$(XCACHE_BACKTICK)"$(builddir)'" $(XCACHE_ENABLE_TEST) $(XCACHE_PROC_SRC) > $(XCACHE_PROC_OUT).tmp mv $(XCACHE_PROC_OUT).tmp $(XCACHE_PROC_OUT) $(XCACHE_PROC_H): $(XCACHE_PROC_OUT) - $(GREP) 'export: ' $(XCACHE_PROC_OUT) | $(SED) 's/.*export:\(.*\):export.*/\1/g' > $(XCACHE_PROC_H) + $(GREP) "export: " $(XCACHE_PROC_OUT) | $(SED) "s/.*export:\(.*\):export.*/\1/g" > $(XCACHE_PROC_H) -$(XCACHE_INDENT) < $(XCACHE_PROC_H) > $(XCACHE_PROC_H).tmp && mv $(XCACHE_PROC_H).tmp $(XCACHE_PROC_H) $(XCACHE_PROC_C): $(XCACHE_PROC_OUT) $(XCACHE_PROC_H) @@ -41,4 +41,4 @@ xcachetest: $(SED) "s#\\./modules/#$(top_builddir)/modules/#" < $(srcdir)/xcache-test.ini > $(top_builddir)/tmp-php.ini TEST_PHP_SRCDIR=$(top_srcdir) \ CC="$(CC)" \ - $(srcdir)/run-xcachetest -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php $(TESTS) $(TEST_ARGS) -c $(top_builddir)/tmp-php.ini + $(srcdir)/run-xcachetest -d "open_basedir=" -d "safe_mode=0" -d "output_buffering=0" -d "memory_limit=-1" $(top_srcdir)/run-tests.php $(TESTS) $(TEST_ARGS) -c $(top_builddir)/tmp-php.ini diff --git a/config.m4 b/config.m4 index 79301ea..da09779 100644 --- a/config.m4 +++ b/config.m4 @@ -84,6 +84,8 @@ if test "$PHP_XCACHE" != "no"; then M4="$M4 -B 102400" fi PHP_SUBST([M4]) + XCACHE_BACKTICK="'"'`'"'" + PHP_SUBST([XCACHE_BACKTICK]) AC_PATH_PROGS([GREP], [grep]) PHP_SUBST([GREP]) AC_PATH_PROGS([SED], [sed]) diff --git a/config.w32 b/config.w32 index ed86f68..7af39c9 100644 --- a/config.w32 +++ b/config.w32 @@ -55,6 +55,7 @@ if (PHP_XCACHE != "no") { ERROR(apps[i] + " is currently required to build XCache"); } } + DEFINE("XCACHE_BACKTICK", "`") PATH_PROG("gawk", null, "XCACHE_AWK") || PATH_PROG("awk", null, "XCACHE_AWK"); // the cygwin indent is known broken on our output