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

2009-06-02 Thread Jani Taskinen 
janiTue Jun  2 19:53:29 2009 UTC

  Modified files:  
/php-src/scriptsphpize.m4 
  Log:
  - Fixed bug #48456 (CPPFLAGS not restored properly in phpize.m4)
  
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.32&r2=1.33&diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.32 php-src/scripts/phpize.m4:1.33
--- php-src/scripts/phpize.m4:1.32  Mon May 18 21:28:42 2009
+++ php-src/scripts/phpize.m4   Tue Jun  2 19:53:29 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 /scripts phpize.m4

2008-12-03 Thread David Soria Parra 
dsp Thu Dec  4 00:41:55 2008 UTC

  Modified files:  
/php-src/scriptsphpize.m4 
  Log:
  MFB: Fix cc detection in phpize according to changes in configure.in
  
  
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.30&r2=1.31&diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.30 php-src/scripts/phpize.m4:1.31
--- php-src/scripts/phpize.m4:1.30  Thu Jul 31 00:45:04 2008
+++ php-src/scripts/phpize.m4   Thu Dec  4 00:41:55 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 /scripts phpize.m4

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

  Modified files:  
/php-src/scriptsphpize.m4 
  Log:
  - Applied the missing parts to phpize.m4 for zend extension builds
  
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.29&r2=1.30&diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.29 php-src/scripts/phpize.m4:1.30
--- php-src/scripts/phpize.m4:1.29  Wed Jul 30 23:55:38 2008
+++ php-src/scripts/phpize.m4   Thu Jul 31 00:45:04 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 
+#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 /scripts phpize.m4

2008-07-30 Thread Jani Taskinen 
janiWed Jul 30 23:55:39 2008 UTC

  Modified files:  
/php-src/scriptsphpize.m4 
  Log:
  - 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.28&r2=1.29&diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.28 php-src/scripts/phpize.m4:1.29
--- php-src/scripts/phpize.m4:1.28  Sun Jul 27 20:48:26 2008
+++ php-src/scripts/phpize.m4   Wed Jul 30 23:55:38 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 
+#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 /scripts phpize.m4

2008-07-27 Thread David Soria Parra 
dsp Sun Jul 27 20:48:26 2008 UTC

  Modified files:  
/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.27&r2=1.28&diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.27 php-src/scripts/phpize.m4:1.28
--- php-src/scripts/phpize.m4:1.27  Fri Jul 25 12:34:55 2008
+++ php-src/scripts/phpize.m4   Sun Jul 27 20:48:26 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

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

2007-08-14 Thread Jani Taskinen 
janiTue Aug 14 08:43:13 2007 UTC

  Modified files:  
/php-src/scriptsphpize.m4 
  Log:
  - Fix bug #42292 ($PHP_CONFIG not set)
  
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.25&r2=1.26&diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.25 php-src/scripts/phpize.m4:1.26
--- php-src/scripts/phpize.m4:1.25  Mon Aug  6 14:33:06 2007
+++ php-src/scripts/phpize.m4   Tue Aug 14 08:43:13 2007
@@ -34,11 +34,13 @@
 PHP_ARG_WITH(php-config,,
 [  --with-php-config=PATH  Path to php-config [php-config]], php-config, no)
 
-prefix=`$PHP_PHP_CONFIG --prefix 2>/dev/null`
-phpincludedir=`$PHP_PHP_CONFIG --include-dir 2>/dev/null`
-INCLUDES=`$PHP_PHP_CONFIG --includes 2>/dev/null`
-EXTENSION_DIR=`$PHP_PHP_CONFIG --extension-dir 2>/dev/null`
-PHP_EXECUTABLE=`$PHP_PHP_CONFIG --php-binary 2>/dev/null`
+dnl For BC
+PHP_CONFIG=$PHP_PHP_CONFIG
+prefix=`$PHP_CONFIG --prefix 2>/dev/null`
+phpincludedir=`$PHP_CONFIG --include-dir 2>/dev/null`
+INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
+EXTENSION_DIR=`$PHP_CONFIG --extension-dir 2>/dev/null`
+PHP_EXECUTABLE=`$PHP_CONFIG --php-binary 2>/dev/null`
  
 if test -z "$prefix"; then
   AC_MSG_ERROR([Cannot find php-config. Please use --with-php-config=PATH])

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

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

2007-07-25 Thread Antony Dovgal 
tony2001Wed Jul 25 09:40:59 2007 UTC

  Modified files:  
/php-src/scriptsphpize.m4 
  Log:
  fix --with-php-config option
  
  
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.23&r2=1.24&diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.23 php-src/scripts/phpize.m4:1.24
--- php-src/scripts/phpize.m4:1.23  Wed Jul 18 15:04:08 2007
+++ php-src/scripts/phpize.m4   Wed Jul 25 09:40:58 2007
@@ -31,14 +31,14 @@
 PHP_SHLIB_SUFFIX_NAMES
 
 dnl Find php-config script
-PHP_ARG_WITH(config,,
+PHP_ARG_WITH(php-config,,
 [  --with-php-config=PATH  Path to php-config [php-config]], php-config, no)
 
-prefix=`$PHP_CONFIG --prefix 2>/dev/null`
-phpincludedir=`$PHP_CONFIG --include-dir 2>/dev/null`
-INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
-EXTENSION_DIR=`$PHP_CONFIG --extension-dir 2>/dev/null`
-PHP_EXECUTABLE=`$PHP_CONFIG --php-binary 2>/dev/null`
+prefix=`$PHP_PHP_CONFIG --prefix 2>/dev/null`
+phpincludedir=`$PHP_PHP_CONFIG --include-dir 2>/dev/null`
+INCLUDES=`$PHP_PHP_CONFIG --includes 2>/dev/null`
+EXTENSION_DIR=`$PHP_PHP_CONFIG --extension-dir 2>/dev/null`
+PHP_EXECUTABLE=`$PHP_PHP_CONFIG --php-binary 2>/dev/null`
  
 if test -z "$prefix"; then
   AC_MSG_ERROR([Cannot find php-config. Please use --with-php-config=PATH])

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

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

2007-07-18 Thread Jani Taskinen 
janiWed Jul 18 15:04:08 2007 UTC

  Modified files:  
/php-src/scriptsphpize.m4 
  Log:
  - Cleanup + removed PHP_SETUP_ICU call (has to be done per extension, not 
globally!)
  
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.22&r2=1.23&diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.22 php-src/scripts/phpize.m4:1.23
--- php-src/scripts/phpize.m4:1.22  Fri Jun  1 15:12:10 2007
+++ php-src/scripts/phpize.m4   Wed Jul 18 15:04:08 2007
@@ -7,37 +7,7 @@
 
 PHP_CONFIG_NICE(config.nice)
 
-AC_DEFUN([PHP_WITH_PHP_CONFIG],[
-  AC_ARG_WITH(php-config,
-[  --with-php-config=PATH],[
-  PHP_CONFIG=$withval
-],[
-  PHP_CONFIG=php-config
-])
-
-  prefix=`$PHP_CONFIG --prefix 2>/dev/null`
-  phpincludedir=`$PHP_CONFIG --include-dir 2>/dev/null`
-  INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
-  EXTENSION_DIR=`$PHP_CONFIG --extension-dir`
-  PHP_EXECUTABLE=`$PHP_CONFIG --php-binary`
- 
-  if test -z "$prefix"; then
-AC_MSG_ERROR(Cannot find php-config. Please use --with-php-config=PATH)
-  fi
-
-  php_shtool=$srcdir/build/shtool
-  PHP_INIT_BUILD_SYSTEM
-
-  AC_MSG_CHECKING(for PHP prefix)
-  AC_MSG_RESULT($prefix)
-  AC_MSG_CHECKING(for PHP includes)
-  AC_MSG_RESULT($INCLUDES)
-  AC_MSG_CHECKING(for PHP extension directory)
-  AC_MSG_RESULT($EXTENSION_DIR)
-  AC_MSG_CHECKING(for PHP installed headers prefix)
-  AC_MSG_RESULT($phpincludedir)
-])
-dnl
+dnl 
 AC_DEFUN([PHP_EXT_BUILDDIR],[.])dnl
 AC_DEFUN([PHP_EXT_DIR],[""])dnl
 AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir])dnl
@@ -54,23 +24,45 @@
 AC_PROG_CC_C_O
 
 dnl Support systems with system libraries in e.g. /usr/lib64
-AC_ARG_WITH(libdir,
-[  --with-libdir=NAME  Look for libraries in .../NAME rather than .../lib],
-[PHP_LIBDIR=$withval], [PHP_LIBDIR=lib])
+PHP_ARG_WITH(libdir, for system library directory,
+[  --with-libdir=NAME  Look for libraries in .../NAME rather than 
.../lib], lib, no)
 
 PHP_RUNPATH_SWITCH
 PHP_SHLIB_SUFFIX_NAMES
-PHP_WITH_PHP_CONFIG
 
-PHP_BUILD_SHARED
+dnl Find php-config script
+PHP_ARG_WITH(config,,
+[  --with-php-config=PATH  Path to php-config [php-config]], php-config, no)
+
+prefix=`$PHP_CONFIG --prefix 2>/dev/null`
+phpincludedir=`$PHP_CONFIG --include-dir 2>/dev/null`
+INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
+EXTENSION_DIR=`$PHP_CONFIG --extension-dir 2>/dev/null`
+PHP_EXECUTABLE=`$PHP_CONFIG --php-binary 2>/dev/null`
+ 
+if test -z "$prefix"; then
+  AC_MSG_ERROR([Cannot find php-config. Please use --with-php-config=PATH])
+fi
+
+php_shtool=$srcdir/build/shtool
+PHP_INIT_BUILD_SYSTEM
+
+AC_MSG_CHECKING([for PHP prefix])
+AC_MSG_RESULT([$prefix])
+AC_MSG_CHECKING([for PHP includes])
+AC_MSG_RESULT([$INCLUDES])
+AC_MSG_CHECKING([for PHP extension directory])
+AC_MSG_RESULT([$EXTENSION_DIR])
+AC_MSG_CHECKING([for PHP installed headers prefix])
+AC_MSG_RESULT([$phpincludedir])
 
-AC_PREFIX_DEFAULT()
+dnl Always shared
+PHP_BUILD_SHARED
 
+dnl Required programs
 PHP_PROG_RE2C
 PHP_PROG_AWK
 
-PHP_SETUP_ICU
-
 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 /scripts phpize.m4

2007-06-01 Thread Jani Taskinen 
sniper  Fri Jun  1 15:12:10 2007 UTC

  Modified files:  
/php-src/scriptsphpize.m4 
  Log:
  - Add missing CXXFLAGS_CLEAN variable.
  
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.21&r2=1.22&diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.21 php-src/scripts/phpize.m4:1.22
--- php-src/scripts/phpize.m4:1.21  Fri Jan 12 19:02:14 2007
+++ php-src/scripts/phpize.m4   Fri Jun  1 15:12:10 2007
@@ -83,6 +83,7 @@
 phplibdir="`pwd`/modules"
 CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H"
 CFLAGS_CLEAN='$(CFLAGS)'
+CXXFLAGS_CLEAN='$(CXXFLAGS)'
 
 test "$prefix" = "NONE" && prefix="/usr/local"
 test "$exec_prefix" = "NONE" && exec_prefix='$(prefix)'
@@ -105,6 +106,7 @@
 PHP_SUBST(CPPFLAGS)
 PHP_SUBST(CXX)
 PHP_SUBST(CXXFLAGS)
+PHP_SUBST(CXXFLAGS_CLEAN)
 PHP_SUBST(EXTENSION_DIR)
 PHP_SUBST(PHP_EXECUTABLE)
 PHP_SUBST(EXTRA_LDFLAGS)

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

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

2007-01-12 Thread Andrei Zmievski 
andrei  Fri Jan 12 19:02:14 2007 UTC

  Modified files:  
/php-src/scriptsphpize.m4 
  Log:
  Use PHP_SETUP_ICU in self-contained extensions
  
  
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.20&r2=1.21&diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.20 php-src/scripts/phpize.m4:1.21
--- php-src/scripts/phpize.m4:1.20  Mon Apr 10 12:16:08 2006
+++ php-src/scripts/phpize.m4   Fri Jan 12 19:02:14 2007
@@ -68,6 +68,8 @@
 
 PHP_PROG_RE2C
 PHP_PROG_AWK
+
+PHP_SETUP_ICU
 
 sinclude(config.m4)
 

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

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

2005-05-27 Thread Jani Taskinen 
sniper  Fri May 27 09:15:48 2005 EDT

  Modified files:  
/php-src/scriptsphpize.m4 
  Log:
  - Make sure EGREP and SED get set early enough.
  
http://cvs.php.net/diff.php/php-src/scripts/phpize.m4?r1=1.14&r2=1.15&ty=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.14 php-src/scripts/phpize.m4:1.15
--- php-src/scripts/phpize.m4:1.14  Fri May  6 22:51:53 2005
+++ php-src/scripts/phpize.m4   Fri May 27 09:15:47 2005
@@ -2,6 +2,8 @@
 
 AC_INIT(config.m4)
 
+PHP_CONFIG_NICE(config.nice)
+
 AC_DEFUN([PHP_WITH_PHP_CONFIG],[
   AC_ARG_WITH(php-config,
 [  --with-php-config=PATH],[
@@ -41,8 +43,6 @@
 abs_srcdir=`(cd $srcdir && pwd)`
 abs_builddir=`pwd`
 
-PHP_CONFIG_NICE(config.nice)
-
 AC_PROG_CC
 AC_PROG_CC_C_O
 

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

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

2005-03-17 Thread Jani Taskinen 
sniper  Thu Mar 17 03:16:51 2005 EDT

  Modified files:  
/php-src/scriptsphpize.m4 
  Log:
  Removed unused DEFS subst
  
http://cvs.php.net/diff.php/php-src/scripts/phpize.m4?r1=1.12&r2=1.13&ty=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.12 php-src/scripts/phpize.m4:1.13
--- php-src/scripts/phpize.m4:1.12  Fri Mar  4 09:34:24 2005
+++ php-src/scripts/phpize.m4   Thu Mar 17 03:16:51 2005
@@ -93,7 +93,6 @@
 PHP_SUBST(CPPFLAGS)
 PHP_SUBST(CXX)
 PHP_SUBST(CXXFLAGS)
-PHP_SUBST(DEFS)
 PHP_SUBST(EXTENSION_DIR)
 PHP_SUBST(EXTRA_LDFLAGS)
 PHP_SUBST(EXTRA_LIBS)

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

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

2005-03-04 Thread Jani Taskinen 
sniper  Fri Mar  4 09:34:25 2005 EDT

  Modified files:  
/php-src/scriptsphpize.m4 
  Log:
  Add missing subst
  
http://cvs.php.net/diff.php/php-src/scripts/phpize.m4?r1=1.11&r2=1.12&ty=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.11 php-src/scripts/phpize.m4:1.12
--- php-src/scripts/phpize.m4:1.11  Thu Feb 24 13:11:36 2005
+++ php-src/scripts/phpize.m4   Fri Mar  4 09:34:24 2005
@@ -92,6 +92,7 @@
 PHP_SUBST(CPP)
 PHP_SUBST(CPPFLAGS)
 PHP_SUBST(CXX)
+PHP_SUBST(CXXFLAGS)
 PHP_SUBST(DEFS)
 PHP_SUBST(EXTENSION_DIR)
 PHP_SUBST(EXTRA_LDFLAGS)

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

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

2005-01-19 Thread Jani Taskinen 
sniper  Wed Jan 19 19:54:19 2005 EDT

  Modified files:  
/php-src/scriptsphpize.m4 
  Log:
  - Add --with-libdir to phpized builds too
  
http://cvs.php.net/diff.php/php-src/scripts/phpize.m4?r1=1.9&r2=1.10&ty=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.9 php-src/scripts/phpize.m4:1.10
--- php-src/scripts/phpize.m4:1.9   Fri Jan  7 01:12:42 2005
+++ php-src/scripts/phpize.m4   Wed Jan 19 19:54:18 2005
@@ -44,6 +44,11 @@
 AC_PROG_CC
 AC_PROG_CC_C_O
 
+dnl Support systems with system libraries in e.g. /usr/lib64
+AC_ARG_WITH(libdir,
+[  --with-libdir=NAME  Look for libraries in .../NAME rather than .../lib],
+[PHP_LIBDIR=$withval], [PHP_LIBDIR=lib])
+
 PHP_RUNPATH_SWITCH
 PHP_SHLIB_SUFFIX_NAME
 PHP_WITH_PHP_CONFIG

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

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

2003-09-03 Thread Sascha Schumann 
sas Wed Sep  3 04:08:13 2003 EDT

  Modified files:  
/php-src/scriptsphpize.m4 
  Log:
  centralize cflags
  
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.6 php-src/scripts/phpize.m4:1.7
--- php-src/scripts/phpize.m4:1.6   Tue Sep  2 15:42:17 2003
+++ php-src/scripts/phpize.m4   Wed Sep  3 04:08:12 2003
@@ -68,7 +68,7 @@
 install_targets=install-modules
 phplibdir="`pwd`/modules"
 CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H"
-CFLAGS_CLEAN=$CFLAGS
+CFLAGS_CLEAN='$(CFLAGS)'
 
 test "$prefix" = "NONE" && prefix="/usr/local"
 test "$exec_prefix" = "NONE" && exec_prefix='$(prefix)'

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

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

2003-09-02 Thread Sascha Schumann 
sas Tue Sep  2 15:34:28 2003 EDT

  Modified files:  
/php-src/scriptsphpize.m4 
  Log:
  provide RE2C to external extensions
  
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.4 php-src/scripts/phpize.m4:1.5
--- php-src/scripts/phpize.m4:1.4   Tue Aug  5 07:19:13 2003
+++ php-src/scripts/phpize.m4   Tue Sep  2 15:34:27 2003
@@ -102,6 +102,7 @@
 PHP_SUBST(LIBTOOL)
 PHP_SUBST(SHELL)
 PHP_SUBST(AWK)
+PHP_SUBST(RE2C)
 
 PHP_GEN_BUILD_DIRS
 PHP_GEN_GLOBAL_MAKEFILE

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

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

2003-08-10 Thread Jani Taskinen 
sniper  Tue Aug  5 07:19:13 2003 EDT

  Modified files:  
/php-src/scriptsphpize.m4 
  Log:
  $host_* vars are used in extension config.m4s too.
  
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.3 php-src/scripts/phpize.m4:1.4
--- php-src/scripts/phpize.m4:1.3   Tue Jun 24 10:05:24 2003
+++ php-src/scripts/phpize.m4   Tue Aug  5 07:19:13 2003
@@ -2,6 +2,8 @@
 
 AC_INIT(config.m4)
 
+AC_CANONICAL_HOST
+
 PHP_INIT_BUILD_SYSTEM
 
 AC_DEFUN(PHP_WITH_PHP_CONFIG,[



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