diff -uNpar php5.suhosin/configure.in php5.suhosin-sym-fix/configure.in
--- php5.suhosin/configure.in	2007-06-03 01:16:57 +0400
+++ php5.suhosin-sym-fix/configure.in	2007-06-03 01:15:38 +0400
@@ -1324,16 +1324,13 @@ PHP_ADD_SOURCES(main, main.c snprintf.c 
 PHP_ADD_SOURCES(main/streams, streams.c cast.c memory.c filter.c \
        plain_wrapper.c userspace.c transports.c xp_socket.c mmap.c)
 
-PHP_ADD_SOURCES(/main, internal_functions.c,, sapi)
+PHP_ADD_SOURCES(/main, internal_functions.c,,PHP_GLOBAL_OBJS)
 
 case $host_alias in
 *netware*)
   PHP_ADD_BUILD_DIR(win32)
   PHP_ADD_BUILD_DIR(netware)
   ;;
-*)
-  PHP_ADD_SOURCES(/main, internal_functions_cli.c,, cli)
-  ;;
 esac
 
 PHP_ADD_SOURCES(Zend, \
@@ -1414,19 +1411,19 @@ if test -n "\$REDO_ALL"; then
   #
   echo "creating main/internal_functions.c"
   extensions="$EXT_STATIC"
-dnl mv -f main/internal_functions.c main/internal_functions.c.old 2>/dev/null
+  mv -f main/internal_functions.c main/internal_functions.c.old 2>/dev/null
   sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in $srcdir "$EXTRA_MODULE_PTRS" $AWK \$extensions > main/internal_functions.c
 
   echo "creating main/internal_functions_cli.c"
   cli_extensions="$EXT_CLI_STATIC"
   sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in $srcdir "$EXTRA_MODULE_PTRS" $AWK \$cli_extensions > main/internal_functions_cli.c
 
-dnl  if cmp main/internal_functions.c.old main/internal_functions.c > /dev/null 2>&1; then
-dnl      echo "main/internal_functions.c is unchanged"
-dnl      mv main/internal_functions.c.old main/internal_functions.c
-dnl  else
-dnl      rm -f main/internal_functions.c.old
-dnl  fi
+  if cmp main/internal_functions.c.old main/internal_functions.c > /dev/null 2>&1; then
+      echo "main/internal_functions.c is unchanged"
+      mv main/internal_functions.c.old main/internal_functions.c
+  else
+      rm -f main/internal_functions.c.old
+  fi
 
   if test "$UNAME" = "FreeBSD" && test "$PHP_SAPI" = "apache2filter" && test "$TSRM_PTH" != "pth-config" ; then
     echo "+--------------------------------------------------------------------+"