Also consider $i/include while searching for rfc822.h

diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
index a622f9214d1dd24d967a22bcc94e9856b30257fc..88de9d7bd04295d56addebc6e273446097e28fa6 100644 (file)
--- a/ext/imap/config.m4
+++ b/ext/imap/config.m4
@@ -1,5 +1,7 @@
 dnl $Id$
 
+AC_DEFUN(IMAP_INC_CHK,[if test -r $i$1/rfc822.h; then IMAP_DIR=$i; IMAP_INC_DIR=$i$1])
+
 RESULT=no
 AC_MSG_CHECKING(for IMAP support)
 AC_ARG_WITH(imap,
@@ -8,16 +10,11 @@ AC_ARG_WITH(imap,
 [
   if test "$withval" != "no"; then  
     for i in /usr/local /usr $withval; do
-        if test -f $i/rfc822.h; then
-          IMAP_DIR=$i
-          IMAP_INC_DIR=$i
-        elif test -f $i/imap/rfc822.h; then
-          IMAP_DIR=$i
-          IMAP_INC_DIR=$i/imap
-        elif test -f $i/c-client/rfc822.h; then
-          IMAP_DIR=$i
-          IMAP_INC_DIR=$i/c-client
-        fi
+      IMAP_INC_CHK()
+      el[]IMAP_INC_CHK(/include)
+      el[]IMAP_INC_CHK(/imap)
+      el[]IMAP_INC_CHK(/c-client)
+      fi
     done
 
     AC_EXPAND_PATH($IMAP_DIR, IMAP_DIR)