mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-02 11:47:31 +00:00
Koen Kooi
42 lines
1.7 KiB
Diff
42 lines
1.7 KiB
Diff
Index: php-5.2.11/ext/imap/config.m4
|
|
===================================================================
|
|
--- php-5.2.11.orig/ext/imap/config.m4 2009-12-10 12:27:52.800974533 -0700
|
|
+++ php-5.2.11/ext/imap/config.m4 2009-12-10 12:28:33.720976583 -0700
|
|
@@ -103,7 +103,7 @@
|
|
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)
|
|
@@ -192,13 +192,7 @@
|
|
AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.)
|
|
fi
|
|
|
|
- if 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/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)
|
|
Index: php-5.2.11/acinclude.m4
|
|
===================================================================
|
|
--- php-5.2.11.orig/acinclude.m4 2009-12-10 12:37:13.134722881 -0700
|
|
+++ php-5.2.11/acinclude.m4 2009-12-10 12:37:39.342007053 -0700
|
|
@@ -2338,7 +2338,7 @@
|
|
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
|