Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From c084c8349d1780980e232cb28b60a109e3d89438 Mon Sep 17 00:00:00 2001 |
| 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
| 3 | Date: Wed, 2 Nov 2011 16:54:57 +0100 |
Armin Kuster | 066be20 | 2018-07-08 14:58:53 -0700 | [diff] [blame] | 4 | Subject: [PATCH] Upstream-Status: Pending |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5 | |
| 6 | --- |
| 7 | acinclude.m4 | 2 +- |
| 8 | ext/imap/config.m4 | 10 ++-------- |
| 9 | 2 files changed, 3 insertions(+), 9 deletions(-) |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 10 | |
| 11 | diff --git a/acinclude.m4 b/acinclude.m4 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 12 | index ad5166e..f6a55ec 100644 |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 13 | --- a/acinclude.m4 |
| 14 | +++ b/acinclude.m4 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 15 | @@ -2350,7 +2350,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 16 | PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" |
| 17 | fi |
| 18 | |
| 19 | - for i in $PHP_OPENSSL_DIR; do |
| 20 | + for i in $PHP_OPENSSL_DIR $PHP_OPENSSL_DIR/usr; do |
| 21 | if test -r $i/include/openssl/evp.h; then |
| 22 | OPENSSL_INCDIR=$i/include |
| 23 | fi |
| 24 | diff --git a/ext/imap/config.m4 b/ext/imap/config.m4 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 25 | index badb6e2..8ff803c 100644 |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 26 | --- a/ext/imap/config.m4 |
| 27 | +++ b/ext/imap/config.m4 |
| 28 | @@ -109,7 +109,7 @@ if test "$PHP_IMAP" != "no"; then |
| 29 | PHP_NEW_EXTENSION(imap, php_imap.c, $ext_shared) |
| 30 | AC_DEFINE(HAVE_IMAP,1,[ ]) |
| 31 | |
| 32 | - for i in $PHP_IMAP /usr/local /usr; do |
| 33 | + for i in $PHP_IMAP $PHP_IMAP/usr /usr/local /usr; do |
| 34 | IMAP_INC_CHK() |
| 35 | el[]IMAP_INC_CHK(/include/c-client) |
| 36 | el[]IMAP_INC_CHK(/include/imap) |
| 37 | @@ -198,13 +198,7 @@ if test "$PHP_IMAP" != "no"; then |
| 38 | AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.) |
| 39 | fi |
| 40 | |
| 41 | - if test ! -r "$IMAP_DIR/c-client/libc-client.a" && test -r "$IMAP_DIR/c-client/c-client.a" ; then |
| 42 | - ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 |
| 43 | - elif test ! -r "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" && test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then |
| 44 | - ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1 |
| 45 | - fi |
| 46 | - |
| 47 | - for lib in c-client4 c-client imap; do |
| 48 | + for lib in /usr/lib c-client4 c-client imap; do |
| 49 | IMAP_LIB=$lib |
| 50 | IMAP_LIB_CHK($PHP_LIBDIR) |
| 51 | IMAP_LIB_CHK(c-client) |