diff options
| author | Christopher Jones <sixd@php.net> | 2013-09-20 17:09:47 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-09-20 17:09:47 -0700 |
| commit | 34fc79bd6184a7e9412823e0247a10b8e777c7b0 (patch) | |
| tree | de239fd82c83d251d36c05d581a17ec7e6444f0d | |
| parent | d5ba2d8a99653521ff6a7997bf9aabe2b016c89a (diff) | |
| parent | cc66eaa04b123bdfb6aaa7305713fa508640999e (diff) | |
| download | php-git-34fc79bd6184a7e9412823e0247a10b8e777c7b0.tar.gz | |
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
# By Adam Harvey
# Via Adam Harvey
* 'PHP-5.4' of https://git.php.net/repository/php-src:
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
@@ -15,6 +15,10 @@ PHP NEWS . Fixed bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names). (Syra) +- IMAP: + . Fixed bug #65721 (configure script broken in 5.5.4 and 5.4.20 when enabling + imap). (ryotakatsuki at gmail dot com) + ?? ??? 2013, PHP 5.4.20 - Core: diff --git a/ext/imap/config.m4 b/ext/imap/config.m4 index d4dcd4c8ad..3fcf6742da 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 |