scottmac                                 Thu, 19 May 2011 05:43:48 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=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

Reply via email to