MFH: Fixed bug #26923 (ext/imap: pam and crypt libraries missing when build as shared)

diff --git a/NEWS b/NEWS
index 26970fcab53d97db2dfdf67c3269d6e48af4e32c..5e3d00fffaed7e8bb290dc1ffdcb8789eda54d55 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ PHP 4                                                                      NEWS
 ?? Jan 2004, Version 4.3.5
 - Fixed bug #26937 (Warning in xml.c). (Jani)
 - Fixed Bug #26927 (preg_quote() does not escape \0). (Ilia)
+- Fixed bug #26923 (ext/imap: pam and crypt libraries missing when build as
+  shared extension). (Jani)
 - Fixed bug #26909 (crash in imap_mime_header_decode() when no encoding is 
   used). (Ilia)
 - Fixed bug #26892 (ORA-21301 in ocinewcollection() call). (Antony)

diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
index ceefb0d04af573e45ee28ae4a51ca5414063ea63..b653d83a41d67114763ae1f0756d5a49d49b18e5 100644 (file)
--- a/ext/imap/config.m4
+++ b/ext/imap/config.m4
@@ -158,8 +158,17 @@ if test "$PHP_IMAP" != "no"; then
     ],[])
     CPPFLAGS=$old_CPPFLAGS
 
-    AC_CHECK_LIB(pam, pam_start) 
-    AC_CHECK_LIB(crypt, crypt)
+    PHP_CHECK_LIBRARY(pam, pam_start, 
+    [
+      PHP_ADD_LIBRARY(pam,, IMAP_SHARED_LIBADD)
+      AC_DEFINE(HAVE_LIBPAM,1,[ ])
+    ])
+
+    PHP_CHECK_LIBRARY(crypt, crypt, 
+    [
+      PHP_ADD_LIBRARY(crypt,, IMAP_SHARED_LIBADD)
+      AC_DEFINE(HAVE_LIBCRYPT,1,[ ])
+    ])
            
     PHP_EXPAND_PATH($IMAP_DIR, IMAP_DIR)