sniper          Fri Jan 16 19:01:06 2004 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src    NEWS 
    /php-src/ext/imap   config.m4 
  Log:
  MFH: Fixed bug #26923 (ext/imap: pam and crypt libraries missing when build as 
shared)
  
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.529 php-src/NEWS:1.1247.2.530
--- php-src/NEWS:1.1247.2.529   Fri Jan 16 14:12:46 2004
+++ php-src/NEWS        Fri Jan 16 19:01:04 2004
@@ -3,6 +3,8 @@
 ?? 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)
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.49.2.10 php-src/ext/imap/config.m4:1.49.2.11
--- php-src/ext/imap/config.m4:1.49.2.10        Fri Oct  3 01:25:35 2003
+++ php-src/ext/imap/config.m4  Fri Jan 16 19:01:06 2004
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.49.2.10 2003/10/03 05:25:35 sniper Exp $
+dnl $Id: config.m4,v 1.49.2.11 2004/01/17 00:01:06 sniper Exp $
 dnl
 
 AC_DEFUN(IMAP_INC_CHK,[if test -r "$i$1/c-client.h"; then
@@ -158,8 +158,17 @@
     ],[])
     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)
 

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

Reply via email to