diff options
| author | Russ Allbery <eagle@eyrie.org> | 2014-07-16 13:46:50 -0700 |
|---|---|---|
| committer | Russ Allbery <eagle@eyrie.org> | 2014-07-16 13:46:50 -0700 |
| commit | 1796d631f0846ec98cd286bc4284898a7300ee78 (patch) | |
| tree | 6fd42de6dc858ef06c6d270410c32ec61f39e593 /m4/remctl.m4 | |
| parent | f5194217566a6f4cdeffbae551153feb1412210d (diff) | |
| parent | 6409733ee3b7b1910dc1c166a392cc628834146c (diff) | |
Merge tag 'upstream/1.1' into debian
Upstream version 1.1
Conflicts:
NEWS
README
client/keytab.c
perl/lib/Wallet/ACL.pm
perl/sql/Wallet-Schema-0.08-PostgreSQL.sql
perl/t/general/admin.t
perl/t/verifier/ldap-attr.t
Change-Id: I1a1dc09b97c9258e61f1c8877d0837193c8ae2c6
Diffstat (limited to 'm4/remctl.m4')
| -rw-r--r-- | m4/remctl.m4 | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/m4/remctl.m4 b/m4/remctl.m4 index 588404f..c2fbf9a 100644 --- a/m4/remctl.m4 +++ b/m4/remctl.m4 @@ -13,11 +13,11 @@ dnl RRA_LIB_REMCTL_RESTORE to restore those settings to before the last dnl RRA_LIB_REMCTL_SWITCH. HAVE_REMCTL will always be defined if dnl RRA_LIB_REMCTL is used. dnl -dnl Provides the RRA_LIB_REMCTL_OPTIONAL macro, which should be used if -dnl Kerberos support is optional. This macro will still always est the -dnl substitution variables, but they'll be empty unless --with-remctl is -dnl given. HAVE_REMCTL will be defined if --with-remctl is given and -dnl $rra_use_remctl will be set to "true". +dnl Provides the RRA_LIB_REMCTL_OPTIONAL macro, which should be used if remctl +dnl support is optional. This macro will still always set the substitution +dnl variables described above, but they'll be empty unless remctl libraries +dnl are found. Defines HAVE_REMCTL and sets rra_use_remctl to true if the +dnl remctl library is found. dnl dnl Depends on RRA_ENABLE_REDUCED_DEPENDS, RRA_SET_LDFLAGS, and dnl RRA_LIB_GSSAPI. @@ -25,8 +25,8 @@ dnl dnl The canonical version of this file is maintained in the rra-c-util dnl package, available at <http://www.eyrie.org/~eagle/software/rra-c-util/>. dnl -dnl Written by Russ Allbery <rra@stanford.edu> -dnl Copyright 2008, 2009, 2011 +dnl Written by Russ Allbery <eagle@eyrie.org> +dnl Copyright 2008, 2009, 2011, 2013 dnl The Board of Trustees of the Leland Stanford Junior University dnl dnl This file is free software; the authors give unlimited permission to copy @@ -119,6 +119,7 @@ AC_DEFUN([RRA_LIB_REMCTL], [AS_IF([test x"$withval" != xyes && test x"$withval" != xno], [rra_remctl_libdir="$withval"])]) _RRA_LIB_REMCTL_INTERNAL([true]) + rra_use_remctl=true AC_DEFINE([HAVE_REMCTL], 1, [Define to enable remctl features.])]) dnl The main macro for packages with optional remctl support. |