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/remctl.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/remctl.m4')
| -rw-r--r-- | m4/remctl.m4 | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/m4/remctl.m4 b/m4/remctl.m4 index 2941f19..5cebc68 100644 --- a/m4/remctl.m4 +++ b/m4/remctl.m4 @@ -13,6 +13,7 @@ dnl This macro depends on RRA_ENABLE_REDUCED_DEPENDS and RRA_LIB_GSSAPI. dnl dnl Written by Russ Allbery <rra@stanford.edu> dnl Copyright 2008 Board of Trustees, Leland Stanford Jr. University +dnl dnl See LICENSE for licensing terms. dnl Set CPPFLAGS, LDFLAGS, and LIBS to values including the Kerberos v5 @@ -48,20 +49,20 @@ AC_DEFUN([_RRA_LIB_REMCTL_PATHS], dnl The main macro. AC_DEFUN([RRA_LIB_REMCTL], [AC_REQUIRE([RRA_ENABLE_REDUCED_DEPENDS]) -rra_remctl_root= -REMCTL_CPPFLAGS= -REMCTL_LDFLAGS= -REMCTL_LIBS= -AC_SUBST([REMCTL_CPPFLAGS]) -AC_SUBST([REMCTL_LDFLAGS]) -AC_SUBST([REMCTL_LIBS]) -AC_ARG_WITH([remctl], + rra_remctl_root= + REMCTL_CPPFLAGS= + REMCTL_LDFLAGS= + REMCTL_LIBS= + AC_SUBST([REMCTL_CPPFLAGS]) + AC_SUBST([REMCTL_LDFLAGS]) + AC_SUBST([REMCTL_LIBS]) + AC_ARG_WITH([remctl], [AC_HELP_STRING([--with-remctl=DIR], [Location of remctl headers and libraries])], [AS_IF([test x"$withval" != xyes && test x"$withval" != xno], [rra_remctl_root="$withval"])]) -_RRA_LIB_REMCTL_PATHS -AS_IF([test x"$rra_reduced_depends" = xtrue], + _RRA_LIB_REMCTL_PATHS + AS_IF([test x"$rra_reduced_depends" = xtrue], [REMCTL_LIBS="-lremctl"], [RRA_LIB_GSSAPI REMCTL_CPPFLAGS="$REMCTL_CPPFLAGS $GSSAPI_CPPFLAGS" |