MFH: - Fixed bug #34796 (missing SSL linking in ext/ftp when configured as shared).

diff --git a/NEWS b/NEWS
index 8b34902aba79b4baa3a69c19d1c6f7a53cb13f72..802c503bb6d841fa935367d8644017371307a2d2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -43,6 +43,8 @@ PHP                                                                        NEWS
 - Fixed "make test" to work for phpized extensions. (Hartmut, Jani)
 - Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems.
   (Andrey)
+- Fixed bug #34796 (missing SSL linking in ext/ftp when configured as shared).
+  (Patch by: glen at delfi dot ee)
 - Fixed bug #34788 (SOAP Client not applying correct namespace to generated
   values). (Dmitry)
 - Fixed bug #34787 (SOAP Client not handling boolean types correctly). (Dmitry)

diff --git a/ext/ftp/config.m4 b/ext/ftp/config.m4
index 3b5f3fd6419deb13e55b41ae28df51953fcdeeb2..0d389c7f383914a9536834ab7790a3202b2a351f 100644 (file)
--- a/ext/ftp/config.m4
+++ b/ext/ftp/config.m4
@@ -5,7 +5,15 @@ dnl
 PHP_ARG_ENABLE(ftp,whether to enable FTP support,
 [  --enable-ftp            Enable FTP support])
 
+PHP_ARG_WITH(openssl-dir,OpenSSL dir for SNMP,
+[  --with-openssl-dir[=DIR]  SNMP: openssl install prefix], no, no)
+
 if test "$PHP_FTP" = "yes"; then
   AC_DEFINE(HAVE_FTP,1,[Whether you want FTP support])
   PHP_NEW_EXTENSION(ftp, php_ftp.c ftp.c, $ext_shared)
+
+  if test "$PHP_OPENSSL" != "no" || test "$PHP_OPENSSL_DIR" != "no"; then
+    PHP_SETUP_OPENSSL(FTP_SHARED_LIBADD)
+    PHP_SUBST(FTP_SHARED_LIBADD)
+  fi
 fi