Changeset 8

Timestamp:

05/13/2006 03:19:43 AM (3 years ago)

Author:

moo

Message:

make opcode_spec_def.h optional

Location:

trunk

Files:

• config.m4 (modified) (2 diffs)
• disassembler.c (modified) (1 diff)
• opcode_spec.c (modified) (2 diffs)
• utils.c (modified) (2 diffs)
• xcache.c (modified) (3 diffs)

trunk/config.m4

@@ -8 +8 @@
   if test "$PHP_$3" = "yes"; then
     xcache_sources="$xcache_sources $1.c"
+    HAVE_$3=1
     AC_DEFINE([HAVE_$3], 1, [Define for XCACHE: $4])
+  else
+    HAVE_$3=
   fi
 ])dnl
@@ -57 +60 @@
   PHP_SUBST([XCACHE_INDENT])
 
+  dnl $ac_srcdir etc require PHP_NEW_EXTENSION
   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 "$HAVE_XCACHE_DISASSEMBLER" = "1" ; then
+      ERROR(disassembler)
+    fi
+    undefine([ERROR])
+  fi
 fi

trunk/disassembler.c

@@ -6 +6 @@
 #define return_value dst
 
+#ifndef HAVE_XCACHE_OPCODE_SPEC_DEF
+#error disassembler cannot be built without xcache/opcode_spec_def.h
+#endif
 static void xc_dasm(zval *dst, zend_op_array *op_array TSRMLS_DC) /* {{{ */
 {

trunk/opcode_spec.c

@@ -3 +3 @@
 #include "const_string.h"
 
+#ifdef HAVE_XCACHE_OPCODE_SPEC_DEF
 /* {{{ opcode_spec */
 #define OPSPEC(ext, op1, op2, res) { OPSPEC_##ext, OPSPEC_##op1, OPSPEC_##op2, OPSPEC_##res },
@@ -24 +25 @@
 }
 /* }}} */
+#endif
 /* {{{ op_spec */
 

trunk/utils.c

@@ -198 +198 @@
 /* }}} */
 
+#ifdef HAVE_XCACHE_OPCODE_SPEC_DEF
 static void xc_fix_opcode_ex_znode(int tofix, xc_op_spec_t spec, znode *znode, int type TSRMLS_DC) /* {{{ */
 {
@@ -262 +263 @@
 }
 /* }}} */
+#endif
 
 void xc_install_function(char *filename, zend_function *func, zend_uchar type, char *key, uint len TSRMLS_DC) /* {{{ */

trunk/xcache.c

@@ -1506 +1506 @@
 }
 /* }}} */
+#ifdef HAVE_XCACHE_OPCODE_SPEC_DEF
 /* {{{ proto string xcache_get_opcode_spec(int opcode) */
 PHP_FUNCTION(xcache_get_opcode_spec)
@@ -1529 +1530 @@
 }
 /* }}} */
+#endif
 /* {{{ proto mixed xcache_get_special_value(zval value) */
 PHP_FUNCTION(xcache_get_special_value)
@@ -1601 +1603 @@
     PHP_FE(xcache_get_data_type,     NULL)
     PHP_FE(xcache_get_opcode,        NULL)
+#ifdef HAVE_XCACHE_OPCODE_SPEC_DEF
     PHP_FE(xcache_get_opcode_spec,   NULL)
+#endif
     PHP_FE(xcache_is_autoglobal,     NULL)
     PHP_FE(xcache_inc,               NULL)