Changeset 355

Timestamp:

02/15/2007 11:46:05 AM (22 months ago)

Author:

moo

Message:

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

Location:

trunk

Files:

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

trunk/Makefile.frag

@@ -12 +12 @@
 $(XCACHE_STRUCTINFO_OUT): $(XCACHE_INCLUDES_I) $(srcdir)/mkstructinfo.awk
     @echo $(XCACHE_STRUCTINFO_OUT) is optional if XCache test is not enabled, feel free if it awk failed to produce it
-    -$(AWK) -f $(srcdir)/mkstructinfo.awk < $(XCACHE_INCLUDES_I) > $(XCACHE_STRUCTINFO_OUT).tmp && mv -f $(XCACHE_STRUCTINFO_OUT).tmp $(XCACHE_STRUCTINFO_OUT)
+    -$(XCACHE_AWK) -f $(srcdir)/mkstructinfo.awk < $(XCACHE_INCLUDES_I) > $(XCACHE_STRUCTINFO_OUT).tmp && mv -f $(XCACHE_STRUCTINFO_OUT).tmp $(XCACHE_STRUCTINFO_OUT)
 
 $(XCACHE_PROC_OUT): $(XCACHE_PROC_SRC) $(XCACHE_STRUCTINFO_OUT) $(XCACHE_PROC_SOURCES)

trunk/config.m4

@@ -64 +64 @@
   fi
 
-  AC_PATH_PROGS([AWK], [gawk awk])
+  AC_PATH_PROGS([XCACHE_AWK], [gawk awk])
   dnl clean locale for gawk 3.1.5 assertion bug
-  if echo | LANG=C "$AWK" -- '' > /dev/null 2>&1 ; then
-    AWK="LANG=C $AWK"
+  if echo | LANG=C "$XCACHE_AWK" -- '' > /dev/null 2>&1 ; then
+    XCACHE_AWK="LANG=C $XCACHE_AWK"
   else
-    if echo | /usr/bin/env - "$AWK" -- '' > /dev/null 2>&1 ; then
-      AWK="/usr/bin/env - $AWK"
+    if echo | /usr/bin/env - "$XCACHE_AWK" -- '' > /dev/null 2>&1 ; then
+      XCACHE_AWK="/usr/bin/env - $XCACHE_AWK"
     fi
   fi
-  PHP_SUBST([AWK])
+  PHP_SUBST([XCACHE_AWK])
   AC_PATH_PROGS([M4], [m4])
   if echo | "$M4" -E > /dev/null 2>&1 ; then

trunk/config.w32

@@ -57 +57 @@
         }
     }
-    PATH_PROG("gawk", null, "AWK") || PATH_PROG("awk", null, "AWK");
+    PATH_PROG("gawk", null, "XCACHE_AWK") || PATH_PROG("awk", null, "XCACHE_AWK");
 
     // the cygwin indent is known broken on our output