Imported Upstream version 5.2.10.dfsg.1upstream/5.2.10.dfsg.1

2 files changed, 39 insertions, 7 deletions

diff --git a/scripts/phpize.in b/scripts/phpize.in
index 35f7dc727..3adb8c8da 100644
--- a/scripts/phpize.in
+++ b/scripts/phpize.in
@@ -80,6 +80,24 @@ Cannot find build files at '$phpdir'. Please check your PHP installation.
 EOF
     exit 1
   fi
+
+  case "$phpdir" in
+  *\ * | *\	*)
+    cat <<EOF
+Invalid source path '$phpdir'. Whitespace is not allowed in source path.
+
+EOF
+    exit 1;;
+  esac
+
+  case "$builddir" in
+  *\ * | *\	*)
+    cat <<EOF
+Invalid build path '$builddir'. Whitespace is not allowed in build path.
+
+EOF
+      exit 1;;
+  esac
 }
 
 phpize_check_shtool()
@@ -103,18 +121,18 @@ phpize_check_autotools()
   test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf
   test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader
   
-  if test ! -x "`$php_shtool path $PHP_AUTOCONF`"; then
+  if ! test -x "$PHP_AUTOCONF" && ! test -x "`$php_shtool path $PHP_AUTOCONF`"; then
     cat <<EOF
-Cannot find autoconf. Please check your autoconf installation and the \$PHP_AUTOCONF 
-environment variable is set correctly and then rerun this script. 
+Cannot find autoconf. Please check your autoconf installation and the
+\$PHP_AUTOCONF environment variable. Then, rerun this script.
 
 EOF
     exit 1
   fi
-  if test ! -x "`$php_shtool path $PHP_AUTOHEADER`"; then
+  if ! test -x "$PHP_AUTOHEADER" && ! test -x "`$php_shtool path $PHP_AUTOHEADER`"; then
     cat <<EOF
-Cannot find autoheader. Please check your autoconf installation and the \$PHP_AUTOHEADER 
-environment variable is set correctly and then rerun this script. 
+Cannot find autoheader. Please check your autoconf installation and the
+\$PHP_AUTOHEADER environment variable. Then, rerun this script.
 
 EOF
     exit 1
diff --git a/scripts/phpize.m4 b/scripts/phpize.m4
index ba668c889..adf15811e 100644
--- a/scripts/phpize.m4
+++ b/scripts/phpize.m4
@@ -17,11 +17,15 @@ AC_DEFUN([PHP_ALWAYS_SHARED],[
   test "[$]$1" = "no" && $1=yes
 ])dnl
 dnl
+
+test -z "$CFLAGS" && auto_cflags=1
+
 abs_srcdir=`(cd $srcdir && pwd)`
 abs_builddir=`pwd`
 
-AC_PROG_CC
+AC_PROG_CC([cc gcc])
 PHP_DETECT_ICC
+PHP_DETECT_SUNCC
 AC_PROG_CC_C_O
 
 dnl Support systems with system libraries in e.g. /usr/lib64
@@ -73,6 +77,7 @@ php_debug_is_enabled
 ],[
   PHP_DEBUG=no
 ])
+CPPFLAGS=$old_CPPFLAGS
 AC_MSG_RESULT([$PHP_DEBUG])
 
 AC_MSG_CHECKING([if zts is enabled])
@@ -116,6 +121,15 @@ if test "$PHP_DEBUG" = "yes"; then
     CFLAGS="$CFLAGS -O0"
     CXXFLAGS="$CXXFLAGS -O0"
   fi
+  if test "$SUNCC" = "yes"; then
+    if test -n "$auto_cflags"; then
+      CFLAGS="-g"
+      CXXFLAGS="-g"
+    else
+      CFLAGS="$CFLAGS -g"
+      CXXFLAGS="$CFLAGS -g"
+    fi
+  fi
 else
   PHP_DEBUG=0
   ZEND_DEBUG=no