Changeset 11 for trunk/config.m4

Timestamp:

2006-05-24T09:52:48+02:00 (7 years ago)

Author:

moo

Message:

make it build on windows vc compiler

File:

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

trunk/config.m4

@@ -1 @@
-dnl
-dnl $Id:$
 dnl vim:ts=2:sw=2:expandtab
 
 AC_DEFUN([XCACHE_OPTION], [
-  PHP_ARG_ENABLE(xcache-$1, for XCACHE $1,
-  [  --enable-xcache-$2    XCACHE: $4], no, no)
-  if test "$PHP_$3" = "yes"; then
+  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"
     HAVE_$3=1
-    AC_DEFINE([HAVE_$3], 1, [Define for XCACHE: $4])
+    AC_DEFINE([HAVE_$3], 1, [Define for XCache: $4])
   else
     HAVE_$3=
@@ -15 +13 @@
 ])dnl
 
-PHP_ARG_ENABLE(xcache, for XCACHE support,
-[  --enable-xcache         Include XCACHE support.])
+PHP_ARG_ENABLE(xcache, for XCache support,
+[  --enable-xcache         Include XCache support.])
 
 if test "$PHP_XCACHE" != "no"; then
@@ -39 +37 @@
   PHP_ADD_MAKEFILE_FRAGMENT()
 
-  PHP_ARG_ENABLE(xcache-test, for XCACHE self test,
-  [  --enable-xcache-test            XCACHE: Enable self test - FOR DEVELOPERS ONLY!!], no, no)
-  if test "$PHP_XCACHE_TEST" = "yes"; then
+  PHP_ARG_ENABLE(xcache-test, for XCache self test,
+  [  --enable-xcache-test            XCache: Enable self test - FOR DEVELOPERS ONLY!!], no, no)
+  if test "$PHP_XCACHE_TEST" != "no"; then
     XCACHE_ENABLE_TEST=-DXCACHE_ENABLE_TEST
-    AC_DEFINE([HAVE_XCACHE_TEST], 1, [Define to enable XCACHE self test])
+    AC_DEFINE([HAVE_XCACHE_TEST], 1, [Define to enable XCache self test])
   else
     XCACHE_ENABLE_TEST=
@@ -49 +47 @@
   PHP_SUBST([XCACHE_ENABLE_TEST])
 
-  AC_PATH_PROGS(INDENT, [indent cat])
+  AC_PATH_PROGS([AWK], [gawk awk])
+  AC_PATH_PROGS([M4], [m4])
+  AC_PATH_PROGS([GREP], [grep])
+  AC_PATH_PROGS([SED], [sed])
+
+  AC_PATH_PROGS([INDENT], [indent cat])
   case $INDENT in
   */indent[)]
@@ -64 +67 @@
   PHP_SUBST([XCACHE_PROC_SOURCES])
 
-  AC_MSG_CHECKING(if you have opcode_spec_def.h for xcache)
+  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_DEFINE([HAVE_XCACHE_OPCODE_SPEC_DEF], 1, [Define if you have opcode_spec_def.h for XCache])
     AC_MSG_RESULT(yes)
   else
@@ -74 +77 @@
       AC_MSG_ERROR([cannot build with $1, $ac_srcdir/opcode_spec_def.h required])
     ])
-    if test "$HAVE_XCACHE_DISASSEMBLER" = "1" ; then
+    if test "$PHP_XCACHE_DISASSEMBLER" != "no" ; then
       ERROR(disassembler)
     fi