Changeset 695

Timestamp:

2011-02-08T05:47:15+01:00 (2 years ago)

Author:

moo

Message:

merge from trunk: fix quotes for win32 native gnu tools

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• Makefile.frag (modified) (2 diffs)
• config.m4 (modified) (1 diff)
• config.w32 (modified) (1 diff)

branches/1.3/Makefile.frag

@@ -15 +15 @@
 
 $(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)
 
@@ -42 +42 @@
     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

branches/1.3/config.m4

@@ -85 +85 @@
   fi
   PHP_SUBST([M4])
+  XCACHE_BACKTICK="'"'`'"'"
+  PHP_SUBST([XCACHE_BACKTICK])
   AC_PATH_PROGS([GREP], [grep])
   PHP_SUBST([GREP])

branches/1.3/config.w32

@@ -56 +56 @@
         }
     }
+    DEFINE("XCACHE_BACKTICK", "`")
     PATH_PROG("gawk", null, "XCACHE_AWK") || PATH_PROG("awk", null, "XCACHE_AWK");