sniper          Mon Jan 19 20:11:51 2004 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src    NEWS acinclude.m4 
  Log:
  MFH: Fixed bug #26969 (shared openssl build fails)
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.534&r2=1.1247.2.535&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.534 php-src/NEWS:1.1247.2.535
--- php-src/NEWS:1.1247.2.534   Mon Jan 19 14:06:32 2004
+++ php-src/NEWS        Mon Jan 19 20:11:39 2004
@@ -1,6 +1,7 @@
 PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Jan 2004, Version 4.3.5
+- Fixed bug #26969 (--with-openssl=shared build fails). (Jani)
 - Fixed bug #26949 (rand(min,max) always returns min when ZTS enabled). (Jani)
 - Fixed bug #26937 (Warning in xml.c). (Jani)
 - Fixed Bug #26927 (preg_quote() does not escape \0). (Ilia)
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.218.2.34&r2=1.218.2.35&ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.218.2.34 php-src/acinclude.m4:1.218.2.35
--- php-src/acinclude.m4:1.218.2.34     Fri Dec 12 00:20:24 2003
+++ php-src/acinclude.m4        Mon Jan 19 20:11:40 2004
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.218.2.34 2003/12/12 05:20:24 sniper Exp $
+dnl $Id: acinclude.m4,v 1.218.2.35 2004/01/20 01:11:40 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -1656,7 +1656,6 @@
     CPPFLAGS=$old_CPPFLAGS
 
     PHP_ADD_INCLUDE($OPENSSL_INCDIR)
-    PHP_ADD_LIBPATH($OPENSSL_LIBDIR, $1)
   
     PHP_CHECK_LIBRARY(crypto, CRYPTO_free, [
       PHP_ADD_LIBRARY(crypto,,$1)
@@ -1677,6 +1676,8 @@
     ])
     LIBS=$old_LIBS
     PHP_ADD_LIBRARY(ssl,,$1)
+
+    PHP_ADD_LIBPATH($OPENSSL_LIBDIR, $1)
   fi
 
   dnl For apache 1.3.x static build

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

Reply via email to