Pacify autoheader and remove krb4 configure goo

diff --git a/configure.in b/configure.in
index b00c43c..e4c7e4a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -128,10 +128,10 @@ if test "x$with_krb5" != "xno" ; then
   if test -z "$KRB5_LDFLAGS"; then
      with_krb5=no
   else
-     AC_DEFINE(KRB5)
+     AC_DEFINE(KRB5,[Kerberos 5 enabled.])
      AC_CHECK_LIB(krb5,
                   krb5_cc_new_unique,
-                  [ AC_DEFINE(HAVE_KRB5_CC_NEW_UNIQUE) ])
+                  [ AC_DEFINE(HAVE_KRB5_CC_NEW_UNIQUE,[Have krb5_cc_new_unique]) ])
 
      # check for Heimdal
      have_heimdal=""
@@ -141,7 +141,7 @@ if test "x$with_krb5" != "xno" ; then
      AC_TRY_COMPILE([#include <krb5.h>],
                    [ char *tmp = heimdal_version; ],
                    [ AC_MSG_RESULT(yes)
-                     AC_DEFINE(HEIMDAL)
+                     AC_DEFINE(HEIMDAL,[Using the Heimdal implementation of Kerberos])
                      have_heimdal=yes ],
                    [ AC_MSG_RESULT(no) ])
      CFLAGS="$ac_save_CFLAGS"
@@ -194,7 +194,7 @@ int main(int argc, char** argv)
 }],
                 [ if test $? -eq 0; then 
                      AC_MSG_RESULT(yes)
-                     AC_DEFINE(GSSAPI_SUPPORTS_SPNEGO)
+                     AC_DEFINE(GSSAPI_SUPPORTS_SPNEGO,[GSS-API library supports SPNEGO])
                      gssapi_supports_spnego=yes 
                   else
                      AC_MSG_RESULT(no)
@@ -241,90 +241,6 @@ AC_SUBST(KRB5_CPPFLAGS)
 AC_SUBST(KRB5_LDFLAGS)
 AC_SUBST(SPNEGO_SRCS)
 
-#
-# Kerberos4 enviroment
-#
-
-AC_ARG_WITH(krb4,
-  AC_HELP_STRING([--with-krb4=dir], [use krb4 in dir]),
-  [ with_krb4="$withval" ])
-
-if test "x$with_krb4" = "xyes" ; then
-  with_krb4=""
-fi
-
-if test "x$with_krb4" != "xno"; then
-  AC_MSG_CHECKING([for Kerberos4 installation])
-  if test "x$with_krb4" != "x"; then
-     if test -x "$with_krb4/bin/krb4-config"; then
-        KRB4_CPPFLAGS=`$with_krb4/bin/krb4-config --cflags krb4 2>/dev/null`
-        KRB4_LDFLAGS=`$with_krb4/bin/krb4-config --libs krb4 2>/dev/null`
-     elif test -x "$with_krb4/bin/krb5-config"; then
-        KRB4_CPPFLAGS=`$with_krb4/bin/krb5-config --cflags krb4 2>/dev/null`
-        KRB4_LDFLAGS=`$with_krb4/bin/krb5-config --libs krb4 2>/dev/null`
-     else
-        AC_MSG_ERROR([failed to find krb4-config or krb5-config in $with_krb4/bin])
-     fi
-  else
-     KRB4_CPPFLAGS=`krb4-config --cflags krb4 2>/dev/null`
-     KRB4_LDFLAGS=`krb4-config --libs krb4 2>/dev/null`
-     if test "x$KRB4_LDFLAGS" = "x" -a -n "$krb5_config_command"; then
-        KRB4_CPPFLAGS=`$krb5_config_command --cflags krb4 2>/dev/null`
-        KRB4_LDFLAGS=`$krb5_config_command --libs krb4 2>/dev/null`
-        if test $? -ne 0; then
-           KRB4_CPPFLAGS=""
-           KRB4_LDFLAGS=""
-        fi
-     fi
-  fi
-  if test "x$KRB4_LDFLAGS" = "x"; then
-     with_krb4=no
-     AC_MSG_RESULT(no)
-  else
-     AC_MSG_RESULT(yes)
-
-     ac_save_CFLAGS=$CFLAGS
-     ac_save_CPPFLAGS=$CPPFLAGS
-     ac_save_LDFLAGS=$LDFLAGS
-     ac_save_LIBS=$LIBS
-     CFLAGS="$CFLAGS $KRB4_CPPFLAGS"
-     CPPFLAGS="$CFLAGS $KRB4_CPPFLAGS"
-     LDFLAGS="$LDFLAGS $KRB4_LDFLAGS"
-     LIBS="$LIBS $LDFLAGS $LIB_resolv"
-
-#    if not found krb.h suppose it's in the kerberosIV subdirectory
-     AC_CHECK_HEADER(krb.h, , with_krb4=no)
-     if test "x$with_krb4" = "xno"; then
-         KRB4_CPPFLAGS="$KRB4_CPPFLAGS ${KRB4_CPPFLAGS}/kerberosIV"
-#        second run of AC_CHECK_HEADER for the same library returns the cached
-#        result created by previous run :-(
-         AC_CHECK_HEADER(kerberosIV/krb.h, with_krb4=yes,
-                         [  with_krb4=no
-                            KRB4_CPPFLAGS=""
-                            KRB4_LDFLAGS=""])
-     fi
-
-     if test "x$with_krb4" != "xno"; then
-        AC_CHECK_LIB(krb4, krb_get_pw_in_tkt, [], [with_krb4=no])
-        if test "x$with_krb4" = "xno"; then
-           AC_CHECK_LIB(krb, krb_get_pw_in_tkt, [with_krb4=yes], 
-                        [with_krb4=no
-                         KRB4_CPPFLAGS=""
-                         KRB4_LDFLAGS=""])
-        fi
-     fi
-
-     CFLAGS=$ac_save_CFLAGS
-     CPPFLAGS=$ac_save_CPPFLAGS
-     LDFLAGS=$ac_save_LDFLAGS
-     LIBS=$ac_save_LIBS
-
-     AC_DEFINE(KRB4)
-  fi
-fi
-AC_SUBST(KRB4_CPPFLAGS)
-AC_SUBST(KRB4_LDFLAGS)
-
 
 if test "x$with_krb5" = "xno" -a "x$with_krb4" = "xno"; then
   AC_MSG_ERROR([No Kerberos enviroment found])