diff options
| author | Adam Harvey <aharvey@php.net> | 2013-09-20 14:19:01 -0700 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2013-09-20 14:19:01 -0700 |
| commit | 3f64d35559241fa69b95052faaa4ae93e745c1c6 (patch) | |
| tree | 86edda0576cf8cefb1ebf683c0f32aabd17ffc18 | |
| parent | 8f146c2bb0dcba3307f08a839554be056e660f34 (diff) | |
| parent | cc66eaa04b123bdfb6aaa7305713fa508640999e (diff) | |
| download | php-git-3f64d35559241fa69b95052faaa4ae93e745c1c6.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix the broken sh syntax in ext/imap/config.m4.
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/imap/config.m4 | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -17,6 +17,10 @@ PHP NEWS . Ensure that the defined interpolation method is used with the generic scaling methods. (Pierre) +- IMAP: + . Fixed bug #65721 (configure script broken in 5.5.4 and 5.4.20 when enabling + imap). (ryotakatsuki at gmail dot com) + - OPcache: . Fixed bug #65665 (Exception not properly caught when opcache enabled). (Laruence) diff --git a/ext/imap/config.m4 b/ext/imap/config.m4 index d7deae1026..d664215e66 100644 --- a/ext/imap/config.m4 +++ b/ext/imap/config.m4 @@ -198,9 +198,9 @@ 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" && -r "$IMAP_DIR/c-client/c-client.a" ; then + 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" && -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then + 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 |