Changeset 355 for trunk/config.m4

Show
Ignore:
Timestamp:
02/15/2007 11:46:05 AM (2 years ago)
Author:
moo
Message:

1.2->trunk: fixed broken configure when XCache source is bundled in php

Location:
trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svnmerge-integrated changed from /branches/1.2:1-324,328,334,339 to /branches/1.2:1-324,328,334,339,354

  • trunk/config.m4

    r292 r355  
    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