summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Harvey <aharvey@php.net>2013-09-20 14:15:19 -0700
committerAdam Harvey <aharvey@php.net>2013-09-20 14:15:19 -0700
commitcc66eaa04b123bdfb6aaa7305713fa508640999e (patch)
treede239fd82c83d251d36c05d581a17ec7e6444f0d
parentd5ba2d8a99653521ff6a7997bf9aabe2b016c89a (diff)
downloadphp-git-cc66eaa04b123bdfb6aaa7305713fa508640999e.tar.gz
Fix the broken sh syntax in ext/imap/config.m4.
Patch by ryotakatsuki at gmail dot com. Fixes bug #65721 (configure script broken in 5.5.4 and 5.4.20 when enabling imap).
-rw-r--r--NEWS4
-rw-r--r--ext/imap/config.m44
2 files changed, 6 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 6d94980fbc..bb170e7fcf 100644
--- a/NEWS
+++ b/NEWS
@@ -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