- added dl-pcre and dl-zlib patches to allow building pcre and zlib extensions

[packages/php.git] / php-imap.patch

diff --git a/php-imap.patch b/php-imap.patch
index 0d8e21943567fdcf2a599649be43374a8a052153..9cfe80260544095fbad39f080f91c73d4f66d5e1 100644 (file)
--- a/php-imap.patch
+++ b/php-imap.patch
@@ -1,30 +1,30 @@
---- php-4.0b4pl1/ext/imap/imap.c.wiget Mon Feb 21 14:50:40 2000
-+++ php-4.0b4pl1/ext/imap/imap.c       Thu Mar 16 14:55:05 2000
-@@ -431,23 +431,23 @@
-       unsigned long sa_all =  SA_MESSAGES | SA_RECENT | SA_UNSEEN |
-                               SA_UIDNEXT | SA_UIDVALIDITY;
+--- php-4.0.6/ext/imap/config.m4.imap  Wed Jul 11 09:21:00 2001
++++ php-4.0.6/ext/imap/config.m4       Wed Jul 11 09:28:24 2001
+@@ -49,14 +49,11 @@
  
--#if !(WIN32|WINNT)
-+#if 0
-       mail_link(&unixdriver);   /* link in the unix driver */
- #endif
-       mail_link (&imapdriver);      /* link in the imap driver */
-       mail_link (&nntpdriver);      /* link in the nntp driver */
-       mail_link (&pop3driver);      /* link in the pop3 driver */
--#if !(WIN32|WINNT)
-+#if 0
-       mail_link (&mhdriver);        /* link in the mh driver */
-       mail_link (&mxdriver);        /* link in the mx driver */
--#endif
-       mail_link (&mbxdriver);       /* link in the mbx driver */
-       mail_link (&tenexdriver);     /* link in the tenex driver */
-       mail_link (&mtxdriver);       /* link in the mtx driver */
--#if !(WIN32|WINNT)
-       mail_link (&mmdfdriver);      /* link in the mmdf driver */
-       mail_link (&newsdriver);      /* link in the news driver */
-       mail_link (&philedriver);     /* link in the phile driver */
-+#endif        
-+#if !(WIN32|WINNT)
-       auth_link (&auth_log);        /* link in the log authenticator */
- #endif
-       mail_link (&dummydriver);     /* link in the dummy driver */
+   if test "$PHP_IMAP_SSL" != "no"; then
+     PHP_ADD_LIBPATH($PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD)
+-    PHP_ADD_LIBRARY_DEFER(crypto)
+-    PHP_ADD_LIBRARY_DEFER(ssl)
++    PHP_ADD_LIBRARY(crypto, 1, IMAP_SHARED_LIBADD)
++    PHP_ADD_LIBRARY(ssl, 1, IMAP_SHARED_LIBADD)
+ 
+     old_LIBS=$LIBS
+-    LIBS="$LIBS -lc-client"
+-    if test $PHP_KERBEROS != "no"; then
+-      LIBS="$LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
+-    fi
++    LIBS="$LIBS $IMAP_SHARED_LIBADD"
+     AC_TRY_RUN([
+       void mm_log(void){}
+       void mm_dlog(void){}
+@@ -133,8 +130,7 @@
+     fi
+ 
+     PHP_ADD_INCLUDE($IMAP_INC_DIR)
+-    PHP_ADD_LIBPATH($IMAP_LIBDIR, IMAP_SHARED_LIBADD)
+-    PHP_ADD_LIBRARY_DEFER($IMAP_LIB)
++    PHP_ADD_LIBRARY_WITH_PATH($IMAP_LIB, $IMAP_LIBDIR, IMAP_SHARED_LIBADD)
+     PHP_IMAP_KRB_CHK
+     PHP_IMAP_SSL_CHK
+ fi