Changeset 695


Ignore:
Timestamp:
2011-02-08T05:47:15+01:00 (3 years ago)
Author:
moo
Message:

merge from trunk: fix quotes for win32 native gnu tools

Location:
branches/1.3
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 694
  • branches/1.3/Makefile.frag

    r644 r695  
    1515 
    1616$(XCACHE_PROC_OUT): $(XCACHE_PROC_SRC) $(XCACHE_STRUCTINFO_OUT) $(XCACHE_PROC_SOURCES) 
    17     $(M4) -D srcdir='`'"$(srcdir)'" -D builddir='`'"$(builddir)'" $(XCACHE_ENABLE_TEST) $(XCACHE_PROC_SRC) > $(XCACHE_PROC_OUT).tmp 
     17    $(M4) -D srcdir=$(XCACHE_BACKTICK)"$(srcdir)'" -D builddir=$(XCACHE_BACKTICK)"$(builddir)'" $(XCACHE_ENABLE_TEST) $(XCACHE_PROC_SRC) > $(XCACHE_PROC_OUT).tmp 
    1818    mv $(XCACHE_PROC_OUT).tmp $(XCACHE_PROC_OUT) 
    1919 
    2020$(XCACHE_PROC_H): $(XCACHE_PROC_OUT) 
    21     $(GREP) 'export: ' $(XCACHE_PROC_OUT) | $(SED) 's/.*export:\(.*\):export.*/\1/g' > $(XCACHE_PROC_H) 
     21    $(GREP) "export: " $(XCACHE_PROC_OUT) | $(SED) "s/.*export:\(.*\):export.*/\1/g" > $(XCACHE_PROC_H) 
    2222    -$(XCACHE_INDENT) < $(XCACHE_PROC_H) > $(XCACHE_PROC_H).tmp && mv $(XCACHE_PROC_H).tmp $(XCACHE_PROC_H) 
    2323 
     
    4242    TEST_PHP_SRCDIR=$(top_srcdir) \ 
    4343    CC="$(CC)" \ 
    44         $(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 
     44        $(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

    r479 r695  
    8585  fi 
    8686  PHP_SUBST([M4]) 
     87  XCACHE_BACKTICK="'"'`'"'" 
     88  PHP_SUBST([XCACHE_BACKTICK]) 
    8789  AC_PATH_PROGS([GREP], [grep]) 
    8890  PHP_SUBST([GREP]) 
  • branches/1.3/config.w32

    r644 r695  
    5656        } 
    5757    } 
     58    DEFINE("XCACHE_BACKTICK", "`") 
    5859    PATH_PROG("gawk", null, "XCACHE_AWK") || PATH_PROG("awk", null, "XCACHE_AWK"); 
    5960 
Note: See TracChangeset for help on using the changeset viewer.