[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in

2009-02-11 Thread Antony Dovgal 
tony2001Wed Feb 11 09:11:35 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
  Log:
  MFH: fix check for zend_extension type
  
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.125r2=1.579.2.52.2.126diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.125 
php-src/configure.in:1.579.2.52.2.126
--- php-src/configure.in:1.579.2.52.2.125   Wed Feb 11 00:08:44 2009
+++ php-src/configure.inWed Feb 11 09:11:35 2009
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.125 2009/02/11 00:08:44 scottmac Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.126 2009/02/11 09:11:35 tony2001 Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -1284,9 +1284,9 @@
   CPPFLAGS=$CPPFLAGS -DTHREAD=1
 fi
 
-if test $PHP_DEBUG = yes  test $PHP_THREAD_SAFETY = yes; then
+if test $PHP_DEBUG = 1  test $PHP_THREAD_SAFETY = yes; then
   ZEND_EXT_TYPE=zend_extension_debug_ts
-elif test $PHP_DEBUG = yes; then
+elif test $PHP_DEBUG = 1; then
   ZEND_EXT_TYPE=zend_extension_debug
 elif test $PHP_THREAD_SAFETY = yes; then
   ZEND_EXT_TYPE=zend_extension_ts



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

[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in

2009-02-10 Thread Scott MacVicar 
scottmacWed Feb 11 00:08:44 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
  Log:
  MFH Fix debug builds for OSX, PHP_DEBUG is set to 1 at the top
  
  
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.124r2=1.579.2.52.2.125diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.124 
php-src/configure.in:1.579.2.52.2.125
--- php-src/configure.in:1.579.2.52.2.124   Thu Feb  5 20:56:12 2009
+++ php-src/configure.inWed Feb 11 00:08:44 2009
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.124 2009/02/05 20:56:12 iliaa Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.125 2009/02/11 00:08:44 scottmac Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -1329,7 +1329,7 @@
 
 dnl Finish the Darwin hack
 if test $php_did_darwin9_cheat -eq 1; then
-  if test $PHP_DEBUG = yes; then
+  if test $PHP_DEBUG = 1; then
 CFLAGS=`echo $CFLAGS | $SED -e 's/-gstabs/-g/g'`
   else
 CFLAGS=`echo -O2 $CFLAGS | $SED -e 's/-gstabs//g'`



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

[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in /main spprintf.c

2009-02-04 Thread Ilia Alshanetsky 
iliaa   Wed Feb  4 15:03:12 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
/php-src/main   spprintf.c 
  Log:
  
  Syn spprintf fix with that of 5.3 and above
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.121r2=1.579.2.52.2.122diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.121 
php-src/configure.in:1.579.2.52.2.122
--- php-src/configure.in:1.579.2.52.2.121   Sun Feb  1 21:52:32 2009
+++ php-src/configure.inWed Feb  4 15:03:11 2009
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.121 2009/02/01 21:52:32 dsp Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.122 2009/02/04 15:03:11 iliaa Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -579,6 +579,7 @@
 strdup \
 strerror \
 strftime \
+strnlen \
 strptime \
 strstr \
 strtok_r \
http://cvs.php.net/viewvc.cgi/php-src/main/spprintf.c?r1=1.25.2.2.2.14r2=1.25.2.2.2.15diff_format=u
Index: php-src/main/spprintf.c
diff -u php-src/main/spprintf.c:1.25.2.2.2.14 
php-src/main/spprintf.c:1.25.2.2.2.15
--- php-src/main/spprintf.c:1.25.2.2.2.14   Sun Feb  1 19:42:48 2009
+++ php-src/main/spprintf.c Wed Feb  4 15:03:12 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: spprintf.c,v 1.25.2.2.2.14 2009/02/01 19:42:48 iliaa Exp $ */
+/* $Id: spprintf.c,v 1.25.2.2.2.15 2009/02/04 15:03:12 iliaa Exp $ */
 
 /* This is the spprintf implementation.
  * It has emerged from apache snprintf. See original header:
@@ -180,6 +180,13 @@
 
 /* }}} */
 
+#if !HAVE_STRNLEN
+static size_t strnlen(const char *s, size_t maxlen) {
+   char *r = memchr(s, '\0', maxlen);
+   return r ? r-s : maxlen;
+}
+#endif
+
 /*
  * Do format conversion placing the output in buffer
  */
@@ -547,10 +554,10 @@
case 'v':
s = va_arg(ap, char *);
if (s != NULL) {
-   if (adjust_precision  
precision) {
-   s_len = precision;
-   } else {
+   if (!adjust_precision) {
s_len = strlen(s);
+   } else {
+   s_len = strnlen(s, 
precision);
}
} else {
s = S_NULL;



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

[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in

2009-02-01 Thread David Soria Parra 
dsp Sun Feb  1 21:52:32 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
  Log:
  MFH: Fix a typo
  
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.120r2=1.579.2.52.2.121diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.120 
php-src/configure.in:1.579.2.52.2.121
--- php-src/configure.in:1.579.2.52.2.120   Sun Dec  7 19:28:01 2008
+++ php-src/configure.inSun Feb  1 21:52:32 2009
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.120 2008/12/07 19:28:01 iliaa Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.121 2009/02/01 21:52:32 dsp Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -1283,11 +1283,11 @@
   CPPFLAGS=$CPPFLAGS -DTHREAD=1
 fi
 
-if test $PHP_DEBUG = yes  test $PHP_THREAD_SAFETY = yes; then
+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
+elif test $PHP_THREAD_SAFETY = yes; then
   ZEND_EXT_TYPE=zend_extension_ts
 else
   ZEND_EXT_TYPE=zend_extension



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

[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in

2008-07-29 Thread Antony Dovgal 
tony2001Tue Jul 29 08:33:52 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
  Log:
  this shouldn't have been backported
  
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.103r2=1.579.2.52.2.104diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.103 
php-src/configure.in:1.579.2.52.2.104
--- php-src/configure.in:1.579.2.52.2.103   Sun Jul 27 15:05:48 2008
+++ php-src/configure.inTue Jul 29 08:33:52 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.103 2008/07/27 15:05:48 jani Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.104 2008/07/29 08:33:52 tony2001 Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -189,21 +189,6 @@
 ;;
 esac
 
-dnl activate some gcc specific optimizations for gcc = 4
-if test $GCC = yes; then
-  case $host_alias in
-  *darwin*)
-GCC_MAJOR_VERSION=`$CC -dumpversion | /usr/bin/sed -nE 
'1s/([[0-9]]+)\.[[0-9]]+\..*/\1/;1p'`
-;;
-  *)
-GCC_MAJOR_VERSION=`$CC --version | $SED -n '1s/[[^0-9]]*//;1s/\..*//;1p'`
-;;
-  esac
-  if test $GCC_MAJOR_VERSION -ge 4; then
-CFLAGS=$CFLAGS -fvisibility=hidden
-  fi
-fi
-
 case $host_alias in
   *solaris*)
 CPPFLAGS=$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS



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

Re: [PHP-CVS] cvs: php-src(PHP_5_2) / configure.in

2008-07-27 Thread Jani Taskinen 

Jani Taskinen kirjoitti:

janiSun Jul 27 15:05:48 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src	configure.in 
  Log:

  MFH:- Fixed the fix for not requiring C++ always
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.102r2=1.579.2.52.2.103diff_format=u

Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.102 
php-src/configure.in:1.579.2.52.2.103
--- php-src/configure.in:1.579.2.52.2.102   Sun Jul 27 15:01:41 2008
+++ php-src/configure.inSun Jul 27 15:05:48 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.102 2008/07/27 15:01:41 jani Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.103 2008/07/27 15:05:48 jani Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)

@@ -1312,7 +1312,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])
 ])


This php_prog_cxxcpp is just a dummy line to have something in the generated 
configure betwee then and fi :)


--Jani



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

[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in

2008-07-27 Thread Jani Taskinen 
janiSun Jul 27 15:05:48 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
  Log:
  MFH:- Fixed the fix for not requiring C++ always
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.102r2=1.579.2.52.2.103diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.102 
php-src/configure.in:1.579.2.52.2.103
--- php-src/configure.in:1.579.2.52.2.102   Sun Jul 27 15:01:41 2008
+++ php-src/configure.inSun Jul 27 15:05:48 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.102 2008/07/27 15:01:41 jani Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.103 2008/07/27 15:05:48 jani Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -1312,7 +1312,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(PHP_5_2) / configure.in

2008-07-27 Thread Jani Taskinen 
janiSun Jul 27 15:01:41 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
  Log:
  MFH: Partial sync
  http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.101r2=1.579.2.52.2.102diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.101 
php-src/configure.in:1.579.2.52.2.102
--- php-src/configure.in:1.579.2.52.2.101   Fri Jul 25 12:36:59 2008
+++ php-src/configure.inSun Jul 27 15:01:41 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.101 2008/07/25 12:36:59 jani Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.102 2008/07/27 15:01:41 jani Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -11,8 +11,8 @@
 dnl ## libraries and so on.
 
 dnl ## In diversion 3 we check for compile-time options to the PHP
-dnl ## core and how to deal with different system dependencies.  This
-dnl ## includes what regex library is used and whether debugging or short
+dnl ## core and how to deal with different system dependencies.
+dnl ## This includes what regex library is used and whether debugging or short
 dnl ## tags are enabled, and the default behaviour of php.ini options.
 dnl ## This is also where an SAPI interface is selected (choosing between
 dnl ## Apache module, CGI etc.)
@@ -71,10 +71,10 @@
 echo #define PHP_VERSION_ID $PHP_VERSION_ID  php_version.h.new
 cmp php_version.h.new $srcdir/main/php_version.h /dev/null 21
 if test $? -ne 0 ; then
-rm -f $srcdir/main/php_version.h  mv php_version.h.new 
$srcdir/main/php_version.h  \
-echo 'Updated main/php_version.h'
+  rm -f $srcdir/main/php_version.h  mv php_version.h.new 
$srcdir/main/php_version.h  \
+  echo 'Updated main/php_version.h'
 else
-rm -f php_version.h.new
+  rm -f php_version.h.new
 fi
 
 
@@ -122,6 +122,21 @@
 $php_shtool mkdir -p libs
 rm -f libs/*
 
+dnl Darwin 9 hack
+dnl Because the default debugging format used by Apple's GCC on Mac OS 10.5
+dnl causes errors in all current and past versions of Autoconf, we do a little
+dnl messing with the CFLAGS here to trick it.
+php_did_darwin9_cheat=0
+case $host_alias in
+*darwin9*)
+  hasg=`echo $CFLAGS | grep -E '(^-g)|([[:space:]]-g)'`
+  if test x$hasg = x; then
+php_did_darwin9_cheat=1
+CFLAGS=$CFLAGS -gstabs
+  fi
+  ;;
+esac
+
 dnl Checks for programs.
 dnl -
 
@@ -146,10 +161,10 @@
 PHP_RUNPATH_SWITCH
 
 dnl Checks for some support/generator progs
-PHP_PROG_RE2C
 PHP_PROG_AWK
 PHP_PROG_BISON
 PHP_PROG_LEX
+PHP_PROG_RE2C
 
 dnl Check if bison generated files exist when bison does not..
 case $php_cv_bison_version in
@@ -165,7 +180,7 @@
 
 dnl See bug #28605
 case $host_cpu in
-alpha*)
+  alpha*)
 if test $GCC = yes; then
   CFLAGS=$CFLAGS -mieee
 else
@@ -174,16 +189,32 @@
 ;;
 esac
 
+dnl activate some gcc specific optimizations for gcc = 4
+if test $GCC = yes; then
+  case $host_alias in
+  *darwin*)
+GCC_MAJOR_VERSION=`$CC -dumpversion | /usr/bin/sed -nE 
'1s/([[0-9]]+)\.[[0-9]]+\..*/\1/;1p'`
+;;
+  *)
+GCC_MAJOR_VERSION=`$CC --version | $SED -n '1s/[[^0-9]]*//;1s/\..*//;1p'`
+;;
+  esac
+  if test $GCC_MAJOR_VERSION -ge 4; then
+CFLAGS=$CFLAGS -fvisibility=hidden
+  fi
+fi
+
 case $host_alias in
-*solaris*)
+  *solaris*)
 CPPFLAGS=$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS
 if test ${enable_libgcc+set} != set  test $GCC = yes; then
   enable_libgcc=yes
 fi
 ;;
-*dgux*)
-CPPFLAGS=$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR;;
-*darwin*|*rhapsody*)
+  *dgux*)
+CPPFLAGS=$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR
+;;
+  *darwin*|*rhapsody*)
 if test -n $GCC; then
   PHP_CHECK_GCC_ARG(-no-cpp-precomp, gcc_no_cpp_precomp=yes)
   if test $gcc_no_cpp_precomp = yes; then
@@ -191,18 +222,21 @@
   fi
 fi
 AC_DEFINE(BIND_8_COMPAT, 1, [Enabling BIND8 compatibility for Panther])
-php_multiple_shlib_versions_ok=yes;;
-*beos*)
+php_multiple_shlib_versions_ok=yes
+;;
+  *beos*)
 beos_threads=1
-LIBS=$LIBS -lbe -lroot;;
-*mips*)
-CPPFLAGS=$CPPFLAGS -D_XPG_IV;;
-*hpux*)
+LIBS=$LIBS -lbe -lroot
+;;
+  *mips*)
+CPPFLAGS=$CPPFLAGS -D_XPG_IV
+;;
+  *hpux*)
 if test $GCC = yes; then
   CPPFLAGS=$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED
 fi
 ;;
-*netware*)
+  *netware*)
 PHP_BUILD_PROGRAM
 PHP_ADD_SOURCES(/main, internal_functions.c,,PHP_GLOBAL_OBJS)
 PHP_ADD_SOURCES(win32, sendmail.c, -I$CFLAGS, PHP_GLOBAL_OBJS)
@@ -217,7 +251,7 @@
 # to avoid the performance hit from the lost register
 AC_MSG_CHECKING([whether to force non-PIC code in shared modules])
 case $host_alias in
-i?86-*-linux*|i?86-*-freebsd*)
+  i?86-*-linux*|i?86-*-freebsd*)
 if test ${with_pic+set} != set || test $with_pic = no; then
   with_pic=no
   AC_MSG_RESULT(yes)
@@ -225,7 +259,9 @@
   AC_MSG_RESULT(no)
 fi
 ;;
-*)

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

2008-07-25 Thread Jani Taskinen 
janiFri Jul 25 12:36:59 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
/php-src/scriptsphpize.m4 
  Log:
  MFH: Fixed a minor problem in not enabling c++/g++ when not needed.
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.100r2=1.579.2.52.2.101diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.100 
php-src/configure.in:1.579.2.52.2.101
--- php-src/configure.in:1.579.2.52.2.100   Wed Jul 16 16:30:04 2008
+++ php-src/configure.inFri Jul 25 12:36:59 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.100 2008/07/16 16:30:04 jani Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.101 2008/07/25 12:36:59 jani Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -1259,10 +1259,14 @@
 
 LDFLAGS=$LDFLAGS $PHP_AIX_LDFLAGS
 
-dnl Only allow AC_PROG_CXX if it's explicitly called (by PHP_REQUIRE_CXX)
-dnl otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler
-AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [AC_PROG_CXX], [undefine([AC_PROG_CXX])
-AC_DEFUN([AC_PROG_CXX], [])])
+dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called 
(by PHP_REQUIRE_CXX).
+dnl Otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler.
+AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], [
+  undefine([AC_PROG_CXX])
+  AC_DEFUN([AC_PROG_CXX], [])
+  undefine([AC_PROG_CXXCPP])
+  AC_DEFUN([AC_PROG_CXXCPP], [])
+])
 AC_PROG_LIBTOOL
 
 if test $enable_debug != yes; then
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.17.2.3.2.5r2=1.17.2.3.2.6diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.17.2.3.2.5 
php-src/scripts/phpize.m4:1.17.2.3.2.6
--- php-src/scripts/phpize.m4:1.17.2.3.2.5  Tue Aug 14 08:43:41 2007
+++ php-src/scripts/phpize.m4   Fri Jul 25 12:36:59 2008
@@ -70,10 +70,14 @@
 enable_static=no
 enable_shared=yes
 
-dnl Only allow AC_PROG_CXX if it's explicitly called (by PHP_REQUIRE_CXX)
-dnl otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler
-AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [AC_PROG_CXX], [undefine([AC_PROG_CXX])
-AC_DEFUN([AC_PROG_CXX], [])])
+dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called 
(by PHP_REQUIRE_CXX).
+dnl Otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler.
+AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], [
+  undefine([AC_PROG_CXX])
+  AC_DEFUN([AC_PROG_CXX], [])
+  undefine([AC_PROG_CXXCPP])
+  AC_DEFUN([AC_PROG_CXXCPP], [])
+])
 AC_PROG_LIBTOOL
 
 all_targets='$(PHP_MODULES)'



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

[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in

2008-07-16 Thread Jani Taskinen 
janiWed Jul 16 16:24:00 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
  Log:
  MFH:- Prevent errors in CVS builds when bison is not there (for Sean :)
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.98r2=1.579.2.52.2.99diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.98 
php-src/configure.in:1.579.2.52.2.99
--- php-src/configure.in:1.579.2.52.2.98Wed Apr 30 18:33:33 2008
+++ php-src/configure.inWed Jul 16 16:23:59 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.98 2008/04/30 18:33:33 iliaa Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.99 2008/07/16 16:23:59 jani Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -151,6 +151,15 @@
 PHP_PROG_BISON
 PHP_PROG_LEX
 
+dnl Check if bison generated files exist when bison does not..
+case $php_cv_bison_version in
+  |invalid[)]
+if ! test -f $abs_srcdir/Zend/zend_language_parser.h || ! test -f 
$abs_srcdir/Zend/zend_language_parser.c ; then
+  AC_MSG_ERROR([bison is required to build PHP/Zend when building a CVS 
checkout!])
+fi
+;;
+esac
+
 dnl Platform-specific compile settings.
 dnl -
 



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

[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in

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

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
  Log:
  -nuke weird char
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.99r2=1.579.2.52.2.100diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.99 
php-src/configure.in:1.579.2.52.2.100
--- php-src/configure.in:1.579.2.52.2.99Wed Jul 16 16:23:59 2008
+++ php-src/configure.inWed Jul 16 16:30:04 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.99 2008/07/16 16:23:59 jani Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.100 2008/07/16 16:30:04 jani Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -154,7 +154,7 @@
 dnl Check if bison generated files exist when bison does not..
 case $php_cv_bison_version in
   |invalid[)]
-if ! test -f $abs_srcdir/Zend/zend_language_parser.h || ! test -f 
$abs_srcdir/Zend/zend_language_parser.c ; then
+if ! test -f $abs_srcdir/Zend/zend_language_parser.h || ! test -f 
$abs_srcdir/Zend/zend_language_parser.c ; then
   AC_MSG_ERROR([bison is required to build PHP/Zend when building a CVS 
checkout!])
 fi
 ;;



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

[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in

2008-04-04 Thread Derick Rethans 
derick  Fri Apr  4 07:26:41 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
  Log:
  - Fixed typo.
  
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.93r2=1.579.2.52.2.94diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.93 
php-src/configure.in:1.579.2.52.2.94
--- php-src/configure.in:1.579.2.52.2.93Fri Apr  4 00:16:53 2008
+++ php-src/configure.inFri Apr  4 07:26:41 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.93 2008/04/04 00:16:53 iliaa Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.94 2008/04/04 07:26:41 derick Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -42,7 +42,7 @@
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=2
 PHP_RELEASE_VERSION=6
-PHP_EXTRA_VERSION=RC4-dev
+PHP_EXTRA_VERSION=RC5-dev
 
PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`
 



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

[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in /main php_version.h

2008-02-28 Thread Ilia Alshanetsky 
iliaa   Thu Feb 28 15:36:07 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
/php-src/main   php_version.h 
  Log:
  Set proper RC version (Thanks Hannes)
  
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.86r2=1.579.2.52.2.87diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.86 
php-src/configure.in:1.579.2.52.2.87
--- php-src/configure.in:1.579.2.52.2.86Thu Feb 28 00:35:26 2008
+++ php-src/configure.inThu Feb 28 15:36:07 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.86 2008/02/28 00:35:26 iliaa Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.87 2008/02/28 15:36:07 iliaa Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -42,7 +42,7 @@
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=2
 PHP_RELEASE_VERSION=6
-PHP_EXTRA_VERSION=RC1-dev
+PHP_EXTRA_VERSION=RC2-dev
 
PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`
 
http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.58r2=1.112.2.37.2.59diff_format=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.112.2.37.2.58 
php-src/main/php_version.h:1.112.2.37.2.59
--- php-src/main/php_version.h:1.112.2.37.2.58  Thu Feb 28 00:35:26 2008
+++ php-src/main/php_version.h  Thu Feb 28 15:36:07 2008
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 2
 #define PHP_RELEASE_VERSION 6
-#define PHP_EXTRA_VERSION RC1-dev
-#define PHP_VERSION 5.2.6RC1-dev
+#define PHP_EXTRA_VERSION RC2-dev
+#define PHP_VERSION 5.2.6RC2-dev
 #define PHP_VERSION_ID 50206

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

[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in /main php_version.h

2008-02-27 Thread Ilia Alshanetsky 
iliaa   Thu Feb 28 00:30:35 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   php_version.h 
/php-srcconfigure.in 
  Log:
  5.2.6RC1
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.56r2=1.112.2.37.2.57diff_format=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.112.2.37.2.56 
php-src/main/php_version.h:1.112.2.37.2.57
--- php-src/main/php_version.h:1.112.2.37.2.56  Thu Nov  8 13:53:14 2007
+++ php-src/main/php_version.h  Thu Feb 28 00:30:34 2008
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 2
 #define PHP_RELEASE_VERSION 6
-#define PHP_EXTRA_VERSION -dev
-#define PHP_VERSION 5.2.6-dev
+#define PHP_EXTRA_VERSION RC1
+#define PHP_VERSION 5.2.6RC1
 #define PHP_VERSION_ID 50206
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.84r2=1.579.2.52.2.85diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.84 
php-src/configure.in:1.579.2.52.2.85
--- php-src/configure.in:1.579.2.52.2.84Thu Nov  8 13:53:13 2007
+++ php-src/configure.inThu Feb 28 00:30:35 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.84 2007/11/08 13:53:13 iliaa Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.85 2008/02/28 00:30:35 iliaa Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -42,7 +42,7 @@
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=2
 PHP_RELEASE_VERSION=6
-PHP_EXTRA_VERSION=-dev
+PHP_EXTRA_VERSION=RC1
 
PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`
 

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

Re: [PHP-CVS] cvs: php-src(PHP_5_2) / configure.in

2007-10-06 Thread Marcus Boerger 
Hello Nuno,

  do we still need to patch anything with 1.6?

marcus

Friday, October 5, 2007, 4:51:36 PM, you wrote:

 nlopess Fri Oct  5 14:51:36 2007 UTC

   Modified files:  (Branch: PHP_5_2)
 /php-srcconfigure.in 
   Log:
   allow lcov 1.6
   
 http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.77r2=1.579.2.52.2.78diff_format=u
 Index: php-src/configure.in
 diff -u php-src/configure.in:1.579.2.52.2.77 
 php-src/configure.in:1.579.2.52.2.78
 --- php-src/configure.in:1.579.2.52.2.77Thu Aug 30 07:40:13 2007
 +++ php-src/configure.inFri Oct  5 14:51:36 2007
 @@ -1,4 +1,4 @@
 -## $Id: configure.in,v 1.579.2.52.2.77 2007/08/30 07:40:13 sebastian Exp $ 
 -*- autoconf -*-
 +## $Id: configure.in,v 1.579.2.52.2.78 2007/10/05 14:51:36 nlopess Exp $ -*- 
 autoconf -*-
  dnl ## Process this file with autoconf to produce a configure script.
  
  divert(1)
 @@ -646,7 +646,7 @@
  AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is
 used. You can disable ccache by setting
 environment variable CCACHE_DISABLE=1.])
fi

 -  ltp_version_list=1.5
 +  ltp_version_list=1.5 1.6
  
AC_CHECK_PROG(LTP, lcov, lcov)
AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml)




Best regards,
 Marcus

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

[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in

2007-10-05 Thread Nuno Lopes 
nlopess Fri Oct  5 14:51:36 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
  Log:
  allow lcov 1.6
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.77r2=1.579.2.52.2.78diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.77 
php-src/configure.in:1.579.2.52.2.78
--- php-src/configure.in:1.579.2.52.2.77Thu Aug 30 07:40:13 2007
+++ php-src/configure.inFri Oct  5 14:51:36 2007
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.77 2007/08/30 07:40:13 sebastian Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.78 2007/10/05 14:51:36 nlopess Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -646,7 +646,7 @@
 AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. 
You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
   fi
   
-  ltp_version_list=1.5
+  ltp_version_list=1.5 1.6
 
   AC_CHECK_PROG(LTP, lcov, lcov)
   AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml)

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

[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in /main php_version.h

2007-08-23 Thread Ilia Alshanetsky 
iliaa   Thu Aug 23 22:53:52 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
/php-src/main   php_version.h 
  Log:
  
  Back to dev
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.74r2=1.579.2.52.2.75diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.74 
php-src/configure.in:1.579.2.52.2.75
--- php-src/configure.in:1.579.2.52.2.74Thu Aug 23 22:39:01 2007
+++ php-src/configure.inThu Aug 23 22:53:52 2007
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.74 2007/08/23 22:39:01 iliaa Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.75 2007/08/23 22:53:52 iliaa Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -42,7 +42,7 @@
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=2
 PHP_RELEASE_VERSION=4
-PHP_EXTRA_VERSION=RC3
+PHP_EXTRA_VERSION=RC4-dev
 
PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`
 
http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.47r2=1.112.2.37.2.48diff_format=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.112.2.37.2.47 
php-src/main/php_version.h:1.112.2.37.2.48
--- php-src/main/php_version.h:1.112.2.37.2.47  Thu Aug 23 22:39:02 2007
+++ php-src/main/php_version.h  Thu Aug 23 22:53:52 2007
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 2
 #define PHP_RELEASE_VERSION 4
-#define PHP_EXTRA_VERSION RC3
-#define PHP_VERSION 5.2.4RC3
+#define PHP_EXTRA_VERSION RC4-dev
+#define PHP_VERSION 5.2.4RC4-dev
 #define PHP_VERSION_ID 50204

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

[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in

2007-08-13 Thread Jani Taskinen 
janiMon Aug 13 20:13:19 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
  Log:
  - RC2 on the run
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.69r2=1.579.2.52.2.70diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.69 
php-src/configure.in:1.579.2.52.2.70
--- php-src/configure.in:1.579.2.52.2.69Mon Aug  6 14:33:51 2007
+++ php-src/configure.inMon Aug 13 20:13:19 2007
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.69 2007/08/06 14:33:51 jani Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.70 2007/08/13 20:13:19 jani Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -42,7 +42,7 @@
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=2
 PHP_RELEASE_VERSION=4
-PHP_EXTRA_VERSION=RC1-dev
+PHP_EXTRA_VERSION=RC2-dev
 
PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`
 

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

Re: [PHP-CVS] cvs: php-src(PHP_5_2) / configure.in /ext/odbc config.m4 /sapi/aolserver config.m4 /sapi/apache config.m4 /sapi/apache2filter config.m4 /sapi/apache2handler config.m4 /sapi/apache_

2007-07-12 Thread Derick Rethans 
On Wed, 11 Jul 2007, Jani Taskinen wrote:

 jani  Wed Jul 11 23:20:37 2007 UTC
 

   MFH: - Enabled PHP_CHECK_CONFIGURE_OPTIONS (checks for unknown configure
   MFH:   options)

Add this to the NEWS file? I am pretty sure people want to know about 
this as it's quite useful.

Derick

-- 
Derick Rethans
http://derickrethans.nl | http://ez.no | http://xdebug.org

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

Re: [PHP-CVS] cvs: php-src(PHP_5_2) / configure.in /ext/odbc config.m4 /sapi/aolserver config.m4 /sapi/apache config.m4 /sapi/apache2filter config.m4 /sapi/apache2handler config.m4 /sapi/apache_

2007-07-12 Thread Jani Taskinen 
On Thu, 2007-07-12 at 08:51 +0200, Derick Rethans wrote:
 On Wed, 11 Jul 2007, Jani Taskinen wrote:
 
  janiWed Jul 11 23:20:37 2007 UTC
  
 
MFH: - Enabled PHP_CHECK_CONFIGURE_OPTIONS (checks for unknown configure
MFH:   options)
 
 Add this to the NEWS file? I am pretty sure people want to know about 
 this as it's quite useful.

Okay..once I fix some issues with it I'll add NEWS entry. It's not
completed yet. Either I get some input from Marcus or he does it himself
so that ext/dba/config.m4 is also using the proper macros.. :D

--Jani

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

[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in

2007-07-12 Thread Jani Taskinen 
janiThu Jul 12 11:33:38 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
  Log:
  MFH: fix invalid logic + prevent non-integers to be passed
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.64r2=1.579.2.52.2.65diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.64 
php-src/configure.in:1.579.2.52.2.65
--- php-src/configure.in:1.579.2.52.2.64Wed Jul 11 23:20:36 2007
+++ php-src/configure.inThu Jul 12 11:33:37 2007
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.64 2007/07/11 23:20:36 jani Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.65 2007/07/12 11:33:37 jani Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -832,9 +832,13 @@
 PHP_ARG_ENABLE(fd-setsize,,
 [  --enable-fd-setsize Set size of descriptor sets], no, no)
 
-if test $PHP_FD_SETSIZE != yes; then
-  CPPFLAGS=$CPPFLAGS -DFD_SETSIZE=$PHP_FD_SETSIZE
-  AC_MSG_RESULT([using $PHP_FD_SETSIZE])
+if test $PHP_FD_SETSIZE != no; then
+  if test 0$PHP_FD_SETSIZE -gt 0 2/dev/null; then
+CPPFLAGS=$CPPFLAGS -DFD_SETSIZE=$PHP_FD_SETSIZE
+AC_MSG_RESULT([using $PHP_FD_SETSIZE])
+  else
+AC_MSG_ERROR([Invalid value passed to --enable-fd-setsize!])
+  fi
 else
   AC_MSG_RESULT([using system default])
 fi

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

[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in /ext/dom config.m4 /ext/gd config.m4 /ext/hash config.m4 /ext/interbase config.m4 /ext/json config.m4 /ext/libxml config0.m4 /ext/mbstring config.

2007-07-03 Thread Jani Taskinen 
sniper  Tue Jul  3 17:25:35 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
/php-src/ext/domconfig.m4 
/php-src/ext/gd config.m4 
/php-src/ext/hash   config.m4 
/php-src/ext/interbase  config.m4 
/php-src/ext/json   config.m4 
/php-src/ext/libxml config0.m4 
/php-src/ext/mbstring   config.m4 
/php-src/ext/mime_magic config.m4 
/php-src/ext/msql   config.m4 
/php-src/ext/mssql  config.m4 
/php-src/ext/mysqli config.m4 
/php-src/ext/oci8   config.m4 
/php-src/ext/odbc   config.m4 
/php-src/ext/pcre   config0.m4 
/php-src/ext/pdo_dblib  config.m4 
/php-src/ext/pdo_firebird   config.m4 
/php-src/ext/pdo_mysql  config.m4 
/php-src/ext/pdo_ociconfig.m4 
/php-src/ext/pdo_sqlite config.m4 
/php-src/ext/snmp   config.m4 
/php-src/ext/sqlite config.m4 
/php-src/ext/sybase config.m4 
/php-src/ext/sybase_ct  config.m4 
/php-src/ext/xslconfig.m4 
/php-src/ext/zipconfig.m4 
/php-src/sapi/cgi   config9.m4 
  Log:
  MFH: Fix some configure --help texts
  http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.60r2=1.579.2.52.2.61diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.60 
php-src/configure.in:1.579.2.52.2.61
--- php-src/configure.in:1.579.2.52.2.60Fri Jun 29 01:10:35 2007
+++ php-src/configure.inTue Jul  3 17:25:33 2007
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.52.2.60 2007/06/29 01:10:35 sniper Exp $ -*- 
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.52.2.61 2007/07/03 17:25:33 sniper Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -722,8 +722,7 @@
 
 PHP_ARG_WITH(config-file-path,[path to configuration file],
 [  --with-config-file-path=PATH
-  Set the path in which to look for php.ini
-  [PREFIX/lib]], DEFAULT, no)
+  Set the path in which to look for php.ini 
[PREFIX/lib]], DEFAULT, no)
 
 if test $PHP_CONFIG_FILE_PATH = DEFAULT; then
   case $PHP_LAYOUT in
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/config.m4?r1=1.20r2=1.20.4.1diff_format=u
Index: php-src/ext/dom/config.m4
diff -u php-src/ext/dom/config.m4:1.20 php-src/ext/dom/config.m4:1.20.4.1
--- php-src/ext/dom/config.m4:1.20  Sun May 29 23:16:40 2005
+++ php-src/ext/dom/config.m4   Tue Jul  3 17:25:33 2007
@@ -1,9 +1,9 @@
 dnl
-dnl $Id: config.m4,v 1.20 2005/05/29 23:16:40 sniper Exp $
+dnl $Id: config.m4,v 1.20.4.1 2007/07/03 17:25:33 sniper Exp $
 dnl
 
 PHP_ARG_ENABLE(dom, whether to enable DOM support,
-[  --disable-dom   Disable new DOM support], yes)
+[  --disable-dom   Disable DOM support], yes)
 
 if test -z $PHP_LIBXML_DIR; then
   PHP_ARG_WITH(libxml-dir, libxml2 install dir,
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.m4?r1=1.154.2.1.2.5r2=1.154.2.1.2.6diff_format=u
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.154.2.1.2.5 
php-src/ext/gd/config.m4:1.154.2.1.2.6
--- php-src/ext/gd/config.m4:1.154.2.1.2.5  Fri Jun  1 21:34:17 2007
+++ php-src/ext/gd/config.m4Tue Jul  3 17:25:33 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.154.2.1.2.5 2007/06/01 21:34:17 sniper Exp $
+dnl $Id: config.m4,v 1.154.2.1.2.6 2007/07/03 17:25:33 sniper Exp $
 dnl
 
 dnl
@@ -7,8 +7,8 @@
 dnl
 
 PHP_ARG_WITH(gd, for GD support,
-[  --with-gd[=DIR] Include GD support where DIR is GD install prefix.
-  If DIR is not set, the bundled GD library will be 
used])
+[  --with-gd[=DIR] Include GD support.  DIR is the GD library base
+  install directory [BUNDLED]])
 
 if test -z $PHP_JPEG_DIR; then
   PHP_ARG_WITH(jpeg-dir, for the location of libjpeg,
http://cvs.php.net/viewvc.cgi/php-src/ext/hash/config.m4?r1=1.10.2.4r2=1.10.2.4.2.1diff_format=u
Index: php-src/ext/hash/config.m4
diff -u php-src/ext/hash/config.m4:1.10.2.4 
php-src/ext/hash/config.m4:1.10.2.4.2.1
--- php-src/ext/hash/config.m4:1.10.2.4 Sun Feb 19 23:39:53 2006
+++ php-src/ext/hash/config.m4  Tue Jul  3 17:25:33 2007
@@ -1,8 +1,8 @@
-dnl $Id: config.m4,v 1.10.2.4 2006/02/19 23:39:53 mike Exp $
+dnl $Id: config.m4,v 1.10.2.4.2.1 2007/07/03 17:25:33 sniper Exp $
 dnl config.m4 for extension hash
 
 PHP_ARG_ENABLE(hash, whether to enable hash support,
-[  --disable-hash   Disable hash support], yes)
+[  --disable-hash  Disable hash support], yes)
 
 if test $PHP_HASH != no; then
   AC_DEFINE(HAVE_HASH_EXT,1,[Have HASH Extension])
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/config.m4?r1=1.20r2=1.20.6.1diff_format=u
Index: php-src/ext/interbase/config.m4
diff -u php-src/ext/interbase/config.m4:1.20 
php-src/ext/interbase/config.m4:1.20.6.1
--- php-src/ext/interbase/config.m4:1.20Wed May 12 14:29:42 2004
+++ php-src/ext/interbase/config.m4 Tue Jul  3

[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in

2007-06-25 Thread Dmitry Stogov 
dmitry  Mon Jun 25 14:22:49 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
  Log:
  Fixed stat() to support rdev, blocksize and blocks on Fedora 7
  
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.57r2=1.579.2.52.2.58diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.57 
php-src/configure.in:1.579.2.52.2.58
--- php-src/configure.in:1.579.2.52.2.57Wed May 30 18:48:58 2007
+++ php-src/configure.inMon Jun 25 14:22:49 2007
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.52.2.57 2007/05/30 18:48:58 iliaa Exp $ -*- 
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.52.2.58 2007/06/25 14:22:49 dmitry Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -373,6 +373,7 @@
 sys/resource.h \
 sys/select.h \
 sys/socket.h \
+sys/stat.h \
 sys/statfs.h \
 sys/statvfs.h \
 sys/vfs.h \

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

[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in /sapi/cgi config9.m4

2007-05-21 Thread Dmitry Stogov 
dmitry  Mon May 21 08:47:51 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
/php-src/sapi/cgi   config9.m4 
  Log:
  libfcgi cleanup (Andrei Nigmatulin)
  
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.50r2=1.579.2.52.2.51diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.50 
php-src/configure.in:1.579.2.52.2.51
--- php-src/configure.in:1.579.2.52.2.50Thu May  3 01:16:50 2007
+++ php-src/configure.inMon May 21 08:47:51 2007
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.52.2.50 2007/05/03 01:16:50 iliaa Exp $ -*- 
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.52.2.51 2007/05/21 08:47:51 dmitry Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -260,12 +260,6 @@
   PTHREADS_FLAGS
 fi
 
-if test $PHP_ENABLE_FASTCGI = yes; then
-  PHP_CONFIGURE_PART(Running FastCGI checks)
-  sinclude(sapi/cgi/libfcgi/acinclude.m4)
-  sinclude(sapi/cgi/libfcgi/libfcgi.m4)
-fi
-
 divert(3)
 
 dnl ## In diversion 3 we check for compile-time options to the PHP
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/config9.m4?r1=1.17.2.2.2.2r2=1.17.2.2.2.3diff_format=u
Index: php-src/sapi/cgi/config9.m4
diff -u php-src/sapi/cgi/config9.m4:1.17.2.2.2.2 
php-src/sapi/cgi/config9.m4:1.17.2.2.2.3
--- php-src/sapi/cgi/config9.m4:1.17.2.2.2.2Tue Feb 20 20:11:11 2007
+++ php-src/sapi/cgi/config9.m4 Mon May 21 08:47:51 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config9.m4,v 1.17.2.2.2.2 2007/02/20 20:11:11 tony2001 Exp $
+dnl $Id: config9.m4,v 1.17.2.2.2.3 2007/05/21 08:47:51 dmitry Exp $
 dnl
 
 AC_ARG_ENABLE(cgi,
@@ -98,14 +98,11 @@
 if test $PHP_ENABLE_FASTCGI = yes; then
   PHP_FASTCGI=1
   PHP_FCGI_FILES=fastcgi.c
-  PHP_FCGI_STATIC=1
 else
   PHP_FASTCGI=0
   PHP_FCGI_FILES=
-  PHP_FCGI_STATIC=0
 fi
 AC_DEFINE_UNQUOTED(PHP_FASTCGI, $PHP_FASTCGI, [ ])
-AC_DEFINE_UNQUOTED(PHP_FCGI_STATIC, $PHP_FCGI_STATIC, [ ])
 AC_MSG_RESULT($PHP_ENABLE_FASTCGI)
 
 INSTALL_IT=@echo \Installing PHP CGI into: 
\$(INSTALL_ROOT)\$(bindir)/\; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) 
\$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)

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

[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in

2007-02-07 Thread Antony Dovgal 
tony2001Wed Feb  7 11:16:53 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
  Log:
  MFH: check if GCC on MacOS supports -no-cpp-precomp before using it
  
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.42r2=1.579.2.52.2.43diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.42 
php-src/configure.in:1.579.2.52.2.43
--- php-src/configure.in:1.579.2.52.2.42Wed Feb  7 01:01:37 2007
+++ php-src/configure.inWed Feb  7 11:16:52 2007
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.52.2.42 2007/02/07 01:01:37 iliaa Exp $ -*- 
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.52.2.43 2007/02/07 11:16:52 tony2001 Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -168,7 +168,12 @@
 *dgux*)
 CPPFLAGS=$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR;;
 *darwin*|*rhapsody*)
-CPPFLAGS=$CPPFLAGS -no-cpp-precomp
+if test -n $GCC; then
+  PHP_CHECK_GCC_ARG(-no-cpp-precomp, gcc_no_cpp_precomp=yes)
+  if test $gcc_no_cpp_precomp = yes; then
+CPPFLAGS=$CPPFLAGS -no-cpp-precomp
+  fi
+fi
 AC_DEFINE(BIND_8_COMPAT, 1, [Enabling BIND8 compatibility for Panther])
 php_multiple_shlib_versions_ok=yes;;
 *beos*)

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

[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in /main php_version.h

2007-01-25 Thread Ilia Alshanetsky 
iliaa   Fri Jan 26 00:21:20 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
/php-src/main   php_version.h 
  Log:
  
  Back to dev
  
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.39r2=1.579.2.52.2.40diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.39 
php-src/configure.in:1.579.2.52.2.40
--- php-src/configure.in:1.579.2.52.2.39Fri Jan 26 00:15:03 2007
+++ php-src/configure.inFri Jan 26 00:21:20 2007
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.52.2.39 2007/01/26 00:15:03 iliaa Exp $ -*- 
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.52.2.40 2007/01/26 00:21:20 iliaa Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -44,7 +44,7 @@
 MAJOR_VERSION=5
 MINOR_VERSION=2
 RELEASE_VERSION=1
-EXTRA_VERSION=RC4
+EXTRA_VERSION=RC5-dev
 PHP_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]MAJOR_VERSION \* 1 + [$]MINOR_VERSION \* 100 + 
[$]RELEASE_VERSION`
 
http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.24r2=1.112.2.37.2.25diff_format=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.112.2.37.2.24 
php-src/main/php_version.h:1.112.2.37.2.25
--- php-src/main/php_version.h:1.112.2.37.2.24  Fri Jan 26 00:15:03 2007
+++ php-src/main/php_version.h  Fri Jan 26 00:21:20 2007
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 2
 #define PHP_RELEASE_VERSION 1
-#define PHP_EXTRA_VERSION RC4
-#define PHP_VERSION 5.2.1RC4
+#define PHP_EXTRA_VERSION RC5-dev
+#define PHP_VERSION 5.2.1RC5-dev
 #define PHP_VERSION_ID 50201

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

[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in /main php_version.h

2006-12-14 Thread Ilia Alshanetsky 
iliaa   Fri Dec 15 01:22:35 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   php_version.h 
/php-srcconfigure.in 
  Log:
  back to dev
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.18r2=1.112.2.37.2.19diff_format=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.112.2.37.2.18 
php-src/main/php_version.h:1.112.2.37.2.19
--- php-src/main/php_version.h:1.112.2.37.2.18  Fri Dec 15 01:21:36 2006
+++ php-src/main/php_version.h  Fri Dec 15 01:22:35 2006
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 2
 #define PHP_RELEASE_VERSION 1
-#define PHP_EXTRA_VERSION RC1
-#define PHP_VERSION 5.2.1RC1
+#define PHP_EXTRA_VERSION RC2-dev
+#define PHP_VERSION 5.2.1RC2-dev
 #define PHP_VERSION_ID 50201
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.31r2=1.579.2.52.2.32diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.31 
php-src/configure.in:1.579.2.52.2.32
--- php-src/configure.in:1.579.2.52.2.31Fri Dec 15 01:21:36 2006
+++ php-src/configure.inFri Dec 15 01:22:35 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.52.2.31 2006/12/15 01:21:36 iliaa Exp $ -*- 
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.52.2.32 2006/12/15 01:22:35 iliaa Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -44,7 +44,7 @@
 MAJOR_VERSION=5
 MINOR_VERSION=2
 RELEASE_VERSION=1
-EXTRA_VERSION=RC1
+EXTRA_VERSION=RC2-dev
 PHP_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]MAJOR_VERSION \* 1 + [$]MINOR_VERSION \* 100 + 
[$]RELEASE_VERSION`
 

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

[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in /win32/build config.w32 ZendEngine2 Makefile.am Zend.dsp ZendTS.dsp zend_mm.c zend_mm.h

2006-12-05 Thread Dmitry Stogov 
dmitry  Tue Dec  5 08:07:57 2006 UTC

  Removed files:   (Branch: PHP_5_2)
/ZendEngine2zend_mm.c zend_mm.h 

  Modified files:  
/php-srcconfigure.in 
/ZendEngine2Makefile.am Zend.dsp ZendTS.dsp 
/php-src/win32/buildconfig.w32 
  Log:
  Removed unused zend_mm.*
  
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.28r2=1.579.2.52.2.29diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.28 
php-src/configure.in:1.579.2.52.2.29
--- php-src/configure.in:1.579.2.52.2.28Mon Dec  4 18:28:49 2006
+++ php-src/configure.inTue Dec  5 08:07:56 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.52.2.28 2006/12/04 18:28:49 tony2001 Exp $ -*- 
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.52.2.29 2006/12/05 08:07:56 dmitry Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -1334,7 +1334,7 @@
 zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c)
 
 if test -r $abs_srcdir/Zend/zend_objects.c; then
-  PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c 
zend_objects_API.c zend_mm.c \
+  PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c 
zend_objects_API.c \
 zend_default_classes.c)
 fi
 
http://cvs.php.net/viewvc.cgi/ZendEngine2/Makefile.am?r1=1.57.2.1r2=1.57.2.1.2.1diff_format=u
Index: ZendEngine2/Makefile.am
diff -u ZendEngine2/Makefile.am:1.57.2.1 ZendEngine2/Makefile.am:1.57.2.1.2.1
--- ZendEngine2/Makefile.am:1.57.2.1Wed Nov 30 21:46:26 2005
+++ ZendEngine2/Makefile.am Tue Dec  5 08:07:57 2006
@@ -14,7 +14,7 @@
zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
zend_ini.c zend_qsort.c zend_objects.c zend_object_handlers.c \
-   zend_objects_API.c zend_ts_hash.c zend_stream.c zend_mm.c \
+   zend_objects_API.c zend_ts_hash.c zend_stream.c \
zend_default_classes.c \
zend_iterators.c zend_interfaces.c zend_exceptions.c \
zend_strtod.c zend_multibyte.c
http://cvs.php.net/viewvc.cgi/ZendEngine2/Zend.dsp?r1=1.25.2.1r2=1.25.2.1.2.1diff_format=u
Index: ZendEngine2/Zend.dsp
diff -u ZendEngine2/Zend.dsp:1.25.2.1 ZendEngine2/Zend.dsp:1.25.2.1.2.1
--- ZendEngine2/Zend.dsp:1.25.2.1   Wed Nov 30 21:46:25 2005
+++ ZendEngine2/Zend.dspTue Dec  5 08:07:57 2006
@@ -195,10 +195,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\zend_mm.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_object_handlers.c
 # End Source File
 # Begin Source File
@@ -371,10 +367,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\zend_mm.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_modules.h
 # End Source File
 # Begin Source File
http://cvs.php.net/viewvc.cgi/ZendEngine2/ZendTS.dsp?r1=1.47.2.1.2.1r2=1.47.2.1.2.2diff_format=u
Index: ZendEngine2/ZendTS.dsp
diff -u ZendEngine2/ZendTS.dsp:1.47.2.1.2.1 ZendEngine2/ZendTS.dsp:1.47.2.1.2.2
--- ZendEngine2/ZendTS.dsp:1.47.2.1.2.1 Sun Jun  4 18:03:25 2006
+++ ZendEngine2/ZendTS.dsp  Tue Dec  5 08:07:57 2006
@@ -229,10 +229,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\zend_mm.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_object_handlers.c
 # End Source File
 # Begin Source File
@@ -409,10 +405,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\zend_mm.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_modules.h
 # End Source File
 # Begin Source File
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.4r2=1.40.2.8.2.5diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.8.2.4 
php-src/win32/build/config.w32:1.40.2.8.2.5
--- php-src/win32/build/config.w32:1.40.2.8.2.4 Tue Nov 14 14:20:26 2006
+++ php-src/win32/build/config.w32  Tue Dec  5 08:07:57 2006
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.40.2.8.2.4 2006/11/14 14:20:26 dmitry Exp $
+// $Id: config.w32,v 1.40.2.8.2.5 2006/12/05 08:07:57 dmitry Exp $
 // Master config file; think of it as a configure.in
 // equivalent.
 
@@ -258,7 +258,7 @@
zend_sprintf.c zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c \
zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \
zend_object_handlers.c zend_objects_API.c \
-   zend_mm.c zend_default_classes.c zend_execute.c zend_strtod.c);
+   zend_default_classes.c zend_execute.c zend_strtod.c);
 
 ADD_SOURCES(main, main.c snprintf.c spprintf.c safe_mode.c fopen_wrappers.c 
\
php_scandir.c php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \

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

[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in

2006-11-30 Thread Ilia Alshanetsky 
iliaa   Thu Nov 30 17:10:46 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
  Log:
  Added check for crypt_r()
  
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.26r2=1.579.2.52.2.27diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.26 
php-src/configure.in:1.579.2.52.2.27
--- php-src/configure.in:1.579.2.52.2.26Wed Nov 29 23:34:49 2006
+++ php-src/configure.inThu Nov 30 17:10:46 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.52.2.26 2006/11/29 23:34:49 iliaa Exp $ -*- 
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.52.2.27 2006/11/30 17:10:46 iliaa Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -466,6 +466,7 @@
 ctime_r \
 cuserid \
 crypt \
+crypt_r \
 flock \
 ftok \
 funopen \

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

[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in /main php_version.h

2006-10-20 Thread Ilia Alshanetsky 
iliaa   Fri Oct 20 13:15:36 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
/php-src/main   php_version.h 
  Log:
  Back to dev
  
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.22r2=1.579.2.52.2.23diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.22 
php-src/configure.in:1.579.2.52.2.23
--- php-src/configure.in:1.579.2.52.2.22Fri Oct 20 01:51:07 2006
+++ php-src/configure.inFri Oct 20 13:15:35 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.52.2.22 2006/10/20 01:51:07 iliaa Exp $ -*- 
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.52.2.23 2006/10/20 13:15:35 iliaa Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -44,7 +44,7 @@
 MAJOR_VERSION=5
 MINOR_VERSION=2
 RELEASE_VERSION=0
-EXTRA_VERSION=RC6
+EXTRA_VERSION=RC7-dev
 PHP_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]MAJOR_VERSION \* 1 + [$]MINOR_VERSION \* 100 + 
[$]RELEASE_VERSION`
 
http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.13r2=1.112.2.37.2.14diff_format=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.112.2.37.2.13 
php-src/main/php_version.h:1.112.2.37.2.14
--- php-src/main/php_version.h:1.112.2.37.2.13  Fri Oct 20 01:51:07 2006
+++ php-src/main/php_version.h  Fri Oct 20 13:15:35 2006
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 2
 #define PHP_RELEASE_VERSION 0
-#define PHP_EXTRA_VERSION RC6
-#define PHP_VERSION 5.2.0RC6
+#define PHP_EXTRA_VERSION RC7-dev
+#define PHP_VERSION 5.2.0RC7-dev
 #define PHP_VERSION_ID 50200

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

[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in

2006-09-25 Thread Antony Dovgal 
tony2001Mon Sep 25 11:05:49 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
  Log:
  MFH: change CXXFLAGS along with CFLAGS as there might be C++ code
  
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.18r2=1.579.2.52.2.19diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.18 
php-src/configure.in:1.579.2.52.2.19
--- php-src/configure.in:1.579.2.52.2.18Thu Sep 14 18:04:40 2006
+++ php-src/configure.inMon Sep 25 11:05:49 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.52.2.18 2006/09/14 18:04:40 iliaa Exp $ -*- 
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.52.2.19 2006/09/25 11:05:49 tony2001 Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -665,10 +665,12 @@
   dnl Remove all optimization flags from CFLAGS
   changequote({,})
   CFLAGS=`echo $CFLAGS | $SED -e 's/-O[0-9]*//g'`
+  CXXFLAGS=`echo $CXXFLAGS | $SED -e 's/-O[0-9]*//g'`
   changequote([,])
 
   dnl Add the special gcc flags
   CFLAGS=$CFLAGS -O0 -fprofile-arcs -ftest-coverage
+  CXXFLAGS=$CXXFLAGS -O0 -fprofile-arcs -ftest-coverage
 fi
 
 PHP_ARG_ENABLE(debug, whether to include debugging symbols,
@@ -679,8 +681,10 @@
   ZEND_DEBUG=yes
   changequote({,})
   CFLAGS=`echo $CFLAGS | $SED -e 's/-O[0-9]*//g'`
+  CXXFLAGS=`echo $CXXFLAGS | $SED -e 's/-O[0-9]*//g'`
   changequote([,])
   CFLAGS=$CFLAGS -O0
+  CXXFLAGS=$CXXFLAGS -O0
 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_2) / configure.in

2006-09-01 Thread Nuno Lopes 
nlopess Fri Sep  1 13:55:22 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
  Log:
  currently it's RC4-dev
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.15r2=1.579.2.52.2.16diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.15 
php-src/configure.in:1.579.2.52.2.16
--- php-src/configure.in:1.579.2.52.2.15Fri Sep  1 01:29:05 2006
+++ php-src/configure.inFri Sep  1 13:55:22 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.52.2.15 2006/09/01 01:29:05 iliaa Exp $ -*- 
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.52.2.16 2006/09/01 13:55:22 nlopess Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -44,7 +44,7 @@
 MAJOR_VERSION=5
 MINOR_VERSION=2
 RELEASE_VERSION=0
-EXTRA_VERSION=RC4
+EXTRA_VERSION=RC4-dev
 PHP_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]MAJOR_VERSION \* 1 + [$]MINOR_VERSION \* 100 + 
[$]RELEASE_VERSION`
 

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

[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in /main php_version.h

2006-08-17 Thread Ilia Alshanetsky 
iliaa   Thu Aug 17 13:44:36 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
/php-src/main   php_version.h 
  Log:
  5.2.0RC2
  
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.10r2=1.579.2.52.2.11diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.10 
php-src/configure.in:1.579.2.52.2.11
--- php-src/configure.in:1.579.2.52.2.10Tue Aug 15 20:13:47 2006
+++ php-src/configure.inThu Aug 17 13:44:36 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.52.2.10 2006/08/15 20:13:47 tony2001 Exp $ -*- 
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.52.2.11 2006/08/17 13:44:36 iliaa Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -44,7 +44,7 @@
 MAJOR_VERSION=5
 MINOR_VERSION=2
 RELEASE_VERSION=0
-EXTRA_VERSION=RC2-dev
+EXTRA_VERSION=RC2
 PHP_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]MAJOR_VERSION \* 1 + [$]MINOR_VERSION \* 100 + 
[$]RELEASE_VERSION`
 
http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.4r2=1.112.2.37.2.5diff_format=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.112.2.37.2.4 
php-src/main/php_version.h:1.112.2.37.2.5
--- php-src/main/php_version.h:1.112.2.37.2.4   Thu Jul 27 08:53:16 2006
+++ php-src/main/php_version.h  Thu Aug 17 13:44:36 2006
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 2
 #define PHP_RELEASE_VERSION 0
-#define PHP_EXTRA_VERSION RC2-dev
-#define PHP_VERSION 5.2.0RC2-dev
+#define PHP_EXTRA_VERSION RC2
+#define PHP_VERSION 5.2.0RC2
 #define PHP_VERSION_ID 50200

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

[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in

2006-08-06 Thread Antony Dovgal 
tony2001Sun Aug  6 20:46:02 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
  Log:
  use -O0 with --enable-debug
  
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.6r2=1.579.2.52.2.7diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.6 php-src/configure.in:1.579.2.52.2.7
--- php-src/configure.in:1.579.2.52.2.6 Thu Jul 27 08:53:16 2006
+++ php-src/configure.inSun Aug  6 20:46:02 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.52.2.6 2006/07/27 08:53:16 sniper Exp $ -*- 
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.52.2.7 2006/08/06 20:46:02 tony2001 Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -676,6 +676,10 @@
 if test $PHP_DEBUG = yes; then
   PHP_DEBUG=1
   ZEND_DEBUG=yes
+  changequote({,})
+  CFLAGS=`echo $CFLAGS | $SED -e 's/-O[0-9]*//g'`
+  changequote([,])
+  CFLAGS=$CFLAGS -O0
 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_2) / configure.in /sapi/cgi cgi_main.c

2006-06-17 Thread Nuno Lopes 
nlopess Sat Jun 17 11:08:05 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in 
/php-src/sapi/cgi   cgi_main.c 
  Log:
  plug memory leak in sapi_putenv, by using setenv(), that doesnt need any 
malloc
  
http://cvs.php.net/viewcvs.cgi/php-src/configure.in?r1=1.579.2.52.2.1r2=1.579.2.52.2.2diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.1 php-src/configure.in:1.579.2.52.2.2
--- php-src/configure.in:1.579.2.52.2.1 Sat May  6 21:58:03 2006
+++ php-src/configure.inSat Jun 17 11:08:05 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.52.2.1 2006/05/06 21:58:03 iliaa Exp $ -*- 
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.52.2.2 2006/06/17 11:08:05 nlopess Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -505,6 +505,7 @@
 setitimer \
 setlocale \
 localeconv \
+setenv \
 setpgid \
 setsockopt \
 setvbuf \
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.5r2=1.267.2.15.2.6diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.5 
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.6
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.5  Tue Jun 13 14:22:46 2006
+++ php-src/sapi/cgi/cgi_main.c Sat Jun 17 11:08:05 2006
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.267.2.15.2.5 2006/06/13 14:22:46 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.6 2006/06/17 11:08:05 nlopess Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -405,6 +405,18 @@
return fcgi_putenv(request, name, name_len, value);
}
 #endif
+#if HAVE_SETENV
+   if (value) {
+   setenv(name, value, 1);
+   }
+#endif
+#if HAVE_UNSETENV
+   if (!value) {
+   unsetenv(name);
+   }
+#endif
+
+#if !HAVE_SETENV || !HAVE_UNSETENV
/*  if cgi, or fastcgi and not found in fcgi env
check the regular environment 
this leaks, but it's only cgi anyway, we'll fix
@@ -415,12 +427,19 @@
if (buf == NULL) {
return getenv(name);
}
+#endif
+#if !HAVE_SETENV
if (value) {
len = snprintf(buf, len - 1, %s=%s, name, value);
-   } else {
+   putenv(buf);
+   }
+#endif
+#if !HAVE_UNSETENV
+   if (!value) {
len = snprintf(buf, len - 1, %s=, name);
+   putenv(buf);
}
-   putenv(buf);
+#endif
return getenv(name);
 }
 


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