[PHP-CVS] cvs: php-src(PHP_5_3) /scripts phpize.m4

2009-06-02 Thread Jani Taskinen 
janiTue Jun  2 19:54:04 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/scriptsphpize.m4 
  Log:
  MFH:- Fixed bug #48456 (CPPFLAGS not restored properly in phpize.m4)
  
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.17.2.3.2.5.2.7r2=1.17.2.3.2.5.2.8diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.17.2.3.2.5.2.7 
php-src/scripts/phpize.m4:1.17.2.3.2.5.2.8
--- php-src/scripts/phpize.m4:1.17.2.3.2.5.2.7  Mon May 18 21:33:38 2009
+++ php-src/scripts/phpize.m4   Tue Jun  2 19:54:03 2009
@@ -77,6 +77,7 @@
 ],[
   PHP_DEBUG=no
 ])
+CPPFLAGS=$old_CPPFLAGS
 AC_MSG_RESULT([$PHP_DEBUG])
 
 AC_MSG_CHECKING([if zts is enabled])



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /scripts phpize.m4

2008-12-03 Thread David Soria Parra 
dsp Wed Dec  3 19:52:59 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/scriptsphpize.m4 
  Log:
  Fix cc detection in phpize according to changes in configure.in
  
  
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.17.2.3.2.5.2.5r2=1.17.2.3.2.5.2.6diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.17.2.3.2.5.2.5 
php-src/scripts/phpize.m4:1.17.2.3.2.5.2.6
--- php-src/scripts/phpize.m4:1.17.2.3.2.5.2.5  Thu Jul 31 00:45:17 2008
+++ php-src/scripts/phpize.m4   Wed Dec  3 19:52:59 2008
@@ -17,11 +17,15 @@
   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
@@ -116,6 +120,15 @@
 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



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /scripts phpize.m4

2008-07-30 Thread Jani Taskinen 
janiWed Jul 30 22:55:08 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/scriptsphpize.m4 
  Log:
  ws
  
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.17.2.3.2.5.2.2r2=1.17.2.3.2.5.2.3diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.17.2.3.2.5.2.2 
php-src/scripts/phpize.m4:1.17.2.3.2.5.2.3
--- php-src/scripts/phpize.m4:1.17.2.3.2.5.2.2  Sun Jul 27 20:43:40 2008
+++ php-src/scripts/phpize.m4   Wed Jul 30 22:55:08 2008
@@ -64,7 +64,7 @@
 dnl Required programs
 PHP_PROG_RE2C
 PHP_PROG_AWK
-
+
 sinclude(config.m4)
 
 enable_static=no



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /scripts phpize.m4

2008-07-30 Thread Jani Taskinen 
janiWed Jul 30 23:56:05 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/scriptsphpize.m4 
  Log:
  MFH:- Detect whether debugging was enabled in PHP and drop optimizing flags 
if so (merge from configure.in)
  
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.17.2.3.2.5.2.3r2=1.17.2.3.2.5.2.4diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.17.2.3.2.5.2.3 
php-src/scripts/phpize.m4:1.17.2.3.2.5.2.4
--- php-src/scripts/phpize.m4:1.17.2.3.2.5.2.3  Wed Jul 30 22:55:08 2008
+++ php-src/scripts/phpize.m4   Wed Jul 30 23:56:05 2008
@@ -21,6 +21,7 @@
 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,40 @@
 AC_MSG_CHECKING([for PHP installed headers prefix])
 AC_MSG_RESULT([$phpincludedir])
 
+dnl Check for PHP_DEBUG / ZEND_DEBUG
+AC_MSG_CHECKING([if debug is enabled])
+old_CPPFLAGS=$CPPFLAGS
+CPPFLAGS=-I$phpincludedir
+AC_EGREP_CPP(php_debug_is_enabled,[
+#include main/php_config.h
+#if ZEND_DEBUG
+php_debug_is_enabled
+#endif
+],[
+  PHP_DEBUG=yes
+],[
+  PHP_DEBUG=no
+])
+CPPFLAGS=$old_CPPFLAGS
+AC_MSG_RESULT([$PHP_DEBUG])
+
+if test $PHP_DEBUG = yes; then
+  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
+  PHP_DEBUG=0
+  ZEND_DEBUG=no
+fi
+
 dnl Always shared
 PHP_BUILD_SHARED
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /scripts phpize.m4

2008-07-30 Thread Jani Taskinen 
janiThu Jul 31 00:45:17 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/scriptsphpize.m4 
  Log:
  MFH:- Applied the missing parts to phpize.m4 for zend extension builds
  
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.17.2.3.2.5.2.4r2=1.17.2.3.2.5.2.5diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.17.2.3.2.5.2.4 
php-src/scripts/phpize.m4:1.17.2.3.2.5.2.5
--- php-src/scripts/phpize.m4:1.17.2.3.2.5.2.4  Wed Jul 30 23:56:05 2008
+++ php-src/scripts/phpize.m4   Thu Jul 31 00:45:17 2008
@@ -59,7 +59,7 @@
 AC_MSG_CHECKING([for PHP installed headers prefix])
 AC_MSG_RESULT([$phpincludedir])
 
-dnl Check for PHP_DEBUG / ZEND_DEBUG
+dnl Checks for PHP_DEBUG / ZEND_DEBUG / ZTS
 AC_MSG_CHECKING([if debug is enabled])
 old_CPPFLAGS=$CPPFLAGS
 CPPFLAGS=-I$phpincludedir
@@ -73,9 +73,37 @@
 ],[
   PHP_DEBUG=no
 ])
+AC_MSG_RESULT([$PHP_DEBUG])
+
+AC_MSG_CHECKING([if zts is enabled])
+old_CPPFLAGS=$CPPFLAGS
+CPPFLAGS=-I$phpincludedir
+AC_EGREP_CPP(php_zts_is_enabled,[
+#include main/php_config.h
+#if ZTS
+php_zts_is_enabled
+#endif
+],[
+  PHP_THREAD_SAFETY=yes
+],[
+  PHP_THREAD_SAFETY=no
+])
 CPPFLAGS=$old_CPPFLAGS
 AC_MSG_RESULT([$PHP_DEBUG])
 
+dnl Support for building and testing Zend extensions
+if test $PHP_DEBUG = yes  test $PHP_THREAD_SAFETY = yes; then
+  ZEND_EXT_TYPE=zend_extension_debug_ts
+elif test $PHP_DEBUG = yes; then
+  ZEND_EXT_TYPE=zend_extension_debug
+elif test $PHP_THREAD_SAFETY = yes; then
+  ZEND_EXT_TYPE=zend_extension_ts
+else
+  ZEND_EXT_TYPE=zend_extension
+fi
+PHP_SUBST(ZEND_EXT_TYPE)
+
+dnl Discard optimization flags when debugging is enabled
 if test $PHP_DEBUG = yes; then
   PHP_DEBUG=1
   ZEND_DEBUG=yes
@@ -115,7 +143,7 @@
 ])
 AC_PROG_LIBTOOL
 
-all_targets='$(PHP_MODULES)'
+all_targets='$(PHP_MODULES) $(PHP_ZEND_EX)'
 install_targets=install-modules install-headers
 phplibdir=`pwd`/modules
 CPPFLAGS=$CPPFLAGS -DHAVE_CONFIG_H
@@ -126,6 +154,8 @@
 test $exec_prefix = NONE  exec_prefix='$(prefix)'
 
 PHP_SUBST(PHP_MODULES)
+PHP_SUBST(PHP_ZEND_EX)
+
 PHP_SUBST(all_targets)
 PHP_SUBST(install_targets)
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /scripts phpize.m4

2008-07-27 Thread David Soria Parra 
dsp Sun Jul 27 20:43:41 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/scriptsphpize.m4 
  Log:
  MFB: - Fixed the fix for not requiring C++ always
  
  
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.17.2.3.2.5.2.1r2=1.17.2.3.2.5.2.2diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.17.2.3.2.5.2.1 
php-src/scripts/phpize.m4:1.17.2.3.2.5.2.2
--- php-src/scripts/phpize.m4:1.17.2.3.2.5.2.1  Fri Jul 25 12:36:34 2008
+++ php-src/scripts/phpize.m4   Sun Jul 27 20:43:40 2008
@@ -76,7 +76,7 @@
   undefine([AC_PROG_CXX])
   AC_DEFUN([AC_PROG_CXX], [])
   undefine([AC_PROG_CXXCPP])
-  AC_DEFUN([AC_PROG_CXXCPP], [])
+  AC_DEFUN([AC_PROG_CXXCPP], [php_prog_cxxcpp=disabled])
 ])
 AC_PROG_LIBTOOL
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php