diff options
Diffstat (limited to 'meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch')
-rw-r--r-- | meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch b/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch deleted file mode 100644 index 16359af9fd..0000000000 --- a/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch +++ /dev/null @@ -1,51 +0,0 @@ -From c084c8349d1780980e232cb28b60a109e3d89438 Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Wed, 2 Nov 2011 16:54:57 +0100 -Subject: [PATCH] Upstream-Status: Pending - ---- - acinclude.m4 | 2 +- - ext/imap/config.m4 | 10 ++-------- - 2 files changed, 3 insertions(+), 9 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index ad5166e..f6a55ec 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -2350,7 +2350,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ - PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" - fi - -- for i in $PHP_OPENSSL_DIR; do -+ for i in $PHP_OPENSSL_DIR $PHP_OPENSSL_DIR/usr; do - if test -r $i/include/openssl/evp.h; then - OPENSSL_INCDIR=$i/include - fi -diff --git a/ext/imap/config.m4 b/ext/imap/config.m4 -index badb6e2..8ff803c 100644 ---- a/ext/imap/config.m4 -+++ b/ext/imap/config.m4 -@@ -109,7 +109,7 @@ if test "$PHP_IMAP" != "no"; then - PHP_NEW_EXTENSION(imap, php_imap.c, $ext_shared) - AC_DEFINE(HAVE_IMAP,1,[ ]) - -- for i in $PHP_IMAP /usr/local /usr; do -+ for i in $PHP_IMAP $PHP_IMAP/usr /usr/local /usr; do - IMAP_INC_CHK() - el[]IMAP_INC_CHK(/include/c-client) - el[]IMAP_INC_CHK(/include/imap) -@@ -198,13 +198,7 @@ if test "$PHP_IMAP" != "no"; then - AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.) - fi - -- if test ! -r "$IMAP_DIR/c-client/libc-client.a" && test -r "$IMAP_DIR/c-client/c-client.a" ; then -- ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 -- elif test ! -r "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" && test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then -- ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1 -- fi -- -- for lib in c-client4 c-client imap; do -+ for lib in /usr/lib c-client4 c-client imap; do - IMAP_LIB=$lib - IMAP_LIB_CHK($PHP_LIBDIR) - IMAP_LIB_CHK(c-client) |