Update the Autoconf code to rra-c-util 3.0

* Sanity-check the results of krb5-config before proceeding.
* Fall back on manual probing if krb5-config results don't work.
* Add --with-krb5-include and --with-krb5-lib configure options.
* Add --with-remctl-include and --with-remctl-lib configure options.
* Add --with-gssapi-include and --with-gssapi-lib configure options.
* Don't break if the user clobbers CPPFLAGS at build time.
* Suppress error output from krb5-config probes.
* Prefer KRB5_CONFIG over a path constructed from --with-*.
* Update GSS-API probes for Solaris 10's native implementation.
* Change AC_TRY_* to AC_*_IFELSE as recommended by Autoconf.

Also strip out more outdated AFS kaserver instructions from README.

1 files changed, 37 insertions, 18 deletions

diff --git a/m4/vamacros.m4 b/m4/vamacros.m4
index 6740d77..855bb40 100644
--- a/m4/vamacros.m4
+++ b/m4/vamacros.m4
@@ -1,4 +1,4 @@
-dnl vamacros.m4 -- Check for support for variadic macros.
+dnl Check for support for variadic macros.
 dnl
 dnl This file defines two macros for probing for compiler support for variadic
 dnl macros.  Provided are RRA_C_C99_VAMACROS, which checks for support for the
@@ -14,30 +14,49 @@ dnl
 dnl They set HAVE_C99_VAMACROS or HAVE_GNU_VAMACROS as appropriate.
 dnl
 dnl Written by Russ Allbery <rra@stanford.edu>
-dnl Copyright 2006, 2008 Board of Trustees, Leland Stanford Jr. University
+dnl Copyright 2006, 2008, 2009
+dnl     Board of Trustees, Leland Stanford Jr. University
 dnl
 dnl See LICENSE for licensing terms.
 
+AC_DEFUN([_RRA_C_C99_VAMACROS_SOURCE], [[
+#include <stdio.h>
+#define error(...) fprintf(stderr, __VA_ARGS__)
+
+int
+main(void) {
+    error("foo");
+    error("foo %d", 0);
+    return 0;
+}
+]])
+
 AC_DEFUN([RRA_C_C99_VAMACROS],
 [AC_CACHE_CHECK([for C99 variadic macros], [rra_cv_c_c99_vamacros],
-[AC_TRY_COMPILE(
-[#include <stdio.h>
-#define error(...) fprintf(stderr, __VA_ARGS__)],
-    [error("foo"); error("foo %d", 0); return 0;],
-    [rra_cv_c_c99_vamacros=yes],
-    [rra_cv_c_c99_vamacros=no])])
-AS_IF([test $rra_cv_c_c99_vamacros = yes],
+    [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_RRA_C_C99_VAMACROS_SOURCE])],
+        [rra_cv_c_c99_vamacros=yes],
+        [rra_cv_c_c99_vamacros=no])])
+ AS_IF([test x"$rra_cv_c_c99_vamacros" = xyes],
     [AC_DEFINE([HAVE_C99_VAMACROS], 1,
-              [Define if the compiler supports C99 variadic macros.])])])
+        [Define if the compiler supports C99 variadic macros.])])])
+
+AC_DEFUN([_RRA_C_GNU_VAMACROS_SOURCE], [[
+#include <stdio.h>
+#define error(args...) fprintf(stderr, args)
+
+int
+main(void) {
+    error("foo");
+    error("foo %d", 0);
+    return 0;
+}
+]])
 
 AC_DEFUN([RRA_C_GNU_VAMACROS],
 [AC_CACHE_CHECK([for GNU-style variadic macros], [rra_cv_c_gnu_vamacros],
-[AC_TRY_COMPILE(
-[#include <stdio.h>
-#define error(args...) fprintf(stderr, args)],
-    [error("foo"); error("foo %d", 0); return 0;],
-    [rra_cv_c_gnu_vamacros=yes],
-    [rra_cv_c_gnu_vamacros=no])])
-AS_IF([test $rra_cv_c_gnu_vamacros = yes],
+    [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_RRA_C_GNU_VAMACROS_SOURCE])],
+        [rra_cv_c_gnu_vamacros=yes],
+        [rra_cv_c_gnu_vamacros=no])])
+ AS_IF([test x"$rra_cv_c_gnu_vamacros" = xyes],
     [AC_DEFINE([HAVE_GNU_VAMACROS], 1,
-              [Define if the compiler supports GNU-style variadic macros.])])])
+        [Define if the compiler supports GNU-style variadic macros.])])])