Commit:    6b8dade6dc7709cbd890b3e7bbf447c6bb241637
Author:    Ole Markus With <olemar...@olemarkus.org>         Thu, 22 Aug 2013 
08:59:33 +0200
Committer: Stanislav Malyshev <s...@php.net>      Sat, 24 Aug 2013 21:40:26 
-0700
Parents:   3f9af558e78c9904f72933dfb3c735a9d2119b52
Branches:  PHP-5.4 PHP-5.5 master

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

Log:
Stricter libc-client symlink check

Changed paths:
  M  ext/imap/config.m4


Diff:
diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
index 3ad7c10..d4dcd4c 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


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

Reply via email to