Changeset 982 in svn for trunk/config.m4


Ignore:
Timestamp:
2012-07-17T10:35:45+02:00 (3 years ago)
Author:
Xuefer
Message:

move files to subdirs

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/config.m4

    r842 r982  
    11dnl vim:ts=2:sw=2:expandtab
    22
    3 AC_DEFUN([XCACHE_OPTION], [
     3AC_DEFUN([XCACHE_MODULE], [
    44  PHP_ARG_ENABLE(xcache-$1, for XCache $1,
    55  [  --enable-xcache-$2    XCache: $4], no, no)
    66  if test "$PHP_$3" != "no"; then
    7     xcache_sources="$xcache_sources $1.c"
     7    xcache_sources="$xcache_sources submodules/xc_$1.c"
    88    XCACHE_MODULES="$XCACHE_MODULES $1"
    99    HAVE_$3=1
     
    1818
    1919if test "$PHP_XCACHE" != "no"; then
    20     PHP_ARG_ENABLE(xcache-constant, for XCache handle of compile time constant,
     20  PHP_ARG_ENABLE(xcache-constant, for XCache handle of compile time constant,
    2121  [  --enable-xcache-constant        XCache: Handle new constants made by php compiler (e.g.: for __halt_compiler)], yes, no)
    22     if test "$PHP_XCACHE_CONSTANT" != "no"; then
    23         AC_DEFINE([HAVE_XCACHE_CONSTANT], 1, [Define to enable XCache handling of compile time constants])
    24     fi
     22  if test "$PHP_XCACHE_CONSTANT" != "no"; then
     23    AC_DEFINE([HAVE_XCACHE_CONSTANT], 1, [Define to enable XCache handling of compile time constants])
     24  fi
    2525
    26   xcache_sources="processor.c \
     26  xcache_sources="
     27                  main/xc_const_string.c \
     28                  main/xc_lock.c \
     29                  main/xc_mem.c \
     30                  main/xc_opcode_spec.c \
     31                  main/xc_processor.c \
     32                  main/xc_shm.c \
     33                  main/xc_shm_mmap.c \
     34                  main/xc_utils.c \
     35                  util/xc_stack.c \
    2736                  xcache.c \
    28                   mmap.c \
    29                   mem.c \
    30                   xc_shm.c \
    31                   const_string.c \
    32                   opcode_spec.c \
    33                   stack.c \
    34                   utils.c \
    35                   lock.c \
    3637                  "
    3738  XCACHE_MODULES="cacher"
    38   XCACHE_OPTION([optimizer],    [optimizer   ], [XCACHE_OPTIMIZER],    [(N/A)])
    39   XCACHE_OPTION([coverager],    [coverager   ], [XCACHE_COVERAGER],    [Enable code coverage dumper, useful for testing php scripts])
    40   XCACHE_OPTION([assembler],    [assembler   ], [XCACHE_ASSEMBLER],    [(N/A)])
    41   XCACHE_OPTION([disassembler], [disassembler], [XCACHE_DISASSEMBLER], [Enable opcode to php variable dumper, NOT for production server])
    42   XCACHE_OPTION([encoder],      [encoder     ], [XCACHE_ENCODER],      [(N/A)])
    43   XCACHE_OPTION([decoder],      [decoder     ], [XCACHE_DECODER],      [(N/A)])
     39  XCACHE_MODULE([optimizer],    [optimizer   ], [XCACHE_OPTIMIZER],    [(N/A)])
     40  XCACHE_MODULE([coverager],    [coverager   ], [XCACHE_COVERAGER],    [Enable code coverage dumper, useful for testing php scripts])
     41  XCACHE_MODULE([assembler],    [assembler   ], [XCACHE_ASSEMBLER],    [(N/A)])
     42  XCACHE_MODULE([disassembler], [disassembler], [XCACHE_DISASSEMBLER], [Enable opcode to php variable dumper, NOT for production server])
     43  XCACHE_MODULE([encoder],      [encoder     ], [XCACHE_ENCODER],      [(N/A)])
     44  XCACHE_MODULE([decoder],      [decoder     ], [XCACHE_DECODER],      [(N/A)])
    4445  AC_DEFINE_UNQUOTED([XCACHE_MODULES], "$XCACHE_MODULES", [Define what modules is built with XCache])
    4546
     
    4849  if test "$PHP_XCACHE_TEST" != "no"; then
    4950    XCACHE_ENABLE_TEST=-DXCACHE_ENABLE_TEST
    50     xcache_sources="$xcache_sources xc_malloc.c"
     51    xcache_sources="$xcache_sources main/xc_malloc.c"
    5152    AC_DEFINE([HAVE_XCACHE_TEST], 1, [Define to enable XCache self test])
    5253  else
     
    116117  XCACHE_PROC_SOURCES=`ls $ac_srcdir/processor/*.m4`
    117118  PHP_SUBST([XCACHE_PROC_SOURCES])
    118 
    119   AC_MSG_CHECKING(if you have opcode_spec_def.h for XCache)
    120   if test -e "$ac_srcdir/opcode_spec_def.h" ; then
    121     AC_DEFINE([HAVE_XCACHE_OPCODE_SPEC_DEF], 1, [Define if you have opcode_spec_def.h for XCache])
    122     AC_MSG_RESULT(yes)
    123   else
    124     dnl check for features depend on opcode_spec_def.h
    125     AC_MSG_RESULT(no)
    126     define([ERROR], [
    127       AC_MSG_ERROR([cannot build with $1, $ac_srcdir/opcode_spec_def.h required])
    128     ])
    129     if test "$PHP_XCACHE_DISASSEMBLER" != "no" ; then
    130       ERROR(disassembler)
    131     fi
    132     undefine([ERROR])
    133   fi
    134119fi
Note: See TracChangeset for help on using the changeset viewer.