1From c3c20db4415e0f6c4a601d6f9da1f3746a96b301 Mon Sep 17 00:00:00 2001 2From: Claude Bing <cbing@cybernetics.com> 3Date: Tue, 9 Nov 2021 13:08:58 -0500 4Subject: [PATCH 08/11] ext/imap/config.m4: fix include paths 5 6Upstream-Status: Pending 7Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> 8 9update patch to version 8.0.12 10Signed-off-by: Claude Bing <cbing@cybernetics.com> 11--- 12 ext/imap/config.m4 | 10 ++-------- 13 1 file changed, 2 insertions(+), 8 deletions(-) 14 15diff --git a/ext/imap/config.m4 b/ext/imap/config.m4 16index 5086a312d0..0e938bd544 100644 17--- a/ext/imap/config.m4 18+++ b/ext/imap/config.m4 19@@ -110,7 +110,7 @@ if test "$PHP_IMAP" != "no"; then 20 PHP_NEW_EXTENSION(imap, php_imap.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) 21 AC_DEFINE(HAVE_IMAP,1,[ ]) 22 23- for i in $PHP_IMAP /usr/local /usr; do 24+ for i in $PHP_IMAP $PHP_IMAP/usr /usr/local /usr; do 25 IMAP_INC_CHK() 26 el[]IMAP_INC_CHK(/include/c-client) 27 el[]IMAP_INC_CHK(/include/imap) 28@@ -199,13 +199,7 @@ if test "$PHP_IMAP" != "no"; then 29 AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.) 30 fi 31 32- if test ! -r "$IMAP_DIR/c-client/libc-client.a" && test -r "$IMAP_DIR/c-client/c-client.a" ; then 33- ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 34- elif test ! -r "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" && test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then 35- ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1 36- fi 37- 38- for lib in c-client4 c-client imap; do 39+ for lib in /usr/lib c-client4 c-client imap; do 40 IMAP_LIB=$lib 41 IMAP_LIB_CHK($PHP_LIBDIR) 42 IMAP_LIB_CHK(c-client) 43-- 442.25.1 45 46