recipes/php/php-5.2.11/imap-fix-autofoo.patch

   1 Index: php-5.2.11/ext/imap/config.m4
   2 ===================================================================
   3 --- php-5.2.11.orig/ext/imap/config.m4  2009-12-10 12:27:52.800974533 -0700
   4 +++ php-5.2.11/ext/imap/config.m4       2009-12-10 12:28:33.720976583 -0700
   5 @@ -103,7 +103,7 @@
   6      PHP_NEW_EXTENSION(imap, php_imap.c, $ext_shared)
   7      AC_DEFINE(HAVE_IMAP,1,[ ])
   8
   9 -    for i in $PHP_IMAP /usr/local /usr; do
  10 +    for i in $PHP_IMAP $PHP_IMAP/usr /usr/local /usr; do
  11        IMAP_INC_CHK()
  12        el[]IMAP_INC_CHK(/include/c-client)
  13        el[]IMAP_INC_CHK(/include/imap)
  14 @@ -192,13 +192,7 @@
  15        AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.)
  16      fi
  17
  18 -    if test -r "$IMAP_DIR/c-client/c-client.a"; then
  19 -      ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1
  20 -    elif test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then
  21 -      ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1
  22 -    fi
  23 -
  24 -    for lib in c-client4 c-client imap; do
  25 +    for lib in /usr/lib c-client4 c-client imap; do
  26        IMAP_LIB=$lib
  27        IMAP_LIB_CHK($PHP_LIBDIR)
  28        IMAP_LIB_CHK(c-client)
  29 Index: php-5.2.11/acinclude.m4
  30 ===================================================================
  31 --- php-5.2.11.orig/acinclude.m4        2009-12-10 12:37:13.134722881 -0700
  32 +++ php-5.2.11/acinclude.m4     2009-12-10 12:37:39.342007053 -0700
  33 @@ -2338,7 +2338,7 @@
  34        PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
  35      fi
  36
  37 -    for i in $PHP_OPENSSL_DIR; do
  38 +    for i in $PHP_OPENSSL_DIR $PHP_OPENSSL_DIR/usr; do
  39        if test -r $i/include/openssl/evp.h; then
  40          OPENSSL_INCDIR=$i/include
  41        fi