aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.in13
2 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index be912cf0e0..49bfefeacb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-30 Dan Winship <danw@helixcode.com>
+
+ * configure.in: fix up printing of kerberos configuration status
+
2000-10-27 Christopher James Lahey <clahey@helixcode.com>
* configure.in: Require gal cvs version.
diff --git a/configure.in b/configure.in
index 8245c40778..459b3634fd 100644
--- a/configure.in
+++ b/configure.in
@@ -417,6 +417,7 @@ dnl Kerberos
dnl ********
AC_ARG_WITH(krb5, [ --with-krb5=PREFIX Location of Kerberos 5 libs/includes])
AC_ARG_WITH(krb4, [ --with-krb4=PREFIX Location of Kerberos 4 libs/includes])
+msg_krb5=No
if test x${with_krb5:=no} != xno; then
CFLAGS_save="$CFLAGS"
LDFLAGS_save="$LDFLAGS"
@@ -427,6 +428,7 @@ if test x${with_krb5:=no} != xno; then
AC_DEFINE(HAVE_KRB5)
KRB5_CFLAGS="$CFLAGS"
KRB5_LDFLAGS="$LDFLAGS -lkrb5 -lk5crypto -lcom_err"
+ msg_krb5=Yes
],[
AC_MSG_WARN([A sample Kerberos 5 program could not be compiled with the
Kerberos found in $with_krb5. Please verify that the prefix is correct.])
@@ -439,6 +441,7 @@ else
AC_MSG_RESULT($with_krb5)
fi
+msg_krb4=No
if test x${with_krb4:=no} != xno; then
CFLAGS_save="$CFLAGS"
LDFLAGS_save="$LDFLAGS"
@@ -454,18 +457,21 @@ if test x${with_krb4:=no} != xno; then
AC_DEFINE(HAVE_KRB4)
KRB4_CFLAGS="$CFLAGS"
KRB4_LDFLAGS="$LDFLAGS -lkrb"
+ msg_krb4=Yes
],[
AC_CHECK_LIB(krb, krb_rd_req,
[
AC_DEFINE(HAVE_KRB4)
KRB4_CFLAGS="$CFLAGS"
KRB4_LDFLAGS="$LDFLAGS -lkrb -ldes"
+ msg_krb4=Yes
],[
AC_CHECK_LIB(krb4, krb_mk_req,
[
AC_DEFINE(HAVE_KRB4)
KRB4_CFLAGS="$CFLAGS"
KRB4_LDFLAGS="$LDFLAGS -lkrb4 -ldes425 $KRB5_LDFLAGS"
+ msg_krb4=Yes
],[
AC_MSG_WARN([A sample Kerberos 4 program could not be compiled with the
Kerberos found in $with_krb4. Please verify that the prefix is correct.])
@@ -660,18 +666,13 @@ doc/devel/calendar/cal-client/Makefile
doc/devel/calendar/cal-util/Makefile
])
-msg_kerberos=$msg_krb4/$msg_krb5
-if test x$msg_kerberos = /; then
- msg_kerberos=""
-fi
-
echo "
Evolution has been configured as follows:
Mail Directory: $system_mail_dir
LDAP support: $msg_ldap
Pilot conduits: $msg_pilot
- Kerberos 4/5: $msg_kerberos
+ Kerberos 4/5: $msg_krb4/$msg_krb5
Use movemail: $with_movemail
Crypto support: $priv
"