volser: remove commented code

[openafs.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 71305d7..81a677a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -59,30 +59,39 @@ AS_IF([test x"$KRB5_LIBS" != x],
      MAKE_KRB5=
      RRA_LIB_KRB5_SWITCH
      AC_CHECK_FUNCS([add_error_table \
-        add_to_error_table \
-        encode_krb5_enc_tkt_part \
-        encode_krb5_ticket \
+       add_to_error_table \
+       encode_krb5_enc_tkt_part \
+       encode_krb5_ticket \
        krb5_524_conv_principal \
-        krb5_allow_weak_crypto \
-        krb5_c_encrypt \
-        krb5_decode_ticket \
-        krb5_enctype_enable \
-        krb5_get_init_creds_opt_alloc \
-        krb5_get_prompt_types \
-        krb5_princ_size \
-        krb5_principal_get_comp_string])
+       krb5_allow_weak_crypto \
+       krb5_c_encrypt \
+       krb5_decode_ticket \
+       krb5_enctype_enable \
+       krb5_get_init_creds_opt_alloc \
+       krb5_get_prompt_types \
+       krb5_princ_size \
+       krb5_principal_get_comp_string])
      AC_CHECK_FUNCS([krb5_524_convert_creds], [],
-        [AC_CHECK_FUNCS([krb524_convert_creds_kdc], [],
-             [AC_CHECK_LIB([krb524], [krb524_convert_creds_kdc],
-                 [LIBS="-lkrb524 $LIBS"
-                  KRB5_LIBS="-lkrb524 $KRB5_LIBS"
-                 AC_CHECK_LIB([krb524], [krb5_524_conv_principal],
-                 [AC_DEFINE([HAVE_KRB5_524_CONV_PRINCIPAL], 1,
-                    [Define to 1 if you have the `krb5_524_conv_principal' function.])])
-                  AC_DEFINE([HAVE_KRB524_CONVERT_CREDS_KDC], 1,
-                     [Define to 1 if you have the `krb524_convert_creds_kdc' function.])])])])
+       [AC_CHECK_FUNCS([krb524_convert_creds_kdc], [],
+           [AC_CHECK_LIB([krb524], [krb524_convert_creds_kdc],
+               [LIBS="-lkrb524 $LIBS"
+                KRB5_LIBS="-lkrb524 $KRB5_LIBS"
+                AC_CHECK_LIB([krb524], [krb5_524_conv_principal],
+                    [AC_DEFINE([HAVE_KRB5_524_CONV_PRINCIPAL], [1],
+                        [Define to 1 if you have the `krb5_524_conv_principal' function.])
+                ])
+                AC_DEFINE([HAVE_KRB524_CONVERT_CREDS_KDC], [1],
+                    [Define to 1 if you have the `krb524_convert_creds_kdc' function.])
+           ])
+       ])
+     ])
      AC_CHECK_HEADERS([kerberosIV/krb.h])
      AC_CHECK_HEADERS([kerberosV/heim_err.h])
+     AC_CHECK_HEADERS([com_err.h et/com_err.h krb5/com_err.h])
+     AS_IF([test x"$ac_cv_header_com_err_h" != xyes \
+             && test x"$ac_cv_header_et_com_err_h" != xyes \
+             && test x"$ac_cv_header_krb5_com_err_h" != xyes],
+       [AC_MSG_ERROR([Cannot find a usable com_err.h])])
      AC_CHECK_MEMBERS([krb5_creds.keyblock, krb5_creds.keyblock.enctype, krb5_creds.session,
                       krb5_prompt.type], [], [], [#include <krb5.h>])
 dnl If we have krb5_creds.session, we are using heimdal
@@ -90,9 +99,11 @@ dnl If we're using heimdal, aklog needs libasn1 for encode_EncTicketPart and a
 dnl few other functions. But just aklog; not any of the other stuff that uses
 dnl krb5.
      AS_IF([test x"$ac_cv_member_krb5_creds_session" = xyes],
-           [AC_CHECK_LIB([asn1], [encode_EncTicketPart],
-                       [AKLOG_KRB5_LIBS="-lasn1"])])
-     RRA_LIB_KRB5_RESTORE])
+          [AC_CHECK_LIB([asn1], [encode_EncTicketPart],
+              [AKLOG_KRB5_LIBS="-lasn1"])
+     ])
+     RRA_LIB_KRB5_RESTORE
+])
 AC_SUBST([BUILD_KRB5])
 AC_SUBST([MAKE_KRB5])
 AC_SUBST([AKLOG_KRB5_LIBS])
@@ -100,6 +111,9 @@ AC_SUBST([AKLOG_KRB5_LIBS])
 dnl Probe for GSSAPI
 RRA_LIB_GSSAPI
 
+dnl Checks for summary
+OPENAFS_SUMMARY_CHECK_NAMEI
+
 AS_IF([test -d 'doc/man-pages'],
     [MAN_MAKEFILE="doc/man-pages/Makefile doc/man-pages/install-man"],
     [MAN_MAKEFILE=])
@@ -273,4 +287,4 @@ AC_OUTPUT([
  chmod a+x src/config/shlib-install])
 
 # print a final summary
-SUMMARY
+OPENAFS_SUMMARY