Changeset 255 for branches/1.1/config.m4

Show
Ignore:
Timestamp:
10/17/2006 06:30:41 PM (2 years ago)
Author:
moo
Message:
  • fix build on rare arch
  • fix build on Mac OS X
  • merged from trunk: 159,161-162,167-180,182,184,186-187,194
    • [194] PHP_5_2: new element in zend_brk_cont_element
    • [186] [187] fix build on some rare arch
    • [184] fix tplcov
    • [178] fix type processor_t conflict with Mac OS X
Location:
branches/1.1
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/1.1

    • Property svnmerge-integrated set to /trunk:1-157,159,161-162,167-180,182,184,186-187,194

  • branches/1.1/config.m4

    r148 r255  
    5959 
    6060  AC_PATH_PROGS([AWK], [gawk awk]) 
     61  dnl clean locale for gawk 3.1.5 assertion bug 
     62  if echo | LANG=C "$AWK" -- '' > /dev/null 2>&1 ; then 
     63    AWK="LANG=C $AWK" 
     64  else 
     65    if echo | /usr/bin/env - "$AWK" -- '' > /dev/null 2>&1 ; then 
     66      AWK="/usr/bin/env - $AWK" 
     67    fi 
     68  fi 
    6169  PHP_SUBST([AWK]) 
    6270  AC_PATH_PROGS([M4], [m4]) 
     71  if echo | "$M4" -E > /dev/null 2>&1 ; then 
     72    M4="$M4 -E" 
     73  fi 
    6374  PHP_SUBST([M4]) 
    6475  AC_PATH_PROGS([GREP], [grep])