Changeset 982 for trunk/config.m4

Timestamp:

2012-07-17T10:35:45+02:00 (10 months ago)

Author:

moo

Message:

move files to subdirs

File:

• trunk/config.m4 (modified) (4 diffs)

trunk/config.m4

@@ -1 +1 @@
 dnl vim:ts=2:sw=2:expandtab
 
-AC_DEFUN([XCACHE_OPTION], [
+AC_DEFUN([XCACHE_MODULE], [
   PHP_ARG_ENABLE(xcache-$1, for XCache $1,
   [  --enable-xcache-$2    XCache: $4], no, no)
   if test "$PHP_$3" != "no"; then
-    xcache_sources="$xcache_sources $1.c"
+    xcache_sources="$xcache_sources submodules/xc_$1.c"
     XCACHE_MODULES="$XCACHE_MODULES $1"
     HAVE_$3=1
@@ -18 +18 @@
 
 if test "$PHP_XCACHE" != "no"; then
-    PHP_ARG_ENABLE(xcache-constant, for XCache handle of compile time constant,
+  PHP_ARG_ENABLE(xcache-constant, for XCache handle of compile time constant,
   [  --enable-xcache-constant        XCache: Handle new constants made by php compiler (e.g.: for __halt_compiler)], yes, no)
-    if test "$PHP_XCACHE_CONSTANT" != "no"; then
-        AC_DEFINE([HAVE_XCACHE_CONSTANT], 1, [Define to enable XCache handling of compile time constants])
-    fi
+  if test "$PHP_XCACHE_CONSTANT" != "no"; then
+    AC_DEFINE([HAVE_XCACHE_CONSTANT], 1, [Define to enable XCache handling of compile time constants])
+  fi
 
-  xcache_sources="processor.c \
+  xcache_sources="
+                  main/xc_const_string.c \
+                  main/xc_lock.c \
+                  main/xc_mem.c \
+                  main/xc_opcode_spec.c \
+                  main/xc_processor.c \
+                  main/xc_shm.c \
+                  main/xc_shm_mmap.c \
+                  main/xc_utils.c \
+                  util/xc_stack.c \
                   xcache.c \
-                  mmap.c \
-                  mem.c \
-                  xc_shm.c \
-                  const_string.c \
-                  opcode_spec.c \
-                  stack.c \
-                  utils.c \
-                  lock.c \
                   "
   XCACHE_MODULES="cacher"
-  XCACHE_OPTION([optimizer],    [optimizer   ], [XCACHE_OPTIMIZER],    [(N/A)])
-  XCACHE_OPTION([coverager],    [coverager   ], [XCACHE_COVERAGER],    [Enable code coverage dumper, useful for testing php scripts])
-  XCACHE_OPTION([assembler],    [assembler   ], [XCACHE_ASSEMBLER],    [(N/A)])
-  XCACHE_OPTION([disassembler], [disassembler], [XCACHE_DISASSEMBLER], [Enable opcode to php variable dumper, NOT for production server])
-  XCACHE_OPTION([encoder],      [encoder     ], [XCACHE_ENCODER],      [(N/A)])
-  XCACHE_OPTION([decoder],      [decoder     ], [XCACHE_DECODER],      [(N/A)])
+  XCACHE_MODULE([optimizer],    [optimizer   ], [XCACHE_OPTIMIZER],    [(N/A)])
+  XCACHE_MODULE([coverager],    [coverager   ], [XCACHE_COVERAGER],    [Enable code coverage dumper, useful for testing php scripts])
+  XCACHE_MODULE([assembler],    [assembler   ], [XCACHE_ASSEMBLER],    [(N/A)])
+  XCACHE_MODULE([disassembler], [disassembler], [XCACHE_DISASSEMBLER], [Enable opcode to php variable dumper, NOT for production server])
+  XCACHE_MODULE([encoder],      [encoder     ], [XCACHE_ENCODER],      [(N/A)])
+  XCACHE_MODULE([decoder],      [decoder     ], [XCACHE_DECODER],      [(N/A)])
   AC_DEFINE_UNQUOTED([XCACHE_MODULES], "$XCACHE_MODULES", [Define what modules is built with XCache])
 
@@ -48 +49 @@
   if test "$PHP_XCACHE_TEST" != "no"; then
     XCACHE_ENABLE_TEST=-DXCACHE_ENABLE_TEST
-    xcache_sources="$xcache_sources xc_malloc.c"
+    xcache_sources="$xcache_sources main/xc_malloc.c"
     AC_DEFINE([HAVE_XCACHE_TEST], 1, [Define to enable XCache self test])
   else
@@ -116 +117 @@
   XCACHE_PROC_SOURCES=`ls $ac_srcdir/processor/*.m4`
   PHP_SUBST([XCACHE_PROC_SOURCES])
-
-  AC_MSG_CHECKING(if you have opcode_spec_def.h for XCache)
-  if test -e "$ac_srcdir/opcode_spec_def.h" ; then
-    AC_DEFINE([HAVE_XCACHE_OPCODE_SPEC_DEF], 1, [Define if you have opcode_spec_def.h for XCache])
-    AC_MSG_RESULT(yes)
-  else
-    dnl check for features depend on opcode_spec_def.h
-    AC_MSG_RESULT(no)
-    define([ERROR], [
-      AC_MSG_ERROR([cannot build with $1, $ac_srcdir/opcode_spec_def.h required])
-    ])
-    if test "$PHP_XCACHE_DISASSEMBLER" != "no" ; then
-      ERROR(disassembler)
-    fi
-    undefine([ERROR])
-  fi
 fi