cvs: /php4/ext/imap config.m4

sas Fri Apr 28 10:14:20 2000 EDT Modified files: /php4/ext/imap config.m4 Log: Improve imap-lib check Index: php4/ext/imap/config.m4 diff -u php4/ext/imap/config.m4:1.16 php4/ext/imap/config.m4:1.17 --- php4/ext/imap/config.m4:1.16 Sun Mar 5 11:48:23 2000 +++ php4/ext/imap/config.m4 Fri Apr 28 10:13:50 2000 @@ -1,12 +1,15 @@ -dnl $Id: config.m4,v 1.16 2000/03/05 19:48:23 hholzgra Exp $ +dnl $Id: config.m4,v 1.17 2000/04/28 17:13:50 sas Exp $ AC_DEFUN(IMAP_INC_CHK,[if test -r $i$1/rfc822.h; then IMAP_DIR=$i; IMAP_INC_DIR=$i$1]) + AC_DEFUN(IMAP_LIB_CHK,[ - str="$IMAP_DIR/$1/lib$lib." - if test "echo $str*" != $str'*'; then - IMAP_LIB_DIR=$IMAP_DIR/$1 - break 2 - fi + str="$IMAP_DIR/$1/lib$lib.*" + for i in echo $str; do + if test -r $i; then + IMAP_LIB_DIR=$IMAP_DIR/$1 + break 2 + fi + done ]) RESULT=no @@ -35,7 +38,7 @@ ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 fi - for lib in imap c-client c-client4; do + for lib in imap c-client4 c-client; do IMAP_LIB=$lib IMAP_LIB_CHK(lib) IMAP_LIB_CHK(c-client)