--- ext/imap/config.m4	2006-12-18 16:41:28.000000000 +0100
+++ ext/imap/config.m4.oden	2006-12-18 18:11:11.000000000 +0100
@@ -158,20 +158,14 @@
       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
-      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_LIBNAME/c-client.a"; then
-      ln -s "$IMAP_DIR/$PHP_LIBNAME/c-client.a" "$IMAP_DIR/$PHP_LIBNAME/libc-client.a" >/dev/null 2>&1
-    fi
-
-    for lib in c-client4 c-client imap; do
+    for lib in c-client-php; do
       IMAP_LIB=$lib
       IMAP_LIB_CHK($PHP_LIBNAME)
-      IMAP_LIB_CHK(c-client)
+      IMAP_LIB_CHK(c-client-php)
     done
 
     if test -z "$IMAP_LIBDIR"; then
-      AC_MSG_ERROR(Cannot find imap library (libc-client.a). Please check your c-client installation.)
+      AC_MSG_ERROR(Cannot find imap library (libc-client-php.so). Please check your c-client installation.)
     fi
 
     PHP_ADD_INCLUDE($IMAP_INC_DIR)