Index: scripts/phpize.m4
===================================================================
RCS file: /repository/php-src/scripts/phpize.m4,v
retrieving revision 1.17.2.3.2.5.2.2
diff -u -p -r1.17.2.3.2.5.2.2 phpize.m4
--- scripts/phpize.m4	27 Jul 2008 20:43:40 -0000	1.17.2.3.2.5.2.2
+++ scripts/phpize.m4	30 Jul 2008 13:46:30 -0000
@@ -21,6 +21,7 @@ abs_srcdir=`(cd $srcdir && pwd)`
 abs_builddir=`pwd`
 
 AC_PROG_CC
+PHP_DETECT_ICC
 AC_PROG_CC_C_O
 
 dnl Support systems with system libraries in e.g. /usr/lib64
@@ -58,6 +59,39 @@ AC_MSG_RESULT([$EXTENSION_DIR])
 AC_MSG_CHECKING([for PHP installed headers prefix])
 AC_MSG_RESULT([$phpincludedir])
 
+AC_MSG_CHECKING([if debug is enabled])
+
+old_CFLAGS=$CFLAGS
+CFLAGS=$INCLUDES
+AC_TRY_COMPILE([
+#include <php.h>
+], [
+#if ZEND_DEBUG
+#else
+#error
+#endif
+], [PHP_DEBUG="yes"], [PHP_DEBUG="no"])
+CFLAGS=$old_CFLAGS
+
+if test "$PHP_DEBUG" = "yes"; then
+  AC_MSG_RESULT([yes])
+  PHP_DEBUG=1
+  ZEND_DEBUG=yes
+  changequote({,})
+  CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9s]*//g'`
+  CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9s]*//g'`
+  changequote([,])
+  dnl add -O0 only if GCC or ICC is used
+  if test "$GCC" = "yes" || test "$ICC" = "yes"; then
+    CFLAGS="$CFLAGS -O0"
+    CXXFLAGS="$CXXFLAGS -O0"
+  fi
+else
+  AC_MSG_RESULT([no])
+  PHP_DEBUG=0
+  ZEND_DEBUG=no
+fi
+
 dnl Always shared
 PHP_BUILD_SHARED