Commit:    cc66eaa04b123bdfb6aaa7305713fa508640999e
Author:    Adam Harvey <ahar...@php.net>         Fri, 20 Sep 2013 14:15:19 -0700
Parents:   d5ba2d8a99653521ff6a7997bf9aabe2b016c89a
Branches:  PHP-5.4 PHP-5.5 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=cc66eaa04b123bdfb6aaa7305713fa508640999e

Log:
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).

Bugs:
https://bugs.php.net/65721

Changed paths:
  M  NEWS
  M  ext/imap/config.m4


Diff:
diff --git a/NEWS b/NEWS
index 6d94980..bb170e7 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 d4dcd4c..3fcf674 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


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to