Changeset 22 for trunk

Timestamp:

05/25/2006 08:49:48 AM (7 years ago)

Author:

moo

Message:

do not depends on mkstructinfo.awk if test is not enabled

Location:

trunk

Files:

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

trunk/Makefile.frag

@@ -5 +5 @@
 XCACHE_INCLUDES_SRC=$(srcdir)/includes.c
 XCACHE_INCLUDES_I=$(builddir)/includes.i
-XCACHE_STRUCT_OUT=$(builddir)/structinfo.m4
+XCACHE_STRUCTINFO_OUT=$(builddir)/structinfo.m4
 
 $(XCACHE_INCLUDES_I): $(XCACHE_INCLUDES_SRC) $(srcdir)/xcache.h
     $(CC) -I. -I$(srcdir) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -E $(XCACHE_INCLUDES_SRC) -o $(XCACHE_INCLUDES_I)
 
-$(XCACHE_STRUCT_OUT): $(XCACHE_INCLUDES_I) $(srcdir)/mkstructinfo.awk
-    $(AWK) -f $(srcdir)/mkstructinfo.awk < $(XCACHE_INCLUDES_I) > $(XCACHE_STRUCT_OUT)
+$(XCACHE_STRUCTINFO_OUT): $(XCACHE_INCLUDES_I) $(srcdir)/mkstructinfo.awk
+    $(AWK) -W posix -f $(srcdir)/mkstructinfo.awk < $(XCACHE_INCLUDES_I) > $(XCACHE_STRUCTINFO_OUT)
 
-$(XCACHE_PROC_OUT): $(XCACHE_PROC_SRC) $(XCACHE_STRUCT_OUT) $(XCACHE_PROC_SOURCES)
+$(XCACHE_PROC_OUT): $(XCACHE_PROC_SRC) $(XCACHE_STRUCTINFO) $(XCACHE_PROC_SOURCES)
     $(M4) -D srcdir="$(srcdir)" -D builddir="$(builddir)" $(XCACHE_ENABLE_TEST) -E $(XCACHE_PROC_SRC) > $(XCACHE_PROC_OUT).tmp
     mv -f $(XCACHE_PROC_OUT).tmp $(XCACHE_PROC_OUT)

trunk/config.m4

@@ -42 +42 @@
     XCACHE_ENABLE_TEST=-DXCACHE_ENABLE_TEST
     AC_DEFINE([HAVE_XCACHE_TEST], 1, [Define to enable XCache self test])
+    XCACHE_STRUCTINFO='$(XCACHE_STRUCTINFO_OUT)'
   else
     XCACHE_ENABLE_TEST=
+    XCACHE_STRUCTINFO=
   fi
   PHP_SUBST([XCACHE_ENABLE_TEST])
+  PHP_SUBST([XCACHE_STRUCTINFO])
 
   AC_PATH_PROGS([AWK], [gawk awk])
+  PHP_SUBST([AWK])
   AC_PATH_PROGS([M4], [m4])
+  PHP_SUBST([M4])
   AC_PATH_PROGS([GREP], [grep])
+  PHP_SUBST([GREP])
   AC_PATH_PROGS([SED], [sed])
+  PHP_SUBST([SED])
 
   AC_PATH_PROGS([INDENT], [indent cat])

trunk/config.w32

@@ -101 +101 @@
         ADD_FLAG("XCACHE_ENABLE_TEST", "-DXCACHE_ENABLE_TEST");
         AC_DEFINE("HAVE_XCACHE_TEST", 1, "Define to enable XCache self test");
+        ADD_FLAG("XCACHE_STRUCTINFO", "$(XCACHE_STRUCTINFO_OUT)");
     }
     else {
         ADD_FLAG("XCACHE_ENABLE_TEST", "");
+        ADD_FLAG("XCACHE_STRUCTINFO", "");
     }