diff options
| author | Russ Allbery <rra@stanford.edu> | 2008-04-24 02:02:49 +0000 |
|---|---|---|
| committer | Russ Allbery <rra@stanford.edu> | 2008-04-24 02:02:49 +0000 |
| commit | 92ff7f21ad0b167f8d742a9d7b5f93704a57619c (patch) | |
| tree | 7adae5f227b6463e07d5cd0f1dab82b7f1c6be47 /m4/krb4.m4 | |
| parent | 34c58f9471b3df4fa8b719b3c3534940ba5cfe1b (diff) | |
Major coding style cleanup. Updated all shared code from my other
projects.
The configure option requesting AFS kaserver support (and thus
building kasetkey) is now --with-kaserver instead of --with-afs.
If KRB5_CONFIG was explicitly set in the environment, don't use a
different krb5-config based on --with-krb4 or --with-krb5. If
krb5-config isn't executable, don't use it. This allows one to
force library probing by setting KRB5_CONFIG to point to a
nonexistent file.
Sanity-check the results of krb5-config before proceeding and error
out in configure if they don't work.
Stop setting Stanford-specific compile-time defaults for the wallet
server and port.
Diffstat (limited to 'm4/krb4.m4')
| -rw-r--r-- | m4/krb4.m4 | 15 |
1 files changed, 12 insertions, 3 deletions
@@ -104,6 +104,14 @@ AC_DEFUN([_RRA_LIB_KRB4_EXTRA], AC_CHECK_HEADERS([kerberosIV/krb.h]) RRA_LIB_KRB4_RESTORE]) +dnl Sanity-check the results of krb5-config and be sure we can really link a +dnl Kerberos program. +AC_DEFUN([_RRA_LIB_KRB4_CHECK], +[RRA_LIB_KRB4_SWITCH + AC_CHECK_FUNC([krb_get_svc_in_tkt], , + [AC_MSG_FAILURE([krb5-config results fail for Kerberos v4])]) + RRA_LIB_KRB4_RESTORE]) + dnl The main macro. AC_DEFUN([RRA_LIB_KRB4], [AC_REQUIRE([RRA_ENABLE_REDUCED_DEPENDS]) @@ -123,11 +131,11 @@ AS_IF([test x"$rra_reduced_depends" = xtrue], [_RRA_LIB_KRB4_PATHS _RRA_LIB_KRB4_REDUCED], [AC_ARG_VAR([KRB5_CONFIG], [Path to krb5-config]) - AS_IF([test x"$rra_krb4_root" != x], + AS_IF([test x"$rra_krb4_root" != x && test -z "$KRB5_CONFIG"], [AS_IF([test -x "${rra_krb4_root}/bin/krb5-config"], [KRB5_CONFIG="${rra_krb4_root}/bin/krb5-config"])], [AC_PATH_PROG([KRB5_CONFIG], [krb5-config])]) - AS_IF([test x"$KRB5_CONFIG" != x], + AS_IF([test x"$KRB5_CONFIG" != x && test -x "$KRB5_CONFIG"], [AC_CACHE_CHECK([for krb4 support in krb5-config], [rra_cv_lib_krb4_config], [AS_IF(["$KRB5_CONFIG" | grep krb4 > /dev/null 2>&1], @@ -138,7 +146,8 @@ AS_IF([test x"$rra_reduced_depends" = xtrue], KRB4_LIBS=`"$KRB5_CONFIG" --libs krb4`], [_RRA_LIB_KRB4_PATHS _RRA_LIB_KRB4_MANUAL]) - KRB4_CPPFLAGS=`echo "$KRB5_CPPFLAGS" | sed 's%-I/usr/include ?%%'`], + KRB4_CPPFLAGS=`echo "$KRB5_CPPFLAGS" | sed 's%-I/usr/include ?%%'` + _RRA_LIB_KRB4_CHECK], [_RRA_LIB_KRB4_PATHS _RRA_LIB_KRB4_MANUAL])]) _RRA_LIB_KRB4_EXTRA]) |