From: Chong Yidong <cyd@stupidchicken.com>
Date: Mon, 19 Mar 2007 01:05:29 +0000 (+0000)
Subject: Don't define KERBEROS, KERBEROS5, or HESIOD if the user specifies
X-Git-Tag: emacs-pretest-22.0.96~62
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ae61688f89ef63104eb2b7c2ef0738ecd17d9b9f;p=emacs.git

Don't define KERBEROS, KERBEROS5, or HESIOD if the user specifies
"without".
---

diff --git a/configure.in b/configure.in
index e9ffb8d9be8..842002d33a1 100644
--- a/configure.in
+++ b/configure.in
@@ -54,7 +54,9 @@ AC_DEFINE(MAIL_USE_POP))
 AH_TEMPLATE(MAIL_USE_POP, [Define to support POP mail retrieval.])dnl
 AC_ARG_WITH(kerberos,
 [  --with-kerberos         support Kerberos-authenticated POP],
-[AC_DEFINE(KERBEROS)])
+[if test "$withval" = yes; then
+   AC_DEFINE(KERBEROS)
+fi])
 AH_TEMPLATE(KERBEROS,
 	    [Define to support Kerberos-authenticated POP mail retrieval.])dnl
 AC_ARG_WITH(kerberos5,
@@ -64,11 +66,13 @@ AC_ARG_WITH(kerberos5,
     with_kerberos=yes
     AC_DEFINE(KERBEROS)
   fi
-fi
-AC_DEFINE(KERBEROS5, 1, [Define to use Kerberos 5 instead of Kerberos 4.])])
+  AC_DEFINE(KERBEROS5, 1, [Define to use Kerberos 5 instead of Kerberos 4.])
+fi])
 AC_ARG_WITH(hesiod,
 [  --with-hesiod           support Hesiod to get the POP server host],
-[AC_DEFINE(HESIOD, 1, [Define to support using a Hesiod database to find the POP server.])])
+[if test "$withval" = yes; then
+  AC_DEFINE(HESIOD, 1, [Define to support using a Hesiod database to find the POP server.])
+fi])
 
 AC_ARG_WITH(sound,
 [  --without-sound         don't compile with sound support])