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/vamacros.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/vamacros.m4')
| -rw-r--r-- | m4/vamacros.m4 | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/m4/vamacros.m4 b/m4/vamacros.m4 index c343d9f..8946d8b 100644 --- a/m4/vamacros.m4 +++ b/m4/vamacros.m4 @@ -15,7 +15,8 @@ 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 Board of Trustees, Leland Stanford Jr. University +dnl Copyright 2006, 2008 Board of Trustees, Leland Stanford Jr. University +dnl dnl See LICENSE for licensing terms. AC_DEFUN([RRA_C_C99_VAMACROS], @@ -23,21 +24,21 @@ AC_DEFUN([RRA_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])]) -if test $rra_cv_c_c99_vamacros = yes ; then - AC_DEFINE([HAVE_C99_VAMACROS], 1, - [Define if the compiler supports C99 variadic macros.]) -fi]) + [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_DEFINE([HAVE_C99_VAMACROS], 1, + [Define if the compiler supports C99 variadic macros.])])]) 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])]) -if test $rra_cv_c_gnu_vamacros = yes ; then - AC_DEFINE([HAVE_GNU_VAMACROS], 1, - [Define if the compiler supports GNU-style variadic macros.]) -fi]) + [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_DEFINE([HAVE_GNU_VAMACROS], 1, + [Define if the compiler supports GNU-style variadic macros.])])]) |