Use rra-c-util m4 from src/external
authorSimon Wilkinson <sxw@your-file-system.com>
Tue, 13 Sep 2011 08:54:12 +0000 (09:54 +0100)
committerDerrick Brashear <shadow@dementix.org>
Wed, 14 Sep 2011 17:34:51 +0000 (10:34 -0700)
This commit switches us over from using manually maintained copies
of Russ's rra-c-util m4 macros, to using ones that are automatically
imported from his upstream git tree.

The macro versioning in the OpenAFS tree was slightly confused. This
(approximately) updates us from using version 3.3 of the macros to
version 3.8. The signifcant changes are:

  *) Use PATH_KRB5_CONFIG rather than KRB5_CONFIG to set the location
     of the krb5-config file
  *) Use --with-gssapi-{include, lib} if given, rather than krb5-config
  *) Use --with-krb5-{include, lib} if given, rather than krb5-config
  *) Define HAVE_KERBEROS if we find a Kerberos library

The first, in particular, is likely to cause some confusion.

Change-Id: Ie7a1c0db31b32fc7ac9ad7bded2c4ffce3ac013f
Reviewed-on: http://gerrit.openafs.org/5418
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>

regen.sh
src/cf/gssapi.m4 [deleted file]
src/cf/krb5.m4 [deleted file]
src/cf/lib-depends.m4 [deleted file]
src/cf/lib-pathname.m4 [deleted file]
src/cf/pam-const.m4 [deleted file]

index 3adff88..055a62d 100755 (executable)
--- a/regen.sh
+++ b/regen.sh
@@ -17,9 +17,9 @@ done
 echo "Updating configuration..."
 echo "Running aclocal"
 if which aclocal > /dev/null 2>&1; then
-  aclocal -I src/cf
+  aclocal -I src/cf -I src/external/rra-c-util/m4
 elif which aclocal-1.10 > /dev/null 2>&1; then
-  aclocal-1.10 -I src/cf
+  aclocal-1.10 -I src/cf -I src/external/rra-c-util/m4
 else
   echo "No aclocal found on your system (looked for aclocal & aclocal-1.10)"
   exit 1
diff --git a/src/cf/gssapi.m4 b/src/cf/gssapi.m4
deleted file mode 100644 (file)
index 6c8c9b6..0000000
+++ /dev/null
@@ -1,174 +0,0 @@
-dnl Find the compiler and linker flags for GSS-API.
-dnl
-dnl Finds the compiler and linker flags for linking with GSS-API libraries.
-dnl Provides the --with-gssapi, --with-gssapi-include, and --with-gssapi-lib
-dnl configure option to specify a non-standard path to the GSS-API libraries.
-dnl Uses krb5-config where available unless reduced dependencies is requested.
-dnl
-dnl Provides the macro RRA_LIB_GSSAPI and sets the substitution variables
-dnl GSSAPI_CPPFLAGS, GSSAPI_LDFLAGS, and GSSAPI_LIBS.  Also provides
-dnl RRA_LIB_GSSAPI_SWITCH to set CPPFLAGS, LDFLAGS, and LIBS to include the
-dnl GSS-API libraries, saving the ecurrent values, and RRA_LIB_GSSAPI_RESTORE
-dnl to restore those settings to before the last RRA_LIB_GSSAPI_SWITCH.
-dnl
-dnl Depends on RRA_ENABLE_REDUCED_DEPENDS and RRA_SET_LDFLAGS.
-dnl
-dnl Written by Russ Allbery <rra@stanford.edu>
-dnl Copyright 2005, 2006, 2007, 2008, 2009, 2011
-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
-dnl and/or distribute it, with or without modifications, as long as this
-dnl notice is preserved.
-
-dnl Save the current CPPFLAGS, LDFLAGS, and LIBS settings and switch to
-dnl versions that include the GSS-API flags.  Used as a wrapper, with
-dnl RRA_LIB_GSSAPI_RESTORE, around tests.
-AC_DEFUN([RRA_LIB_GSSAPI_SWITCH],
-[rra_gssapi_save_CPPFLAGS="$CPPFLAGS"
- rra_gssapi_save_LDFLAGS="$LDFLAGS"
- rra_gssapi_save_LIBS="$LIBS"
- CPPFLAGS="$GSSAPI_CPPFLAGS $CPPFLAGS"
- LDFLAGS="$GSSAPI_LDFLAGS $LDFLAGS"
- LIBS="$GSSAPI_LIBS $LIBS"])
-
-dnl Restore CPPFLAGS, LDFLAGS, and LIBS to their previous values (before
-dnl RRA_LIB_GSSAPI_SWITCH was called).
-AC_DEFUN([RRA_LIB_GSSAPI_RESTORE],
-[CPPFLAGS="$rra_gssapi_save_CPPFLAGS"
- LDFLAGS="$rra_gssapi_save_LDFLAGS"
- LIBS="$rra_gssapi_save_LIBS"])
-
-dnl Set GSSAPI_CPPFLAGS and GSSAPI_LDFLAGS based on rra_gssapi_root,
-dnl rra_gssapi_libdir, and rra_gssapi_includedir.
-AC_DEFUN([_RRA_LIB_GSSAPI_PATHS],
-[AS_IF([test x"$rra_gssapi_libdir" != x],
-    [GSSAPI_LDFLAGS="-L$rra_gssapi_libdir"],
-    [AS_IF([test x"$rra_gssapi_root" != x],
-        [RRA_SET_LDFLAGS([GSSAPI_LDFLAGS], [$rra_gssapi_root])])])
- AS_IF([test x"$rra_gssapi_includedir" != x],
-    [GSSAPI_CPPFLAGS="-I$rra_gssapi_includedir"],
-    [AS_IF([test x"$rra_gssapi_root" != x],
-        [AS_IF([test x"$rra_gssapi_root" != x/usr],
-            [GSSAPI_CPPFLAGS="-I${rra_gssapi_root}/include"])])])])
-
-dnl Does the appropriate library checks for reduced-dependency GSS-API
-dnl linkage.
-AC_DEFUN([_RRA_LIB_GSSAPI_REDUCED],
-[RRA_LIB_GSSAPI_SWITCH
- AC_CHECK_LIB([gssapi_krb5], [gss_import_name], [GSSAPI_LIBS="-lgssapi_krb5"],
-     [AC_CHECK_LIB([gssapi], [gss_import_name], [GSSAPI_LIBS="-lgssapi"],
-         [AC_CHECK_LIB([gss], [gss_import_name], [GSSAPI_LIBS="-lgss"],
-             [AC_MSG_ERROR([cannot find usable GSS-API library])])])])
- RRA_LIB_GSSAPI_RESTORE])
-
-dnl Does the appropriate library checks for GSS-API linkage when we don't
-dnl have krb5-config or reduced dependencies.  libgss is used as a last
-dnl resort, since it may be a non-functional mech-independent wrapper, but
-dnl it's the right choice on Solaris 10.
-AC_DEFUN([_RRA_LIB_GSSAPI_MANUAL],
-[RRA_LIB_GSSAPI_SWITCH
- rra_gssapi_extra=
- LIBS=
- AC_SEARCH_LIBS([res_search], [resolv], [],
-    [AC_SEARCH_LIBS([__res_search], [resolv])])
- AC_SEARCH_LIBS([gethostbyname], [nsl])
- AC_SEARCH_LIBS([socket], [socket], [],
-    [AC_CHECK_LIB([nsl], [socket], [LIBS="-lnsl -lsocket $LIBS"], [],
-        [-lsocket])])
- AC_SEARCH_LIBS([crypt], [crypt])
- AC_SEARCH_LIBS([rk_simple_execve], [roken])
- rra_gssapi_extra="$LIBS"
- LIBS="$rra_gssapi_save_LIBS"
- AC_CHECK_LIB([gssapi], [gss_import_name],
-    [GSSAPI_LIBS="-lgssapi -lkrb5 -lasn1 -lcrypto -lcom_err $rra_gssapi_extra"],
-    [AC_CHECK_LIB([krb5support], [krb5int_getspecific],
-        [rra_gssapi_extra="-lkrb5support $rra_gssapi_extra"],
-        [AC_CHECK_LIB([pthreads], [pthread_setspecific],
-            [rra_gssapi_pthread="-lpthreads"],
-            [AC_CHECK_LIB([pthread], [pthread_setspecific],
-                [rra_gssapi_pthread="-lpthread"])])
-         AC_CHECK_LIB([krb5support], [krb5int_setspecific],
-            [rra_gssapi_extra="-lkrb5support $rra_gssapi_extra"
-             rra_gssapi_extra="$rra_gssapi_extra $rra_gssapi_pthread"], [],
-            [$rra_gssapi_pthread])])
-     AC_CHECK_LIB([com_err], [error_message],
-        [rra_gssapi_extra="-lcom_err $rra_gssapi_extra"])
-     AC_CHECK_LIB([k5crypto], [krb5int_hash_md5],
-        [rra_gssapi_extra="-lk5crypto $rra_gssapi_extra"])
-     rra_gssapi_extra="-lkrb5 $rra_gssapi_extra"
-     AC_CHECK_LIB([gssapi_krb5], [gss_import_name],
-        [GSSAPI_LIBS="-lgssapi_krb5 $rra_gssapi_extra"],
-        [AC_CHECK_LIB([gss], [gss_import_name],
-            [GSSAPI_LIBS="-lgss"],
-            [AC_MSG_ERROR([cannot find usable GSS-API library])])],
-        [$rra_gssapi_extra])],
-    [-lkrb5 -lasn1 -lcrypto -lcom_err $rra_gssapi_extra])
- RRA_LIB_GSSAPI_RESTORE])
-
-dnl Sanity-check the results of krb5-config and be sure we can really link a
-dnl GSS-API program.  If not, fall back on the manual check.
-AC_DEFUN([_RRA_LIB_GSSAPI_CHECK],
-[RRA_LIB_GSSAPI_SWITCH
- AC_CHECK_FUNC([gss_import_name],
-    [RRA_LIB_GSSAPI_RESTORE],
-    [RRA_LIB_GSSAPI_RESTORE
-     GSSAPI_CPPFLAGS=
-     GSSAPI_LIBS=
-     _RRA_LIB_GSSAPI_PATHS
-     _RRA_LIB_GSSAPI_MANUAL])])
-
-dnl The main macro.
-AC_DEFUN([RRA_LIB_GSSAPI],
-[AC_REQUIRE([RRA_ENABLE_REDUCED_DEPENDS])
- rra_gssapi_root=
- rra_gssapi_libdir=
- rra_gssapi_includedir=
- GSSAPI_CPPFLAGS=
- GSSAPI_LDFLAGS=
- GSSAPI_LIBS=
- AC_SUBST([GSSAPI_CPPFLAGS])
- AC_SUBST([GSSAPI_LDFLAGS])
- AC_SUBST([GSSAPI_LIBS])
-
- AC_ARG_WITH([gssapi],
-    [AS_HELP_STRING([--with-gssapi=DIR],
-        [Location of GSS-API headers and libraries])],
-    [AS_IF([test x"$withval" != xyes && test x"$withval" != xno],
-        [rra_gssapi_root="$withval"])])
- AC_ARG_WITH([gssapi-include],
-    [AS_HELP_STRING([--with-gssapi-include=DIR],
-        [Location of GSS-API headers])],
-    [AS_IF([test x"$withval" != xyes && test x"$withval" != xno],
-        [rra_gssapi_includedir="$withval"])])
- AC_ARG_WITH([gssapi-lib],
-    [AS_HELP_STRING([--with-gssapi-lib=DIR],
-        [Location of GSS-API libraries])],
-    [AS_IF([test x"$withval" != xyes && test x"$withval" != xno],
-        [rra_gssapi_libdir="$withval"])])
-
- AS_IF([test x"$rra_reduced_depends" = xtrue],
-    [_RRA_LIB_GSSAPI_PATHS
-     _RRA_LIB_GSSAPI_REDUCED],
-    [AC_ARG_VAR([KRB5_CONFIG], [Path to krb5-config])
-     AS_IF([test x"$rra_gssapi_root" != x && test -z "$KRB5_CONFIG"],
-         [AS_IF([test -x "${rra_gssapi_root}/bin/krb5-config"],
-             [KRB5_CONFIG="${rra_gssapi_root}/bin/krb5-config"])],
-         [AC_PATH_PROG([KRB5_CONFIG], [krb5-config], [],
-             [${PATH}:/usr/kerberos/bin])])
-     AS_IF([test x"$KRB5_CONFIG" != x && test -x "$KRB5_CONFIG"],
-         [AC_CACHE_CHECK([for gssapi support in krb5-config],
-             [rra_cv_lib_gssapi_config],
-             [AS_IF(["$KRB5_CONFIG" 2>&1 | grep gssapi >/dev/null 2>&1],
-                 [rra_cv_lib_gssapi_config=yes],
-                 [rra_cv_lib_gssapi_config=no])])
-          AS_IF([test "$rra_cv_lib_gssapi_config" = yes],
-              [GSSAPI_CPPFLAGS=`"$KRB5_CONFIG" --cflags gssapi 2>/dev/null`
-               GSSAPI_LIBS=`"$KRB5_CONFIG" --libs gssapi 2>/dev/null`],
-              [GSSAPI_CPPFLAGS=`"$KRB5_CONFIG" --cflags 2>/dev/null`
-               GSSAPI_LIBS=`"$KRB5_CONFIG" --libs 2>/dev/null`])
-          GSSAPI_CPPFLAGS=`echo "$GSSAPI_CPPFLAGS" \
-              | sed 's%-I/usr/include ?%%'`
-          _RRA_LIB_GSSAPI_CHECK],
-         [_RRA_LIB_GSSAPI_PATHS
-          _RRA_LIB_GSSAPI_MANUAL])])])
diff --git a/src/cf/krb5.m4 b/src/cf/krb5.m4
deleted file mode 100644 (file)
index 4a967ce..0000000
+++ /dev/null
@@ -1,291 +0,0 @@
-dnl Find the compiler and linker flags for Kerberos v5.
-dnl
-dnl Finds the compiler and linker flags for linking with Kerberos v5
-dnl libraries.  Provides the --with-krb5, --with-krb5-include, and
-dnl --with-krb5-lib configure options to specify non-standard paths to the
-dnl Kerberos libraries.  Uses krb5-config where available unless reduced
-dnl dependencies is requested.
-dnl
-dnl Provides the macro RRA_LIB_KRB5 and sets the substitution variables
-dnl KRB5_CPPFLAGS, KRB5_LDFLAGS, and KRB5_LIBS.  Also provides
-dnl RRA_LIB_KRB5_SWITCH to set CPPFLAGS, LDFLAGS, and LIBS to include the
-dnl Kerberos libraries, saving the current values first, and
-dnl RRA_LIB_KRB5_RESTORE to restore those settings to before the last
-dnl RRA_LIB_KRB5_SWITCH.
-dnl
-dnl If KRB5_CPPFLAGS, KRB5_LDFLAGS, or KRB5_LIBS are set before calling these
-dnl macros, their values will be added to whatever the macros discover.
-dnl
-dnl Provides the RRA_LIB_KRB5_OPTIONAL macro, which should be used if Kerberos
-dnl support is optional.  This macro will still always set the substitution
-dnl variables, but they'll be empty unless --with-krb5 is given.  Also,
-dnl HAVE_KERBEROS will be defined if --with-krb5 is given and
-dnl $rra_use_kerberos will be set to "true".
-dnl
-dnl Sets the Automake conditional KRB5_USES_COM_ERR saying whether we use
-dnl com_err, since if we're also linking with AFS libraries, we may have to
-dnl change library ordering in that case.
-dnl
-dnl Depends on RRA_ENABLE_REDUCED_DEPENDS and RRA_SET_LDFLAGS.
-dnl
-dnl Also provides RRA_FUNC_KRB5_GET_INIT_CREDS_OPT_FREE_ARGS, which checks
-dnl whether krb5_get_init_creds_opt_free takes one argument or two.  Defines
-dnl HAVE_KRB5_GET_INIT_CREDS_OPT_FREE_2_ARGS if it takes two arguments.
-dnl
-dnl Written by Russ Allbery <rra@stanford.edu>
-dnl Copyright 2005, 2006, 2007, 2008, 2009, 2010
-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
-dnl and/or distribute it, with or without modifications, as long as this
-dnl notice is preserved.
-
-dnl Save the current CPPFLAGS, LDFLAGS, and LIBS settings and switch to
-dnl versions that include the Kerberos v5 flags.  Used as a wrapper, with
-dnl RRA_LIB_KRB5_RESTORE, around tests.
-AC_DEFUN([RRA_LIB_KRB5_SWITCH],
-[rra_krb5_save_CPPFLAGS="$CPPFLAGS"
- rra_krb5_save_LDFLAGS="$LDFLAGS"
- rra_krb5_save_LIBS="$LIBS"
- CPPFLAGS="$KRB5_CPPFLAGS $CPPFLAGS"
- LDFLAGS="$KRB5_LDFLAGS $LDFLAGS"
- LIBS="$KRB5_LIBS $LIBS"])
-
-dnl Restore CPPFLAGS, LDFLAGS, and LIBS to their previous values (before
-dnl RRA_LIB_KRB5_SWITCH was called).
-AC_DEFUN([RRA_LIB_KRB5_RESTORE],
-[CPPFLAGS="$rra_krb5_save_CPPFLAGS"
- LDFLAGS="$rra_krb5_save_LDFLAGS"
- LIBS="$rra_krb5_save_LIBS"])
-
-dnl Set KRB5_CPPFLAGS and KRB5_LDFLAGS based on rra_krb5_root,
-dnl rra_krb5_libdir, and rra_krb5_includedir.
-AC_DEFUN([_RRA_LIB_KRB5_PATHS],
-[AS_IF([test x"$rra_krb5_libdir" != x],
-    [KRB5_LDFLAGS="-L$rra_krb5_libdir"],
-    [AS_IF([test x"$rra_krb5_root" != x],
-        [RRA_SET_LDFLAGS([KRB5_LDFLAGS], [$rra_krb5_root])])])
- AS_IF([test x"$rra_krb5_includedir" != x],
-    [KRB5_CPPFLAGS="-I$rra_krb5_includedir"],
-    [AS_IF([test x"$rra_krb5_root" != x],
-        [AS_IF([test x"$rra_krb5_root" != x/usr],
-            [KRB5_CPPFLAGS="-I${rra_krb5_root}/include"])])])])
-
-dnl Does the appropriate library checks for reduced-dependency Kerberos v5
-dnl linkage.  The single argument, if true, says to fail if Kerberos could not
-dnl be found.
-AC_DEFUN([_RRA_LIB_KRB5_REDUCED],
-[RRA_LIB_KRB5_SWITCH
- AC_CHECK_LIB([krb5], [krb5_init_context], [KRB5_LIBS="-lkrb5"],
-     [AS_IF([test x"$1" = xtrue],
-         [AC_MSG_ERROR([cannot find usable Kerberos v5 library])])])
- LIBS="$KRB5_LIBS $LIBS"
- AC_CHECK_FUNCS([krb5_get_error_message],
-     [AC_CHECK_FUNCS([krb5_free_error_message])],
-     [AC_CHECK_FUNCS([krb5_get_error_string], [],
-         [AC_CHECK_FUNCS([krb5_get_err_txt], [],
-             [AC_CHECK_LIB([ksvc], [krb5_svc_get_msg],
-                 [KRB5_LIBS="$KRB5_LIBS -lksvc"
-                  AC_DEFINE([HAVE_KRB5_SVC_GET_MSG], [1])
-                  AC_CHECK_HEADERS([ibm_svc/krb5_svc.h], [], [],
-                     [#include <krb5.h>])],
-                 [AC_CHECK_LIB([com_err], [com_err],
-                     [KRB5_LIBS="$KRB5_LIBS -lcom_err"],
-                     [AC_MSG_ERROR([cannot find usable com_err library])])
-                  AC_CHECK_HEADERS([et/com_err.h])])])])])
- RRA_LIB_KRB5_RESTORE])
-
-dnl Does the appropriate library checks for Kerberos v5 linkage when we don't
-dnl have krb5-config or reduced dependencies.  The single argument, if true,
-dnl says to fail if Kerberos could not be found.
-AC_DEFUN([_RRA_LIB_KRB5_MANUAL],
-[RRA_LIB_KRB5_SWITCH
- rra_krb5_extra=
- LIBS=
- AC_SEARCH_LIBS([res_search], [resolv], [],
-    [AC_SEARCH_LIBS([__res_search], [resolv])])
- AC_SEARCH_LIBS([gethostbyname], [nsl])
- AC_SEARCH_LIBS([socket], [socket], [],
-    [AC_CHECK_LIB([nsl], [socket], [LIBS="-lnsl -lsocket $LIBS"], [],
-        [-lsocket])])
- AC_SEARCH_LIBS([crypt], [crypt])
- AC_SEARCH_LIBS([rk_simple_execve], [roken])
- rra_krb5_extra="$LIBS"
- LIBS="$rra_krb5_save_LIBS"
- AC_CHECK_LIB([krb5], [krb5_init_context],
-    [KRB5_LIBS="-lkrb5 -lasn1 -lcom_err -lcrypto $rra_krb5_extra"],
-    [AC_CHECK_LIB([krb5support], [krb5int_getspecific],
-        [rra_krb5_extra="-lkrb5support $rra_krb5_extra"],
-        [AC_CHECK_LIB([pthreads], [pthread_setspecific],
-            [rra_krb5_pthread="-lpthreads"],
-            [AC_CHECK_LIB([pthread], [pthread_setspecific],
-                [rra_krb5_pthread="-lpthread"])])
-         AC_CHECK_LIB([krb5support], [krb5int_setspecific],
-            [rra_krb5_extra="-lkrb5support $rra_krb5_extra $rra_krb5_pthread"],
-            [], [$rra_krb5_pthread $rra_krb5_extra])],
-        [$rra_krb5_extra])
-     AC_CHECK_LIB([com_err], [error_message],
-        [rra_krb5_extra="-lcom_err $rra_krb5_extra"], [], [$rra_krb5_extra])
-     AC_CHECK_LIB([ksvc], [krb5_svc_get_msg],
-        [rra_krb5_extra="-lksvc $rra_krb5_extra"], [], [$rra_krb5_extra])
-     AC_CHECK_LIB([k5crypto], [krb5int_hash_md5],
-        [rra_krb5_extra="-lk5crypto $rra_krb5_extra"], [], [$rra_krb5_extra])
-     AC_CHECK_LIB([k5profile], [profile_get_values],
-        [rra_krb5_extra="-lk5profile $rra_krb5_extra"], [], [$rra_krb5_extra])
-     AC_CHECK_LIB([krb5], [krb5_cc_default],
-        [KRB5_LIBS="-lkrb5 $rra_krb5_extra"],
-        [AS_IF([test x"$1" = xtrue],
-            [AC_MSG_ERROR([cannot find usable Kerberos v5 library])])],
-        [$rra_krb5_extra])],
-    [-lasn1 -lcom_err -lcrypto $rra_krb5_extra])
- LIBS="$KRB5_LIBS $LIBS"
- AC_CHECK_FUNCS([krb5_get_error_message],
-     [AC_CHECK_FUNCS([krb5_free_error_message])],
-     [AC_CHECK_FUNCS([krb5_get_error_string], [],
-         [AC_CHECK_FUNCS([krb5_get_err_txt], [],
-             [AC_CHECK_FUNCS([krb5_svc_get_msg],
-                 [AC_CHECK_HEADERS([ibm_svc/krb5_svc.h], [], [],
-                     [#include <krb5.h>])],
-                 [AC_CHECK_HEADERS([et/com_err.h])])])])])
- RRA_LIB_KRB5_RESTORE])
-
-dnl Sanity-check the results of krb5-config and be sure we can really link a
-dnl Kerberos program.  If that fails, clear KRB5_CPPFLAGS and KRB5_LIBS so
-dnl that we know we don't have usable flags and fall back on the manual
-dnl check.
-AC_DEFUN([_RRA_LIB_KRB5_CHECK],
-[RRA_LIB_KRB5_SWITCH
- AC_CHECK_FUNC([krb5_init_context],
-    [RRA_LIB_KRB5_RESTORE],
-    [RRA_LIB_KRB5_RESTORE
-     KRB5_CPPFLAGS=
-     KRB5_LIBS=
-     _RRA_LIB_KRB5_PATHS
-     _RRA_LIB_KRB5_MANUAL([$1])])])
-
-dnl The core of the library checking, shared between RRA_LIB_KRB5 and
-dnl RRA_LIB_KRB5_OPTIONAL.  The single argument, if "true", says to fail if
-dnl Kerberos could not be found.
-AC_DEFUN([_RRA_LIB_KRB5_INTERNAL],
-[AC_REQUIRE([RRA_ENABLE_REDUCED_DEPENDS])
- AS_IF([test x"$rra_reduced_depends" = xtrue],
-    [_RRA_LIB_KRB5_PATHS
-     _RRA_LIB_KRB5_REDUCED([$1])],
-    [AC_ARG_VAR([KRB5_CONFIG], [Path to krb5-config])
-     AS_IF([test x"$rra_krb5_root" != x && test -z "$KRB5_CONFIG"],
-         [AS_IF([test -x "${rra_krb5_root}/bin/krb5-config"],
-             [KRB5_CONFIG="${rra_krb5_root}/bin/krb5-config"])],
-         [AC_PATH_PROG([KRB5_CONFIG], [krb5-config], [],
-             [${PATH}:/usr/kerberos/bin])])
-     AS_IF([test x"$KRB5_CONFIG" != x && test -x "$KRB5_CONFIG"],
-         [AC_CACHE_CHECK([for krb5 support in krb5-config],
-             [rra_cv_lib_krb5_config],
-             [AS_IF(["$KRB5_CONFIG" 2>&1 | grep krb5 >/dev/null 2>&1],
-                 [rra_cv_lib_krb5_config=yes],
-                 [rra_cv_lib_krb5_config=no])])
-          AS_IF([test x"$rra_cv_lib_krb5_config" = xyes],
-              [KRB5_CPPFLAGS=`"$KRB5_CONFIG" --cflags krb5 2>/dev/null`
-               KRB5_LIBS=`"$KRB5_CONFIG" --libs krb5 2>/dev/null`],
-              [KRB5_CPPFLAGS=`"$KRB5_CONFIG" --cflags 2>/dev/null`
-               KRB5_LIBS=`"$KRB5_CONFIG" --libs 2>/dev/null`])
-          KRB5_CPPFLAGS=`echo "$KRB5_CPPFLAGS" | sed 's%-I/usr/include ?%%'`
-          _RRA_LIB_KRB5_CHECK([$1])
-          RRA_LIB_KRB5_SWITCH
-          AC_CHECK_FUNCS([krb5_get_error_message],
-              [AC_CHECK_FUNCS([krb5_free_error_message])],
-              [AC_CHECK_FUNCS([krb5_get_error_string], [],
-                  [AC_CHECK_FUNCS([krb5_get_err_txt], [],
-                      [AC_CHECK_FUNCS([krb5_svc_get_msg],
-                          [AC_CHECK_HEADERS([ibm_svc/krb5_svc.h], [], [],
-                              [#include <krb5.h>])],
-                          [AC_CHECK_HEADERS([et/com_err.h])])])])])
-          RRA_LIB_KRB5_RESTORE],
-         [_RRA_LIB_KRB5_PATHS
-          _RRA_LIB_KRB5_MANUAL([$1])])])
- rra_krb5_uses_com_err=false
- case "$LIBS" in
- *-lcom_err*)
-     rra_krb5_uses_com_err=true
-     ;;
- esac
- AM_CONDITIONAL([KRB5_USES_COM_ERR], [test x"$rra_krb5_uses_com_err" = xtrue])])
-
-dnl The main macro for packages with mandatory Kerberos support.
-AC_DEFUN([RRA_LIB_KRB5],
-[rra_krb5_root=
- rra_krb5_libdir=
- rra_krb5_includedir=
- rra_use_kerberos=true
- AC_SUBST([KRB5_CPPFLAGS])
- AC_SUBST([KRB5_LDFLAGS])
- AC_SUBST([KRB5_LIBS])
-
- AC_ARG_WITH([krb5],
-    [AS_HELP_STRING([--with-krb5=DIR],
-        [Location of Kerberos v5 headers and libraries])],
-    [AS_IF([test x"$withval" != xyes && test x"$withval" != xno],
-        [rra_krb5_root="$withval"])])
- AC_ARG_WITH([krb5-include],
-    [AS_HELP_STRING([--with-krb5-include=DIR],
-        [Location of Kerberos v5 headers])],
-    [AS_IF([test x"$withval" != xyes && test x"$withval" != xno],
-        [rra_krb5_includedir="$withval"])])
- AC_ARG_WITH([krb5-lib],
-    [AS_HELP_STRING([--with-krb5-lib=DIR],
-        [Location of Kerberos v5 libraries])],
-    [AS_IF([test x"$withval" != xyes && test x"$withval" != xno],
-        [rra_krb5_libdir="$withval"])])
- _RRA_LIB_KRB5_INTERNAL([true])])
-
-dnl The main macro for packages with optional Kerberos support.
-AC_DEFUN([RRA_LIB_KRB5_OPTIONAL],
-[rra_krb5_root=
- rra_krb5_libdir=
- rra_krb5_includedir=
- rra_use_kerberos=
- AC_SUBST([KRB5_CPPFLAGS])
- AC_SUBST([KRB5_LDFLAGS])
- AC_SUBST([KRB5_LIBS])
-
- AC_ARG_WITH([krb5],
-    [AS_HELP_STRING([--with-krb5@<:@=DIR@:>@],
-        [Location of Kerberos v5 headers and libraries])],
-    [AS_IF([test x"$withval" = xno],
-        [rra_use_kerberos=false],
-        [AS_IF([test x"$withval" != xyes], [rra_krb5_root="$withval"])
-         rra_use_kerberos=true])])
- AC_ARG_WITH([krb5-include],
-    [AS_HELP_STRING([--with-krb5-include=DIR],
-        [Location of Kerberos v5 headers])],
-    [AS_IF([test x"$withval" != xyes && test x"$withval" != xno],
-        [rra_krb5_includedir="$withval"])])
- AC_ARG_WITH([krb5-lib],
-    [AS_HELP_STRING([--with-krb5-lib=DIR],
-        [Location of Kerberos v5 libraries])],
-    [AS_IF([test x"$withval" != xyes && test x"$withval" != xno],
-        [rra_krb5_libdir="$withval"])])
-
- AS_IF([test x"$rra_use_kerberos" != xfalse],
-     [AS_IF([test x"$rra_use_kerberos" = xtrue],
-         [_RRA_LIB_KRB5_INTERNAL([true])],
-         [_RRA_LIB_KRB5_INTERNAL([false])])],
-     [AM_CONDITIONAL([KRB5_USES_COM_ERR], [false])])
- AS_IF([test x"$KRB5_LIBS" != x],
-    [AC_DEFINE([HAVE_KERBEROS], 1, [Define to enable Kerberos features.])])])
-
-dnl Check whether krb5_get_init_creds_opt_free takes one argument or two.
-dnl Early Heimdal used to take a single argument.  Defines
-dnl HAVE_KRB5_GET_INIT_CREDS_OPT_FREE_2_ARGS if it takes two arguments.
-dnl
-dnl Should be called with RRA_LIB_KRB5_SWITCH active.
-AC_DEFUN([RRA_FUNC_KRB5_GET_INIT_CREDS_OPT_FREE_ARGS],
-[AC_CACHE_CHECK([if krb5_get_init_creds_opt_free takes two arguments],
-    [rra_cv_func_krb5_get_init_creds_opt_free_args],
-    [AC_TRY_COMPILE([#include <krb5.h>],
-        [krb5_get_init_creds_opt *opts; krb5_context c;
-         krb5_get_init_creds_opt_free(c, opts);],
-        [rra_cv_func_krb5_get_init_creds_opt_free_args=yes],
-        [rra_cv_func_krb5_get_init_creds_opt_free_args=no])])
- AS_IF([test $rra_cv_func_krb5_get_init_creds_opt_free_args = yes],
-    [AC_DEFINE([HAVE_KRB5_GET_INIT_CREDS_OPT_FREE_2_ARGS], 1,
-        [Define if krb5_get_init_creds_opt_free takes two arguments.])])])
diff --git a/src/cf/lib-depends.m4 b/src/cf/lib-depends.m4
deleted file mode 100644 (file)
index 0aa0d1e..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-dnl Provides option to change library probes.
-dnl
-dnl This file provides RRA_ENABLE_REDUCED_DEPENDS, which adds the configure
-dnl option --enable-reduced-depends to request that library probes assume
-dnl shared libraries are in use and dependencies of libraries should not be
-dnl probed.  If this option is given, the shell variable rra_reduced_depends
-dnl is set to true; otherwise, it is set to false.
-dnl
-dnl This macro doesn't do much but is defined separately so that other macros
-dnl can require it with AC_REQUIRE.
-dnl
-dnl Written by Russ Allbery <rra@stanford.edu>
-dnl Copyright 2005, 2006, 2007
-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
-dnl and/or distribute it, with or without modifications, as long as this
-dnl notice is preserved.
-
-AC_DEFUN([RRA_ENABLE_REDUCED_DEPENDS],
-[rra_reduced_depends=false
-AC_ARG_ENABLE([reduced-depends],
-    [AS_HELP_STRING([--enable-reduced-depends],
-        [Try to minimize shared library dependencies])],
-    [AS_IF([test x"$enableval" = xyes], [rra_reduced_depends=true])])])
diff --git a/src/cf/lib-pathname.m4 b/src/cf/lib-pathname.m4
deleted file mode 100644 (file)
index a639b17..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-dnl Determine the library path name.
-dnl
-dnl Red Hat systems and some other Linux systems use lib64 and lib32 rather
-dnl than just lib in some circumstances.  This file provides an Autoconf
-dnl macro, RRA_SET_LDFLAGS, which given a variable, a prefix, and an optional
-dnl suffix, adds -Lprefix/lib, -Lprefix/lib32, or -Lprefix/lib64 to the
-dnl variable depending on which directories exist and the size of a long in
-dnl the compilation environment.  If a suffix is given, a slash and that
-dnl suffix will be appended, to allow for adding a subdirectory of the library
-dnl directory.
-dnl
-dnl This file also provides the Autoconf macro RRA_SET_LIBDIR, which sets the
-dnl libdir variable to PREFIX/lib{,32,64} as appropriate.
-dnl
-dnl Written by Russ Allbery <rra@stanford.edu>
-dnl Copyright 2008, 2009
-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
-dnl and/or distribute it, with or without modifications, as long as this
-dnl notice is preserved.
-
-dnl Probe for the alternate library name that we should attempt on this
-dnl architecture, given the size of an int, and set rra_lib_arch_name to that
-dnl name.  Separated out so that it can be AC_REQUIRE'd and not run multiple
-dnl times.
-dnl
-dnl There is an unfortunate abstraction violation here where we assume we know
-dnl the cache variable name used by Autoconf.  Unfortunately, Autoconf doesn't
-dnl provide any other way of getting at that information in shell that I can
-dnl see.
-AC_DEFUN([_RRA_LIB_ARCH_NAME],
-[rra_lib_arch_name=lib
- AC_CHECK_SIZEOF([long])
- AS_IF([test "$ac_cv_sizeof_long" -eq 4 && test -d /usr/lib32],
-     [rra_lib_arch_name=lib32],
-     [AS_IF([test "$ac_cv_sizeof_long" -eq 8 && test -d /usr/lib64],
-         [rra_lib_arch_name=lib64])])])
-
-dnl Set VARIABLE to -LPREFIX/lib{,32,64} or -LPREFIX/lib{,32,64}/SUFFIX as
-dnl appropriate.
-AC_DEFUN([RRA_SET_LDFLAGS],
-[AC_REQUIRE([_RRA_LIB_ARCH_NAME])
- AS_IF([test -d "$2/$rra_lib_arch_name"],
-    [AS_IF([test x"$3" = x],
-        [$1="[$]$1 -L$2/${rra_lib_arch_name}"],
-        [$1="[$]$1 -L$2/${rra_lib_arch_name}/$3"])],
-    [AS_IF([test x"$3" = x],
-        [$1="[$]$1 -L$2/lib"],
-        [$1="[$]$1 -L$2/lib/$3"])])
- $1=`echo "[$]$1" | sed -e 's/^ *//'`])
-
-dnl Set libdir to PREFIX/lib{,32,64} as appropriate.
-AC_DEFUN([RRA_SET_LIBDIR],
-[AC_REQUIRE([_RRA_LIB_ARCH_NAME])
- AS_IF([test -d "$1/$rra_lib_arch_name"],
-    [libdir="$1/${rra_lib_arch_name}"],
-    [libdir="$1/lib"])])
diff --git a/src/cf/pam-const.m4 b/src/cf/pam-const.m4
deleted file mode 100644 (file)
index 8428611..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-dnl Determine whether PAM uses const in prototypes.
-dnl
-dnl Linux marks several PAM arguments const, including the argument to
-dnl pam_get_item and some arguments to conversation functions, which Solaris
-dnl doesn't.  This test tries to determine which style is in use to select
-dnl whether to declare variables const in order to avoid compiler warnings.
-dnl
-dnl Since this is just for compiler warnings, it's not horribly important if
-dnl we guess wrong.  This test is ugly, but it seems to work.
-dnl
-dnl Contributed by Markus Moeller.
-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 Copyright 2007 Russ Allbery <rra@stanford.edu>
-dnl Copyright 2007, 2008 Markus Moeller
-dnl
-dnl This file is free software; the authors give unlimited permission to copy
-dnl and/or distribute it, with or without modifications, as long as this
-dnl notice is preserved.
-
-dnl Source used by RRA_HEADER_PAM_CONST.
-AC_DEFUN([_RRA_HEADER_PAM_CONST_SOURCE],
-[#ifdef HAVE_SECURITY_PAM_APPL_H
-# include <security/pam_appl.h>
-#else
-# include <pam/pam_appl.h>
-#endif
-])
-
-AC_DEFUN([RRA_HEADER_PAM_CONST],
-[AC_CACHE_CHECK([whether PAM prefers const], [rra_cv_header_pam_const],
-    [AC_EGREP_CPP([const void \*\* *_?item], _RRA_HEADER_PAM_CONST_SOURCE(),
-        [rra_cv_header_pam_const=yes], [rra_cv_header_pam_const=no])])
-AS_IF([test x"$rra_cv_header_pam_const" = xyes],
-    [rra_header_pam_const=const], [rra_header_pam_const=])
-AC_DEFINE_UNQUOTED([PAM_CONST], [$rra_header_pam_const],
-    [Define to const if PAM uses const in pam_get_item, empty otherwise.])])