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 | 46 |
1 files changed, 46 insertions, 0 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 new file mode 100644 index 000000000..da04c2d95 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | Upstream-status: Unknown | ||
2 | |||
3 | diff --git a/acinclude.m4 b/acinclude.m4 | ||
4 | index df11abd..06e7236 100644 | ||
5 | --- a/acinclude.m4 | ||
6 | +++ b/acinclude.m4 | ||
7 | @@ -2357,7 +2357,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ | ||
8 | PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" | ||
9 | fi | ||
10 | |||
11 | - for i in $PHP_OPENSSL_DIR; do | ||
12 | + for i in $PHP_OPENSSL_DIR $PHP_OPENSSL_DIR/usr; do | ||
13 | if test -r $i/include/openssl/evp.h; then | ||
14 | OPENSSL_INCDIR=$i/include | ||
15 | fi | ||
16 | diff --git a/ext/imap/config.m4 b/ext/imap/config.m4 | ||
17 | index 3fcf674..f08caf7 100644 | ||
18 | --- a/ext/imap/config.m4 | ||
19 | +++ b/ext/imap/config.m4 | ||
20 | @@ -109,7 +109,7 @@ if test "$PHP_IMAP" != "no"; then | ||
21 | PHP_NEW_EXTENSION(imap, php_imap.c, $ext_shared) | ||
22 | AC_DEFINE(HAVE_IMAP,1,[ ]) | ||
23 | |||
24 | - for i in $PHP_IMAP /usr/local /usr; do | ||
25 | + for i in $PHP_IMAP $PHP_IMAP/usr /usr/local /usr; do | ||
26 | IMAP_INC_CHK() | ||
27 | el[]IMAP_INC_CHK(/include/c-client) | ||
28 | el[]IMAP_INC_CHK(/include/imap) | ||
29 | @@ -198,13 +198,7 @@ if test "$PHP_IMAP" != "no"; then | ||
30 | AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.) | ||
31 | fi | ||
32 | |||
33 | - if test ! -r "$IMAP_DIR/c-client/libc-client.a" && test -r "$IMAP_DIR/c-client/c-client.a" ; then | ||
34 | - ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 | ||
35 | - elif test ! -r "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" && test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then | ||
36 | - ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1 | ||
37 | - fi | ||
38 | - | ||
39 | - for lib in c-client4 c-client imap; do | ||
40 | + for lib in /usr/lib c-client4 c-client imap; do | ||
41 | IMAP_LIB=$lib | ||
42 | IMAP_LIB_CHK($PHP_LIBDIR) | ||
43 | IMAP_LIB_CHK(c-client) | ||
44 | -- | ||
45 | 1.9.3 | ||
46 | |||