+# Check whether --with-cyrus-sasl or --without-cyrus-sasl was given.
+if test "${with_cyrus_sasl+set}" = set; then
+ withval="$with_cyrus_sasl"
+ :
+fi
+
+if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != "no"; then
+ cat >> confdefs.h <<\EOF
+#define CYRUS_SASL 1
+EOF
+fi
+
+# Check whether --with-editor or --without-editor was given.
+if test "${with_editor+set}" = set; then
+ withval="$with_editor"
+ :
+fi
+
+
+if test -n "$with_editor"; then
+ editorpath="$with_editor"
+fi
+