Patch php-imap-configure-error.patch for Compile Failure Bug #65721

Patch version 2013-09-20 09:45 UTC

• 2013-09-20 09:45 UTC [diff to current]

Developer: ryotakatsuki@gmail.com

diff -ru php-5.5.4/configure php-5.5.4.old/configure
--- php-5.5.4/configure	2013-09-18 18:20:37.000000000 +0200
+++ php-5.5.4.old/configure	2013-09-20 11:36:25.953723896 +0200
@@ -47838,9 +47838,9 @@
       as_fn_error $? "Cannot find rfc822.h. Please check your c-client installation." "$LINENO" 5
     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
 
diff -ru php-5.5.4/ext/imap/config.m4 php-5.5.4.old/ext/imap/config.m4
--- php-5.5.4/ext/imap/config.m4	2013-09-18 15:08:04.000000000 +0200
+++ php-5.5.4.old/ext/imap/config.m4	2013-09-20 11:40:10.405719631 +0200
@@ -198,9 +198,9 @@
       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