From 3bde02595b061e4fd77f5bb453e5decca5a50d85 Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Sat, 22 Jun 2013 19:34:13 +0100 Subject: [PATCH] build-sys: mark block begin and ends Done with Egyptian brackets, or K&R style as they are also known. Change-Id: Ifeaf3ca29be5d4846738ec937ce07728771c5f16 Reviewed-on: http://gerrit.openafs.org/10010 Reviewed-by: Simon Wilkinson Tested-by: BuildBot Reviewed-by: Derrick Brashear --- configure.ac | 52 +++++++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/configure.ac b/configure.ac index 71305d7e0c..aed59c105a 100644 --- a/configure.ac +++ b/configure.ac @@ -59,28 +59,32 @@ 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_MEMBERS([krb5_creds.keyblock, krb5_creds.keyblock.enctype, krb5_creds.session, @@ -90,9 +94,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])