From: foobar <sniper@php.net>
Date: Tue, 20 Jan 2004 01:11:40 +0000 (+0000)
Subject: MFH: Fixed bug #26969 (shared openssl build fails)
X-Git-Tag: php-4.3.5RC2~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e22b67233947de4479776e61b42769a31bcfa2c;p=php

MFH: Fixed bug #26969 (shared openssl build fails)
---

diff --git a/NEWS b/NEWS
index ce46db15ba..62b40a2a7f 100644
--- a/NEWS
+++ b/NEWS
@@ -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)
diff --git a/acinclude.m4 b/acinclude.m4
index 284c257e0f..1277a795ea 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1656,7 +1656,6 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
     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 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
     ])
     LIBS=$old_LIBS
     PHP_ADD_LIBRARY(ssl,,$1)
+
+    PHP_ADD_LIBPATH($OPENSSL_LIBDIR, $1)
   fi
 
   dnl For apache 1.3.x static build