diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2001-06-21 17:25:58 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2001-06-21 17:25:58 +0000 |
| commit | 10700072e71898ca23c0325c109bbd7e881909e1 (patch) | |
| tree | f290d90d555040c179438f8c2275b09e2e3cf127 /src | |
| parent | ba2d3d7da029bb0da6a058a953787b754bbf7e53 (diff) | |
* aclocal.m4 (KRB5_LIB_PARAMS): Display test for host type and
result so that "cached" is not simply output from configure.
(KRB5_NEED_PROTO): Add optional third argument, which if set means
to test for prototype even if configure script does not test for
function.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13451 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/aclocal.m4 | 13 |
2 files changed, 17 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2211db0e1..9c0106804 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2001-06-21 Ezra Peisach <epeisach@mit.edu> + + * aclocal.m4 (KRB5_LIB_PARAMS): Display test for host type and + result so that "cached" is not simply output from configure. + (KRB5_NEED_PROTO): Add optional third argument, which if set means + to test for prototype even if configure script does not test for + function. + 2001-06-18 Ezra Peisach <epeisach@mit.edu> * acconfig.h: Add HAVE_REGCOMP. diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 8ee10e4ec..a82db6375 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -1131,9 +1131,11 @@ dnl dnl Determine parameters related to libraries, e.g. various extensions. AC_DEFUN(KRB5_LIB_PARAMS, -[AC_CACHE_VAL(krb5_cv_host, +[AC_MSG_CHECKING([for host type]) +AC_CACHE_VAL(krb5_cv_host, [AC_CANONICAL_HOST krb5_cv_host=$host]) +AC_MSG_RESULT($krb5_cv_host) AC_REQUIRE([AC_PROG_CC]) AC_REQUIRE([V5_SET_TOPDIR]) . $ac_topdir/config/shlib.conf @@ -1259,10 +1261,13 @@ dnl Check if we need the prototype for a function - we give it a bogus dnl prototype and if it complains - then a valid prototype exists on the dnl system. dnl -dnl KRB5_NEED_PROTO(includes, function) +dnl KRB5_NEED_PROTO(includes, function, [bypass]) +dnl if $3 set, don't see if library defined. +dnl Useful for case where we will define in libkrb5 the function if need be +dnl but want to know if a prototype exists in either case on system. dnl AC_DEFUN([KRB5_NEED_PROTO], [ -if test "x$ac_cv_func_$2" = xyes; then +ifelse([$3], ,[if test "x$ac_cv_func_$2" = xyes; then]) AC_CACHE_CHECK([if $2 needs a prototype provided], krb5_cv_func_$2_noproto, AC_TRY_COMPILE([$1], [struct k5foo {int foo; } xx; @@ -1274,5 +1279,5 @@ if test $krb5_cv_func_$2_noproto = yes; then AC_DEFINE([NEED_]translit($2, [a-z], [A-Z])[_PROTO], 1, dnl [define if the system header files are missing prototype for $2()]) fi -fi +ifelse([$3], ,[fi]) ]) |