Remove RCS keywords, since they no longer work after git migration.

[mmh] / configure.in

diff --git a/configure.in b/configure.in
index 7730717..f866c0a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,6 @@
 dnl
 dnl configure.in -- autoconf template for nmh
 dnl
-dnl $Id$
-dnl
 
 dnl Move this up a bit
 AC_PREREQ(2.61)
@@ -107,6 +105,10 @@ AC_ARG_WITH(cyrus-sasl, AS_HELP_STRING([--with-cyrus-sasl],
 if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != x"no"; then
   AC_DEFINE(CYRUS_SASL, 1,
     [Define to use the Cyrus SASL library for authentication of POP and SMTP.])dnl
+  if test x"$with_cyrus_sasl" != xyes; then
+    AC_MSG_WARN([Arguments to --with-cyrus-sasl now ignored])
+    AC_MSG_WARN([Please pass the appropriate arguments to CPPFLAGS/LDFLAGS])
+  fi
   sasl_support=yes
 else
   sasl_support=no
@@ -704,7 +706,7 @@ dnl CHECK FOR CYRUS-SASL
 dnl --------------------
 
 AS_IF([test x"$sasl_support" = x"yes"],[
-  AC_CHECK_HEADER([sasl.h], , [AC_MSG_ERROR([sasl.h not found])])
+  AC_CHECK_HEADER([sasl/sasl.h], , [AC_MSG_ERROR([sasl.h not found])])
   AC_CHECK_LIB([sasl2], [sasl_client_new], ,
     [AC_MSG_ERROR([Cyrus SASL library not found])])])