diff options
| author | Adam Harvey <aharvey@php.net> | 2013-09-20 14:21:28 -0700 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2013-09-20 14:21:28 -0700 |
| commit | 9e3bedcd73265acb3d190c894860bd9aa1015121 (patch) | |
| tree | 854b62d9f3d6a6d9b4e7498070a36390e8b73ed3 | |
| parent | ac562b027b1a588d9a8f145cd0d89f3c03450825 (diff) | |
| parent | 3f64d35559241fa69b95052faaa4ae93e745c1c6 (diff) | |
| download | php-git-9e3bedcd73265acb3d190c894860bd9aa1015121.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
Fix the broken sh syntax in ext/imap/config.m4.
| -rw-r--r-- | ext/imap/config.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
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 |