Changeset 354 in svn for branches/1.2


Ignore:
Timestamp:
2007-02-15T12:42:15+01:00 (8 years ago)
Author:
Xuefer
Message:

fixed #68: [169] broke configure when XCache source is bundled in php

Location:
branches/1.2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/1.2/Makefile.frag

    r281 r354  
    1212$(XCACHE_STRUCTINFO_OUT): $(XCACHE_INCLUDES_I) $(srcdir)/mkstructinfo.awk
    1313    @echo $(XCACHE_STRUCTINFO_OUT) is optional if XCache test is not enabled, feel free if it awk failed to produce it
    14     -$(AWK) -f $(srcdir)/mkstructinfo.awk < $(XCACHE_INCLUDES_I) > $(XCACHE_STRUCTINFO_OUT).tmp && mv -f $(XCACHE_STRUCTINFO_OUT).tmp $(XCACHE_STRUCTINFO_OUT)
     14    -$(XCACHE_AWK) -f $(srcdir)/mkstructinfo.awk < $(XCACHE_INCLUDES_I) > $(XCACHE_STRUCTINFO_OUT).tmp && mv -f $(XCACHE_STRUCTINFO_OUT).tmp $(XCACHE_STRUCTINFO_OUT)
    1515
    1616$(XCACHE_PROC_OUT): $(XCACHE_PROC_SRC) $(XCACHE_STRUCTINFO_OUT) $(XCACHE_PROC_SOURCES)
  • branches/1.2/config.m4

    r292 r354  
    6464  fi
    6565
    66   AC_PATH_PROGS([AWK], [gawk awk])
     66  AC_PATH_PROGS([XCACHE_AWK], [gawk awk])
    6767  dnl clean locale for gawk 3.1.5 assertion bug
    68   if echo | LANG=C "$AWK" -- '' > /dev/null 2>&1 ; then
    69     AWK="LANG=C $AWK"
     68  if echo | LANG=C "$XCACHE_AWK" -- '' > /dev/null 2>&1 ; then
     69    XCACHE_AWK="LANG=C $XCACHE_AWK"
    7070  else
    71     if echo | /usr/bin/env - "$AWK" -- '' > /dev/null 2>&1 ; then
    72       AWK="/usr/bin/env - $AWK"
     71    if echo | /usr/bin/env - "$XCACHE_AWK" -- '' > /dev/null 2>&1 ; then
     72      XCACHE_AWK="/usr/bin/env - $XCACHE_AWK"
    7373    fi
    7474  fi
    75   PHP_SUBST([AWK])
     75  PHP_SUBST([XCACHE_AWK])
    7676  AC_PATH_PROGS([M4], [m4])
    7777  if echo | "$M4" -E > /dev/null 2>&1 ; then
  • branches/1.2/config.w32

    r230 r354  
    5757        }
    5858    }
    59     PATH_PROG("gawk", null, "AWK") || PATH_PROG("awk", null, "AWK");
     59    PATH_PROG("gawk", null, "XCACHE_AWK") || PATH_PROG("awk", null, "XCACHE_AWK");
    6060
    6161    // the cygwin indent is known broken on our output
Note: See TracChangeset for help on using the changeset viewer.