cvs: spl / config.m4

helly Mon Jun 30 19:24:12 2003 EDT Modified files: /spl config.m4 Log: Make --disable-spl work Index: spl/config.m4 diff -u spl/config.m4:1.1.1.1 spl/config.m4:1.2 --- spl/config.m4:1.1.1.1 Thu May 1 19:28:28 2003 +++ spl/config.m4 Mon Jun 30 19:24:12 2003 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.1.1.1 2003/05/01 23:28:28 helly Exp $ +dnl $Id: config.m4,v 1.2 2003/06/30 23:24:12 helly Exp $ dnl config.m4 for extension SPL PHP_ARG_ENABLE(spl, enable SPL suppport, @@ -22,17 +22,19 @@ dnl last do checks on hooks -if test "$PHP_SPL_HOOK_ALL" != "no" -o "$PHP_SPL_FOREACH" != "no"; then - AC_DEFINE(SPL_FOREACH, 1, [Activate opcode hook on foreach]) - PHP_SPL="yes" -fi -if test "$PHP_SPL_HOOK_ALL" != "no" -o "$PHP_SPL_ARRAY_READ" != "no" -o "$PHP_SPL_ARRAY_WRITE" != "no"; then - AC_DEFINE(SPL_ARRAY_READ, 1, [Activate opcode hook on array read]) - PHP_SPL="yes" -fi -if test "$PHP_SPL_HOOK_ALL" != "no" -o "$PHP_SPL_ARRAY_WRITE" != "no"; then - AC_DEFINE(SPL_ARRAY_WRITE, 1, [Activate opcode hook on array write]) - PHP_SPL="yes" +if test "$PHP_SPL" != "no"; then + if test "$PHP_SPL_HOOK_ALL" != "no" -o "$PHP_SPL_FOREACH" != "no"; then + AC_DEFINE(SPL_FOREACH, 1, [Activate opcode hook on foreach]) + PHP_SPL="yes" + fi + if test "$PHP_SPL_HOOK_ALL" != "no" -o "$PHP_SPL_ARRAY_READ" != "no" -o "$PHP_SPL_ARRAY_WRITE" != "no"; then + AC_DEFINE(SPL_ARRAY_READ, 1, [Activate opcode hook on array read]) + PHP_SPL="yes" + fi + if test "$PHP_SPL_HOOK_ALL" != "no" -o "$PHP_SPL_ARRAY_WRITE" != "no"; then + AC_DEFINE(SPL_ARRAY_WRITE, 1, [Activate opcode hook on array write]) + PHP_SPL="yes" + fi fi if test "$PHP_SPL" != "no"; then