diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-08-24 21:40:52 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-08-24 21:40:52 -0700 |
| commit | 286c745d81798cd794acf281bccfef66e97e0872 (patch) | |
| tree | 6c6198717e7378272e025be5be52a611d67b505d | |
| parent | 2139d2702d26e62f220f24e268d8ea1e09a9ee64 (diff) | |
| parent | 6b8dade6dc7709cbd890b3e7bbf447c6bb241637 (diff) | |
| download | php-git-286c745d81798cd794acf281bccfef66e97e0872.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Stricter libc-client symlink check
| -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 3efc245901..d7deae1026 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/c-client.a"; then + if test ! -r "$IMAP_DIR/c-client/libc-client.a" && -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/c-client.a"; then + elif test ! -r "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" && -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 |