Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/TSRM/acconfig.h branches/PHP_5_4/TSRM/build.mk branches/PHP_5_4/TSRM/configure.in branches/PHP_5_4/Zend/acconfig.h branches/PHP_5_4/Zend/build.mk bran

2011-05-18 Thread Johannes Schlüter
Hi,

On Tue, 2011-05-17 at 13:24 -0700, Rasmus Lerdorf wrote:
 It doesn't seem likely that an autoconf change could have caused this. 
 There were no code changes involved in that patch. Have you verified 
 that this broke it by isolating this change?

Indeed it wasn't autoconf.

The commit also included the change of the version number in
configure.in

-#define PHP_VERSION 5.3.99-dev
-#define PHP_VERSION_ID 50399
+#define PHP_VERSION 5.5.0-dev
+#define PHP_VERSION_ID 50500

mysqli includes a version check

#if PHP_VERSION_ID = 50400

which enabled broken code.

We're working on a proper fix for this.

johannes



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



Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/TSRM/acconfig.h branches/PHP_5_4/TSRM/build.mk branches/PHP_5_4/TSRM/configure.in branches/PHP_5_4/Zend/acconfig.h branches/PHP_5_4/Zend/build.mk bran

2011-05-18 Thread Rasmus Lerdorf

On 05/18/2011 02:25 AM, Johannes Schlüter wrote:

Hi,

On Tue, 2011-05-17 at 13:24 -0700, Rasmus Lerdorf wrote:

It doesn't seem likely that an autoconf change could have caused this.
There were no code changes involved in that patch. Have you verified
that this broke it by isolating this change?


Indeed it wasn't autoconf.

The commit also included the change of the version number in
configure.in

-#define PHP_VERSION 5.3.99-dev
-#define PHP_VERSION_ID 50399
+#define PHP_VERSION 5.5.0-dev
+#define PHP_VERSION_ID 50500

mysqli includes a version check

#if PHP_VERSION_ID= 50400

which enabled broken code.

We're working on a proper fix for this.


I thought you were testing the 5.4 branch.

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



[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/mysqli/mysqli_fe.c trunk/ext/mysqli/mysqli_fe.c

2011-05-18 Thread Johannes Schlüter
johannes Wed, 18 May 2011 10:21:28 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=311177

Log:
- Keep the old arginfo for now
# This change we would E_RECOVERABLE instead of E_WARNING
# and needs some more review, as well fixing ~80 tests

Changed paths:
U   php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_fe.c
U   php/php-src/trunk/ext/mysqli/mysqli_fe.c

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_fe.c
===
--- php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_fe.c 2011-05-18 10:09:02 UTC 
(rev 311176)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_fe.c 2011-05-18 10:21:28 UTC 
(rev 311177)
@@ -33,7 +33,7 @@
 #include mysqli_fe.h
 #include mysqli_priv.h

-#if PHP_VERSION_ID = 50400
+#ifdef MYSQLI_USE_FULL_TYPED_ARGINFO_0
 #define MYSQLI_ZEND_ARG_OBJ_INFO_LINK() ZEND_ARG_OBJ_INFO(0, link, mysqli, 0)
 #define MYSQLI_ZEND_ARG_OBJ_INFO_RESULT() ZEND_ARG_OBJ_INFO(0, result, 
mysqli_result, 0)
 #define MYSQLI_ZEND_ARG_OBJ_INFO_STMT() ZEND_ARG_OBJ_INFO(0, stmt, 
mysqli_stmt, 0)

Modified: php/php-src/trunk/ext/mysqli/mysqli_fe.c
===
--- php/php-src/trunk/ext/mysqli/mysqli_fe.c2011-05-18 10:09:02 UTC (rev 
311176)
+++ php/php-src/trunk/ext/mysqli/mysqli_fe.c2011-05-18 10:21:28 UTC (rev 
311177)
@@ -33,7 +33,7 @@
 #include mysqli_fe.h
 #include mysqli_priv.h

-#if PHP_VERSION_ID = 50400
+#ifdef MYSQLI_USE_FULL_TYPED_ARGINFO_0
 #define MYSQLI_ZEND_ARG_OBJ_INFO_LINK() ZEND_ARG_OBJ_INFO(0, link, mysqli, 0)
 #define MYSQLI_ZEND_ARG_OBJ_INFO_RESULT() ZEND_ARG_OBJ_INFO(0, result, 
mysqli_result, 0)
 #define MYSQLI_ZEND_ARG_OBJ_INFO_STMT() ZEND_ARG_OBJ_INFO(0, stmt, 
mysqli_stmt, 0)

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysql/php_mysql.c branches/PHP_5_4/ext/mysql/php_mysql.c trunk/ext/mysql/php_mysql.c

2011-05-18 Thread Johannes Schlüter
johannes Wed, 18 May 2011 11:49:49 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=311181

Log:
- handle out of memory

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c
U   php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c
U   php/php-src/trunk/ext/mysql/php_mysql.c

Modified: php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c
===
--- php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c  2011-05-18 11:33:55 UTC 
(rev 311180)
+++ php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c  2011-05-18 11:49:49 UTC 
(rev 311181)
@@ -830,6 +830,9 @@
}
/* create the link */
mysql = (php_mysql_conn *) 
malloc(sizeof(php_mysql_conn));
+   if (!mysql) {
+   php_error_docref(NULL TSRMLS_CC, E_ERROR, Out 
of memory while allocating memory for a persistent link);
+   }
mysql-active_result_id = 0;
 #ifdef CLIENT_MULTI_STATEMENTS
mysql-multi_query = client_flags  
CLIENT_MULTI_STATEMENTS? 1:0;

Modified: php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c
===
--- php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c  2011-05-18 11:33:55 UTC 
(rev 311180)
+++ php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c  2011-05-18 11:49:49 UTC 
(rev 311181)
@@ -830,6 +830,9 @@
}
/* create the link */
mysql = (php_mysql_conn *) 
malloc(sizeof(php_mysql_conn));
+   if (!mysql) {
+   php_error_docref(NULL TSRMLS_CC, E_ERROR, Out 
of memory while allocating memory for a persistent link);
+   }
mysql-active_result_id = 0;
 #ifdef CLIENT_MULTI_STATEMENTS
mysql-multi_query = client_flags  
CLIENT_MULTI_STATEMENTS? 1:0;

Modified: php/php-src/trunk/ext/mysql/php_mysql.c
===
--- php/php-src/trunk/ext/mysql/php_mysql.c 2011-05-18 11:33:55 UTC (rev 
311180)
+++ php/php-src/trunk/ext/mysql/php_mysql.c 2011-05-18 11:49:49 UTC (rev 
311181)
@@ -830,6 +830,9 @@
}
/* create the link */
mysql = (php_mysql_conn *) 
malloc(sizeof(php_mysql_conn));
+   if (!mysql) {
+   php_error_docref(NULL TSRMLS_CC, E_ERROR, Out 
of memory while allocating memory for a persistent link);
+   }
mysql-active_result_id = 0;
 #ifdef CLIENT_MULTI_STATEMENTS
mysql-multi_query = client_flags  
CLIENT_MULTI_STATEMENTS? 1:0;

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/build/ buildcheck.sh

2011-05-18 Thread Rasmus Lerdorf
rasmus   Wed, 18 May 2011 17:27:41 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=311202

Log:
Fix autoconf version check script to make sure people are
not using 2.60 or higher here. It might actually work up to
2.62 or 2.64. If someone could verify that these versions
still work I can massage this further.

Changed paths:
U   php/php-src/branches/PHP_5_3/build/buildcheck.sh

Modified: php/php-src/branches/PHP_5_3/build/buildcheck.sh
===
--- php/php-src/branches/PHP_5_3/build/buildcheck.sh2011-05-18 16:58:31 UTC 
(rev 311201)
+++ php/php-src/branches/PHP_5_3/build/buildcheck.sh2011-05-18 17:27:41 UTC 
(rev 311202)
@@ -42,14 +42,21 @@
 echoYou need autoconf version 2.13 or newer installed
 echoto build PHP from SVN.
 exit 1
+fi
+
+if test $1 = 2 -a $2 -gt 59; then
+  echo buildconf: You need autoconf 2.59 or lower to build this version of 
PHP.
+  echoYou are currently trying to use $ac_version
+  echoMost distros have separate autoconf 2.13 or 2.59 packages.
+  echoOn Debian/Ubuntu both autoconf2.13 and autoconf2.59 
packages exist.
+  echoInstall autoconf2.13 and set the PHP_AUTOCONF env var to 
+  echoautoconf2.13and try again.
+  exit 1
 else
-echo buildconf: autoconf version $ac_version (ok)
+  echo buildconf: autoconf version $ac_version (ok)
 fi

-if test $1 = 2  test $2 -ge 50; then
-  echo buildconf: Your version of autoconf likely contains buggy cache code.
-  echoRunning vcsclean for you.
-  echoTo avoid this, install autoconf-2.13.
+if test $1 = 2 -a $2 -ge 50; then
   ./vcsclean
   stamp=
 fi

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

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/build/ buildcheck.sh

2011-05-18 Thread Ferenc Kovacs
On Wed, May 18, 2011 at 7:27 PM, Rasmus Lerdorf ras...@php.net wrote:

 rasmus   Wed, 18 May 2011 17:27:41 +

 Revision: http://svn.php.net/viewvc?view=revisionrevision=311202

 Log:
 Fix autoconf version check script to make sure people are
 not using 2.60 or higher here. It might actually work up to
 2.62 or 2.64. If someone could verify that these versions
 still work I can massage this further.


debian squeeze has 2.64 and 2.67, so it should be easy to test it.
if nobody else are up for it, I can check this also.
should be ./configure --disable-all --enable-cli  make  make test enough
to verify this?

Tyrael


Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/build/ buildcheck.sh

2011-05-18 Thread Rasmus Lerdorf
On 05/18/2011 10:37 AM, Ferenc Kovacs wrote:
 On Wed, May 18, 2011 at 7:27 PM, Rasmus Lerdorf ras...@php.net wrote:
 
 rasmus   Wed, 18 May 2011 17:27:41 +

 Revision: http://svn.php.net/viewvc?view=revisionrevision=311202

 Log:
 Fix autoconf version check script to make sure people are
 not using 2.60 or higher here. It might actually work up to
 2.62 or 2.64. If someone could verify that these versions
 still work I can massage this further.


 debian squeeze has 2.64 and 2.67, so it should be easy to test it.
 if nobody else are up for it, I can check this also.
 should be ./configure --disable-all --enable-cli  make  make test enough
 to verify this?

Yes, ./buildconf (with my check removed or modified to allow those
versions) and then try to run your configure line. 2.65-2.67 definitely
don't work, so no need to test those.

-Rasmus

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



Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/build/ buildcheck.sh

2011-05-18 Thread Ferenc Kovacs
On Wed, May 18, 2011 at 7:45 PM, Rasmus Lerdorf ras...@lerdorf.com wrote:

 On 05/18/2011 10:37 AM, Ferenc Kovacs wrote:
  On Wed, May 18, 2011 at 7:27 PM, Rasmus Lerdorf ras...@php.net wrote:
 
  rasmus   Wed, 18 May 2011 17:27:41 +
 
  Revision: http://svn.php.net/viewvc?view=revisionrevision=311202
 
  Log:
  Fix autoconf version check script to make sure people are
  not using 2.60 or higher here. It might actually work up to
  2.62 or 2.64. If someone could verify that these versions
  still work I can massage this further.
 
 
  debian squeeze has 2.64 and 2.67, so it should be easy to test it.
  if nobody else are up for it, I can check this also.
  should be ./configure --disable-all --enable-cli  make  make test
 enough
  to verify this?

 Yes, ./buildconf (with my check removed or modified to allow those
 versions) and then try to run your configure line. 2.65-2.67 definitely
 don't work, so no need to test those.


it works AFAIK:

tyrael@thor:~/checkouts/php/src/php/php-src/trunk$ PHP_AUTOCONF=autoconf2.64
PHP_AUTOHEADER=autoheader2.64 ./buildconf
buildconf: checking installation...
buildconf: autoconf version 2.64 (ok)
rebuilding aclocal.m4
rebuilding configure
rebuilding main/php_config.h.in
tyrael@thor:~/checkouts/php/src/php/php-src/trunk$ ./configure --disable-all
--enable-cli
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for a sed that does not truncate output... /bin/sed
checking build system type... x86_64-unknown-linux-gnu
checking host system type... x86_64-unknown-linux-gnu
checking target system type... x86_64-unknown-linux-gnu
checking for cc... cc
checking for C compiler default output file name... a.out
checking whether the C compiler works... yes
checking whether we are cross compiling... no
checking for suffix of executables...
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether cc accepts -g... yes
checking for cc option to accept ISO C89... none needed
checking how to run the C preprocessor... cc -E
checking for icc... no
checking for suncc... no
checking whether cc understands -c and -o together... yes
checking how to run the C preprocessor... cc -E
checking for ANSI C header files... yes
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for unistd.h... yes
checking minix/config.h usability... no
checking minix/config.h presence... no
checking for minix/config.h... no
checking whether it is safe to define __EXTENSIONS__... yes
checking whether ln -s works... yes
checking for system library directory... lib
checking whether to enable runpaths... yes
checking if compiler supports -R... no
checking if compiler supports -Wl,-rpath,... yes
checking for gawk... gawk
checking for bison... bison -y
checking for bison version... 2.4.1 (ok)
checking for re2c... no
configure: WARNING: You will need re2c 0.13.4 or later if you want to
regenerate PHP parsers.
checking whether to enable computed goto gcc extension with re2c... no
checking whether to force non-PIC code in shared modules... no
checking whether /dev/urandom exists... yes
checking for pthreads_cflags... -pthread
checking for pthreads_lib...

Configuring SAPI modules
checking for AOLserver support... no
checking for Apache 1.x module support via DSO through APXS... no
checking for Apache 1.x module support... no
checking whether to enable Apache charset compatibility option... no
checking for Apache 2.0 filter-module support via DSO through APXS... no
checking for Apache 2.0 handler-module support via DSO through APXS... no
checking for Apache 1.x (hooks) module support via DSO through APXS... no
checking for Apache 1.x (hooks) module support... no
checking whether to enable Apache charset compatibility option... no
checking for Caudium support... no
checking for CLI build... yes
checking for Continuity support... no
checking for embedded SAPI library support... no
checking for FPM build... no
checking for Zeus ISAPI support... no
checking for LiteSpeed support... no
checking for Milter support... no
checking for NSAPI support... no
checking for PHTTPD support... no
checking for Pi3Web support... no
checking whether Roxen module is build using ZTS... no
checking for Roxen/Pike support...
checking for thttpd... no
checking for TUX... no
checking for webjames... no
checking for CGI build... yes
checking for socklen_t in sys/socket.h... yes
checking for sun_len in sys/un.h... no
checking whether cross-process locking is required by accept()... no
checking for chosen SAPI module... none
checking for executable SAPI binaries...  cli cgi

Running system checks
checking for sendmail... /usr/sbin/sendmail
checking whether system uses EBCDIC... no
checking whether byte ordering is 

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/build/ buildcheck.sh

2011-05-18 Thread Rasmus Lerdorf
rasmus   Wed, 18 May 2011 19:55:34 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=311203

Log:
Fix typo

Changed paths:
U   php/php-src/branches/PHP_5_3/build/buildcheck.sh

Modified: php/php-src/branches/PHP_5_3/build/buildcheck.sh
===
--- php/php-src/branches/PHP_5_3/build/buildcheck.sh2011-05-18 17:27:41 UTC 
(rev 311202)
+++ php/php-src/branches/PHP_5_3/build/buildcheck.sh2011-05-18 19:55:34 UTC 
(rev 311203)
@@ -50,7 +50,7 @@
   echoMost distros have separate autoconf 2.13 or 2.59 packages.
   echoOn Debian/Ubuntu both autoconf2.13 and autoconf2.59 
packages exist.
   echoInstall autoconf2.13 and set the PHP_AUTOCONF env var to 
-  echoautoconf2.13and try again.
+  echoautoconf2.13 and try again.
   exit 1
 else
   echo buildconf: autoconf version $ac_version (ok)

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

[PHP-CVS] svn: /php/php-src/trunk/Zend/tests/ constants_005.phpt

2011-05-18 Thread Jeraimee Hughes
jeraimee Wed, 18 May 2011 20:07:11 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=311204

Log:
Fixed failing test.

Changed paths:
U   php/php-src/trunk/Zend/tests/constants_005.phpt

Modified: php/php-src/trunk/Zend/tests/constants_005.phpt
===
--- php/php-src/trunk/Zend/tests/constants_005.phpt 2011-05-18 19:55:34 UTC 
(rev 311203)
+++ php/php-src/trunk/Zend/tests/constants_005.phpt 2011-05-18 20:07:11 UTC 
(rev 311204)
@@ -7,5 +7,6 @@
 var_dump(ZEND_THREAD_safe);
 ?
 --EXPECTF--
-bool(%s)
+Notice: Use of undefined constant ZEND_THREAD_safe - assumed 
'ZEND_THREAD_safe' in %s on line %d
+string(16) ZEND_THREAD_safe
 int(123)

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

[PHP-CVS] svn: /php/php-src/trunk/ext/date/tests/ bug33532.phpt

2011-05-18 Thread Jeraimee Hughes
jeraimee Wed, 18 May 2011 20:52:30 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=311205

Log:
Fixed failing test (mismatch of tzoffset)

Changed paths:
U   php/php-src/trunk/ext/date/tests/bug33532.phpt

Modified: php/php-src/trunk/ext/date/tests/bug33532.phpt
===
--- php/php-src/trunk/ext/date/tests/bug33532.phpt  2011-05-18 20:07:11 UTC 
(rev 311204)
+++ php/php-src/trunk/ext/date/tests/bug33532.phpt  2011-05-18 20:52:30 UTC 
(rev 311205)
@@ -29,10 +29,10 @@
 TZ has NOT been set
 Should strftime==datestr? Strftime seems to assume GMT tStamp.
 input10:00:00 AM July 1 2005
-strftime 10:00:00 AM July 1 2005 UTC +
+strftime 10:00:00 AM July 1 2005 UTC -0500
 datestr  10:00:00 AM July 1 2005 UTC

 Setting TZ
 input10:00:00 AM July 1 2005
-strftime 10:00:00 AM July 1 2005 EST +1000
+strftime 10:00:00 AM July 1 2005 EST -0500
 datestr  10:00:00 AM July 1 2005 EST

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

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/build/ buildcheck.sh

2011-05-18 Thread Ferenc Kovacs
On Wed, May 18, 2011 at 7:45 PM, Rasmus Lerdorf ras...@lerdorf.com wrote:

 On 05/18/2011 10:37 AM, Ferenc Kovacs wrote:
  On Wed, May 18, 2011 at 7:27 PM, Rasmus Lerdorf ras...@php.net wrote:
 
  rasmus   Wed, 18 May 2011 17:27:41 +
 
  Revision: http://svn.php.net/viewvc?view=revisionrevision=311202
 
  Log:
  Fix autoconf version check script to make sure people are
  not using 2.60 or higher here. It might actually work up to
  2.62 or 2.64. If someone could verify that these versions
  still work I can massage this further.
 
 
  debian squeeze has 2.64 and 2.67, so it should be easy to test it.
  if nobody else are up for it, I can check this also.
  should be ./configure --disable-all --enable-cli  make  make test
 enough
  to verify this?

 Yes, ./buildconf (with my check removed or modified to allow those
 versions) and then try to run your configure line. 2.65-2.67 definitely
 don't work, so no need to test those.

 -Rasmus

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


just noticed that I've tested this on trunk, when you patched the 5.3
branch. :/
to be able to run the buildconf with autoconf2.64 I had to change the
build/buildcheck.sh and replace the 59 with 64 in the version check
obviously.
here is the result:

tyrael@chronos:~/checkouts/php/src/php/php-src/branches/PHP_5_3$
PHP_AUTOCONF=autoconf2.64 PHP_AUTOHEADER=autoheader2.64 ./buildconf
buildconf: checking installation...
buildconf: autoconf version 2.64 (ok)
rebuilding aclocal.m4
rebuilding configure
ext/pdo_dblib/config.m4:56: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
../../lib/autoconf/general.m4:2018: AC_CACHE_VAL is expanded from...
../../lib/autoconf/general.m4:2039: AC_CACHE_CHECK is expanded from...
aclocal.m4:2747: PHP_CHECK_PDO_INCLUDES is expanded from...
ext/pdo_firebird/config.m4:48: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
ext/pdo_mysql/config.m4:138: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
ext/pdo_oci/config.m4:211: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
ext/pdo_odbc/config.m4:44: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
ext/pdo_pgsql/config.m4:107: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
ext/pdo_sqlite/config.m4:16: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
ext/sqlite/config.m4:50: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
rebuilding acconfig.h
rebuilding main/php_config.h.in
autoheader2.64: WARNING: Using auxiliary files such as `acconfig.h',
`config.h.bot'
autoheader2.64: WARNING: and `config.h.top', to define templates for `
config.h.in'
autoheader2.64: WARNING: is deprecated and discouraged.
autoheader2.64:
autoheader2.64: WARNING: Using the third argument of `AC_DEFINE' and
autoheader2.64: WARNING: `AC_DEFINE_UNQUOTED' allows one to define a
template without
autoheader2.64: WARNING: `acconfig.h':
autoheader2.64:
autoheader2.64: WARNING:   AC_DEFINE([NEED_FUNC_MAIN], 1,
autoheader2.64: [Define if a function `main' is needed.])
autoheader2.64:
autoheader2.64: WARNING: More sophisticated templates can also be produced,
see the
autoheader2.64: WARNING: documentation.
ext/pdo_dblib/config.m4:56: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
../../lib/autoconf/general.m4:2018: AC_CACHE_VAL is expanded from...
../../lib/autoconf/general.m4:2039: AC_CACHE_CHECK is expanded from...
aclocal.m4:2747: PHP_CHECK_PDO_INCLUDES is expanded from...
ext/pdo_firebird/config.m4:48: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
ext/pdo_mysql/config.m4:138: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
ext/pdo_oci/config.m4:211: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
ext/pdo_odbc/config.m4:44: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
ext/pdo_pgsql/config.m4:107: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
ext/pdo_sqlite/config.m4:16: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached
ext/sqlite/config.m4:50: warning: AC_CACHE_VAL(pdo_inc_path, ...):
suspicious cache-id, must contain _cv_ to be cached

I saw some discussion about this on irc, so I think that you are already
aware of this.

Tyrael


[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/acinclude.m4 branches/PHP_5_4/acinclude.m4 trunk/acinclude.m4

2011-05-18 Thread Scott MacVicar
scottmac Thu, 19 May 2011 05:43:48 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=311223

Log:
Revert part of the fix for #53339
On OSX we need ssl AND crypto

The patch that was applied didn't even match what was in the bug

Bug: http://bugs.php.net/53339 (Closed) Fails to build LDAP module when 
compilng with gcc 4.5 and DSO libraries
  
Changed paths:
U   php/php-src/branches/PHP_5_3/acinclude.m4
U   php/php-src/branches/PHP_5_4/acinclude.m4
U   php/php-src/trunk/acinclude.m4

Modified: php/php-src/branches/PHP_5_3/acinclude.m4
===
--- php/php-src/branches/PHP_5_3/acinclude.m4   2011-05-19 00:42:30 UTC (rev 
311222)
+++ php/php-src/branches/PHP_5_3/acinclude.m4   2011-05-19 05:43:48 UTC (rev 
311223)
@@ -2397,6 +2397,7 @@
   -L$OPENSSL_LIBDIR
 ])
 LIBS=$old_LIBS
+PHP_ADD_LIBRARY(ssl,,$1)
 PHP_ADD_LIBRARY(crypto,,$1)

 PHP_ADD_LIBPATH($OPENSSL_LIBDIR, $1)

Modified: php/php-src/branches/PHP_5_4/acinclude.m4
===
--- php/php-src/branches/PHP_5_4/acinclude.m4   2011-05-19 00:42:30 UTC (rev 
311222)
+++ php/php-src/branches/PHP_5_4/acinclude.m4   2011-05-19 05:43:48 UTC (rev 
311223)
@@ -2412,6 +2412,7 @@
   -L$OPENSSL_LIBDIR
 ])
 LIBS=$old_LIBS
+PHP_ADD_LIBRARY(ssl,,$1)
 PHP_ADD_LIBRARY(crypto,,$1)

 PHP_ADD_LIBPATH($OPENSSL_LIBDIR, $1)

Modified: php/php-src/trunk/acinclude.m4
===
--- php/php-src/trunk/acinclude.m4  2011-05-19 00:42:30 UTC (rev 311222)
+++ php/php-src/trunk/acinclude.m4  2011-05-19 05:43:48 UTC (rev 311223)
@@ -2412,6 +2412,7 @@
   -L$OPENSSL_LIBDIR
 ])
 LIBS=$old_LIBS
+PHP_ADD_LIBRARY(ssl,,$1)
 PHP_ADD_LIBRARY(crypto,,$1)

 PHP_ADD_LIBPATH($OPENSSL_LIBDIR, $1)

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