Add the libraries we actually test and need for LDAP and OpenSSL, fixes bug #53339

rgeissert · rgeissert · commit a286fa3523b2 · 2011-03-18T18:47:09.000Z
Patch by Clint Byrum
diff --git a/acinclude.m4 b/acinclude.m4
@@ -2412,7 +2412,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
       -L$OPENSSL_LIBDIR
     ])
     LIBS=$old_LIBS
-    PHP_ADD_LIBRARY(ssl,,$1)
+    PHP_ADD_LIBRARY(crypto,,$1)
 
     PHP_ADD_LIBPATH($OPENSSL_LIBDIR, $1)
   fi
diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4
@@ -50,7 +50,7 @@ AC_DEFUN([PHP_LDAP_SASL_CHECKS], [
     SASL_LIB="-L$LDAP_SASL_LIBDIR -lsasl2"
   fi
   
-  PHP_CHECK_LIBRARY(ldap, sasl_version,
+  PHP_CHECK_LIBRARY(sasl2, sasl_version,
   [
     PHP_ADD_INCLUDE($LDAP_SASL_INCDIR)
     PHP_ADD_LIBRARY_WITH_PATH(sasl2, $LDAP_SASL_LIBDIR, LDAP_SHARED_LIBADD)
diff --git a/ext/openssl/config0.m4 b/ext/openssl/config0.m4
@@ -17,6 +17,7 @@ if test "$PHP_OPENSSL" != "no"; then
   fi
 
   AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
+  AC_CHECK_LIB(crypto, X509_free, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
 
   PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD, 
   [

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ AC_DEFUN([PHP_LDAP_SASL_CHECKS], [`
`50`	`50`	`SASL_LIB="-L$LDAP_SASL_LIBDIR -lsasl2"`
`51`	`51`	`fi`
`52`	`52`
`53`		`- PHP_CHECK_LIBRARY(ldap, sasl_version,`
	`53`	`+ PHP_CHECK_LIBRARY(sasl2, sasl_version,`
`54`	`54`	`[`
`55`	`55`	`PHP_ADD_INCLUDE($LDAP_SASL_INCDIR)`
`56`	`56`	`PHP_ADD_LIBRARY_WITH_PATH(sasl2, $LDAP_SASL_LIBDIR, LDAP_SHARED_LIBADD)`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ if test "$PHP_OPENSSL" != "no"; then`
`17`	`17`	`fi`
`18`	`18`
`19`	`19`	`AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))`
	`20`	`+ AC_CHECK_LIB(crypto, X509_free, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))`
`20`	`21`
`21`	`22`	`PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD,`
`22`	`23`	`[`