summaryrefslogtreecommitdiffstats
path: root/crypto/heimdal/cf
diff options
context:
space:
mode:
authornectar <nectar@FreeBSD.org>2004-04-03 21:22:55 +0000
committernectar <nectar@FreeBSD.org>2004-04-03 21:22:55 +0000
commitbfc5316dea97d244a21b45ed0dce56f39074ba1b (patch)
treef009994dd04757b68eff8742614cca170aff5bb3 /crypto/heimdal/cf
parent084fdb0d6e4fe40ab8ff47ca033fdbcb7899aae1 (diff)
downloadFreeBSD-src-bfc5316dea97d244a21b45ed0dce56f39074ba1b.zip
FreeBSD-src-bfc5316dea97d244a21b45ed0dce56f39074ba1b.tar.gz
Vendor import of Heimdal 0.6.1.
Diffstat (limited to 'crypto/heimdal/cf')
-rw-r--r--crypto/heimdal/cf/ChangeLog5
-rw-r--r--crypto/heimdal/cf/Makefile.am.common4
-rw-r--r--crypto/heimdal/cf/aix.m44
-rw-r--r--crypto/heimdal/cf/auth-modules.m44
-rw-r--r--crypto/heimdal/cf/broken-getaddrinfo.m44
-rw-r--r--crypto/heimdal/cf/broken-getnameinfo.m44
-rw-r--r--crypto/heimdal/cf/broken-glob.m44
-rw-r--r--crypto/heimdal/cf/broken-realloc.m44
-rw-r--r--crypto/heimdal/cf/broken-snprintf.m46
-rw-r--r--crypto/heimdal/cf/c-attribute.m44
-rw-r--r--crypto/heimdal/cf/c-function.m44
-rw-r--r--crypto/heimdal/cf/capabilities.m44
-rw-r--r--crypto/heimdal/cf/check-compile-et.m418
-rw-r--r--crypto/heimdal/cf/check-declaration.m44
-rw-r--r--crypto/heimdal/cf/check-getpwnam_r-posix.m44
-rw-r--r--crypto/heimdal/cf/check-man.m44
-rw-r--r--crypto/heimdal/cf/check-netinet-ip-and-tcp.m44
-rw-r--r--crypto/heimdal/cf/check-type-extra.m44
-rw-r--r--crypto/heimdal/cf/check-x.m44
-rw-r--r--crypto/heimdal/cf/check-xau.m44
-rw-r--r--crypto/heimdal/cf/find-func-no-libs.m44
-rw-r--r--crypto/heimdal/cf/find-func-no-libs2.m44
-rw-r--r--crypto/heimdal/cf/find-func.m44
-rw-r--r--crypto/heimdal/cf/find-if-not-broken.m44
-rw-r--r--crypto/heimdal/cf/have-pragma-weak.m44
-rw-r--r--crypto/heimdal/cf/have-struct-field.m44
-rw-r--r--crypto/heimdal/cf/have-type.m44
-rw-r--r--crypto/heimdal/cf/have-types.m44
-rw-r--r--crypto/heimdal/cf/krb-bigendian.m44
-rw-r--r--crypto/heimdal/cf/krb-func-getcwd-broken.m44
-rw-r--r--crypto/heimdal/cf/krb-func-getlogin.m44
-rw-r--r--crypto/heimdal/cf/krb-ipv6.m44
-rw-r--r--crypto/heimdal/cf/krb-prog-ln-s.m44
-rw-r--r--crypto/heimdal/cf/krb-prog-ranlib.m44
-rw-r--r--crypto/heimdal/cf/krb-prog-yacc.m44
-rw-r--r--crypto/heimdal/cf/krb-readline.m44
-rw-r--r--crypto/heimdal/cf/krb-struct-spwd.m44
-rw-r--r--crypto/heimdal/cf/krb-struct-winsize.m44
-rw-r--r--crypto/heimdal/cf/krb-sys-aix.m44
-rw-r--r--crypto/heimdal/cf/krb-sys-nextstep.m44
-rw-r--r--crypto/heimdal/cf/krb-version.m44
-rw-r--r--crypto/heimdal/cf/mips-abi.m44
-rw-r--r--crypto/heimdal/cf/need-proto.m44
-rw-r--r--crypto/heimdal/cf/osfc2.m44
-rw-r--r--crypto/heimdal/cf/proto-compat.m44
-rw-r--r--crypto/heimdal/cf/retsigtype.m44
-rw-r--r--crypto/heimdal/cf/roken-frag.m44
-rw-r--r--crypto/heimdal/cf/roken.m44
-rw-r--r--crypto/heimdal/cf/test-package.m44
-rw-r--r--crypto/heimdal/cf/wflags.m44
50 files changed, 110 insertions, 107 deletions
diff --git a/crypto/heimdal/cf/ChangeLog b/crypto/heimdal/cf/ChangeLog
index 16787e1..1018925 100644
--- a/crypto/heimdal/cf/ChangeLog
+++ b/crypto/heimdal/cf/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-15 Love <lha@stacken.kth.se>
+
+ * check-compile-et.m4: 1.7->1.8: check if compile_et support
+ ``error_table N M'' also, don't be overly aggressivly reset CFLAGS
+
2003-05-08 Johan Danielsson <joda@pdc.kth.se>
* Makefile.am.common: change install-data-local to
diff --git a/crypto/heimdal/cf/Makefile.am.common b/crypto/heimdal/cf/Makefile.am.common
index bd7a73d..ddb86a4 100644
--- a/crypto/heimdal/cf/Makefile.am.common
+++ b/crypto/heimdal/cf/Makefile.am.common
@@ -1,6 +1,4 @@
-# $Id: Makefile.am.common,v 1.37.2.1 2003/05/08 17:08:09 joda Exp $
-
-AUTOMAKE_OPTIONS = foreign no-dependencies 1.6
+# $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
SUFFIXES = .et .h
diff --git a/crypto/heimdal/cf/aix.m4 b/crypto/heimdal/cf/aix.m4
index 8cca239..155cef2 100644
--- a/crypto/heimdal/cf/aix.m4
+++ b/crypto/heimdal/cf/aix.m4
@@ -1,8 +1,8 @@
dnl
-dnl $Id: aix.m4,v 1.9 2002/08/28 19:19:43 joda Exp $
+dnl $Id: aix.m4,v 1.9.6.1 2004/04/01 07:27:32 joda Exp $
dnl
-AC_DEFUN(rk_AIX,[
+AC_DEFUN([rk_AIX],[
aix=no
case "$host" in
diff --git a/crypto/heimdal/cf/auth-modules.m4 b/crypto/heimdal/cf/auth-modules.m4
index 18036c2..5fb88f3 100644
--- a/crypto/heimdal/cf/auth-modules.m4
+++ b/crypto/heimdal/cf/auth-modules.m4
@@ -1,10 +1,10 @@
-dnl $Id: auth-modules.m4,v 1.5 2002/09/09 13:31:45 joda Exp $
+dnl $Id: auth-modules.m4,v 1.5.6.1 2004/04/01 07:27:32 joda Exp $
dnl
dnl Figure what authentication modules should be built
dnl
dnl rk_AUTH_MODULES(module-list)
-AC_DEFUN(rk_AUTH_MODULES,[
+AC_DEFUN([rk_AUTH_MODULES],[
AC_MSG_CHECKING([which authentication modules should be built])
z='m4_ifval([$1], $1, [sia pam afskauthlib])'
diff --git a/crypto/heimdal/cf/broken-getaddrinfo.m4 b/crypto/heimdal/cf/broken-getaddrinfo.m4
index bb1c129..a97e438 100644
--- a/crypto/heimdal/cf/broken-getaddrinfo.m4
+++ b/crypto/heimdal/cf/broken-getaddrinfo.m4
@@ -1,8 +1,8 @@
-dnl $Id: broken-getaddrinfo.m4,v 1.3 2002/08/20 14:09:40 joda Exp $
+dnl $Id: broken-getaddrinfo.m4,v 1.3.6.1 2004/04/01 07:27:32 joda Exp $
dnl
dnl test if getaddrinfo can handle numeric services
-AC_DEFUN(rk_BROKEN_GETADDRINFO,[
+AC_DEFUN([rk_BROKEN_GETADDRINFO],[
AC_CACHE_CHECK([if getaddrinfo handles numeric services], ac_cv_func_getaddrinfo_numserv,
AC_TRY_RUN([[#include <stdio.h>
#include <sys/types.h>
diff --git a/crypto/heimdal/cf/broken-getnameinfo.m4 b/crypto/heimdal/cf/broken-getnameinfo.m4
index da206c0..bf2897b 100644
--- a/crypto/heimdal/cf/broken-getnameinfo.m4
+++ b/crypto/heimdal/cf/broken-getnameinfo.m4
@@ -1,8 +1,8 @@
-dnl $Id: broken-getnameinfo.m4,v 1.2 2000/12/05 09:09:00 joda Exp $
+dnl $Id: broken-getnameinfo.m4,v 1.2.12.1 2004/04/01 07:27:32 joda Exp $
dnl
dnl test for broken AIX getnameinfo
-AC_DEFUN(rk_BROKEN_GETNAMEINFO,[
+AC_DEFUN([rk_BROKEN_GETNAMEINFO],[
AC_CACHE_CHECK([if getnameinfo is broken], ac_cv_func_getnameinfo_broken,
AC_TRY_RUN([[#include <stdio.h>
#include <sys/types.h>
diff --git a/crypto/heimdal/cf/broken-glob.m4 b/crypto/heimdal/cf/broken-glob.m4
index 1c01cdf..4f4211a 100644
--- a/crypto/heimdal/cf/broken-glob.m4
+++ b/crypto/heimdal/cf/broken-glob.m4
@@ -1,8 +1,8 @@
-dnl $Id: broken-glob.m4,v 1.4 2001/06/19 09:59:46 assar Exp $
+dnl $Id: broken-glob.m4,v 1.4.12.1 2004/04/01 07:27:32 joda Exp $
dnl
dnl check for glob(3)
dnl
-AC_DEFUN(AC_BROKEN_GLOB,[
+AC_DEFUN([AC_BROKEN_GLOB],[
AC_CACHE_CHECK(for working glob, ac_cv_func_glob_working,
ac_cv_func_glob_working=yes
AC_TRY_LINK([
diff --git a/crypto/heimdal/cf/broken-realloc.m4 b/crypto/heimdal/cf/broken-realloc.m4
index 1569255..e34d23d 100644
--- a/crypto/heimdal/cf/broken-realloc.m4
+++ b/crypto/heimdal/cf/broken-realloc.m4
@@ -1,9 +1,9 @@
dnl
-dnl $Id: broken-realloc.m4,v 1.1 2000/07/15 18:05:36 joda Exp $
+dnl $Id: broken-realloc.m4,v 1.1.12.1 2004/04/01 07:27:32 joda Exp $
dnl
dnl Test for realloc that doesn't handle NULL as first parameter
dnl
-AC_DEFUN(rk_BROKEN_REALLOC, [
+AC_DEFUN([rk_BROKEN_REALLOC], [
AC_CACHE_CHECK(if realloc if broken, ac_cv_func_realloc_broken, [
ac_cv_func_realloc_broken=no
AC_TRY_RUN([
diff --git a/crypto/heimdal/cf/broken-snprintf.m4 b/crypto/heimdal/cf/broken-snprintf.m4
index 4b66f97..8436733 100644
--- a/crypto/heimdal/cf/broken-snprintf.m4
+++ b/crypto/heimdal/cf/broken-snprintf.m4
@@ -1,6 +1,6 @@
-dnl $Id: broken-snprintf.m4,v 1.4 2001/09/01 11:56:05 assar Exp $
+dnl $Id: broken-snprintf.m4,v 1.4.10.1 2004/04/01 07:27:32 joda Exp $
dnl
-AC_DEFUN(AC_BROKEN_SNPRINTF, [
+AC_DEFUN([AC_BROKEN_SNPRINTF], [
AC_CACHE_CHECK(for working snprintf,ac_cv_func_snprintf_working,
ac_cv_func_snprintf_working=yes
AC_TRY_RUN([
@@ -21,7 +21,7 @@ AC_NEED_PROTO([#include <stdio.h>],snprintf)
fi
])
-AC_DEFUN(AC_BROKEN_VSNPRINTF,[
+AC_DEFUN([AC_BROKEN_VSNPRINTF],[
AC_CACHE_CHECK(for working vsnprintf,ac_cv_func_vsnprintf_working,
ac_cv_func_vsnprintf_working=yes
AC_TRY_RUN([
diff --git a/crypto/heimdal/cf/c-attribute.m4 b/crypto/heimdal/cf/c-attribute.m4
index 87cea03..6641b74 100644
--- a/crypto/heimdal/cf/c-attribute.m4
+++ b/crypto/heimdal/cf/c-attribute.m4
@@ -1,12 +1,12 @@
dnl
-dnl $Id: c-attribute.m4,v 1.2 1999/03/01 09:52:23 joda Exp $
+dnl $Id: c-attribute.m4,v 1.2.34.1 2004/04/01 07:27:32 joda Exp $
dnl
dnl
dnl Test for __attribute__
dnl
-AC_DEFUN(AC_C___ATTRIBUTE__, [
+AC_DEFUN([AC_C___ATTRIBUTE__], [
AC_MSG_CHECKING(for __attribute__)
AC_CACHE_VAL(ac_cv___attribute__, [
AC_TRY_COMPILE([
diff --git a/crypto/heimdal/cf/c-function.m4 b/crypto/heimdal/cf/c-function.m4
index b16d556..056b890 100644
--- a/crypto/heimdal/cf/c-function.m4
+++ b/crypto/heimdal/cf/c-function.m4
@@ -1,12 +1,12 @@
dnl
-dnl $Id: c-function.m4,v 1.2 1999/03/01 09:52:23 joda Exp $
+dnl $Id: c-function.m4,v 1.2.34.1 2004/04/01 07:27:32 joda Exp $
dnl
dnl
dnl Test for __FUNCTION__
dnl
-AC_DEFUN(AC_C___FUNCTION__, [
+AC_DEFUN([AC_C___FUNCTION__], [
AC_MSG_CHECKING(for __FUNCTION__)
AC_CACHE_VAL(ac_cv___function__, [
AC_TRY_RUN([
diff --git a/crypto/heimdal/cf/capabilities.m4 b/crypto/heimdal/cf/capabilities.m4
index 6d2669b..9b258d5 100644
--- a/crypto/heimdal/cf/capabilities.m4
+++ b/crypto/heimdal/cf/capabilities.m4
@@ -1,12 +1,12 @@
dnl
-dnl $Id: capabilities.m4,v 1.2 1999/09/01 11:02:26 joda Exp $
+dnl $Id: capabilities.m4,v 1.2.20.1 2004/04/01 07:27:32 joda Exp $
dnl
dnl
dnl Test SGI capabilities
dnl
-AC_DEFUN(KRB_CAPABILITIES,[
+AC_DEFUN([KRB_CAPABILITIES],[
AC_CHECK_HEADERS(capability.h sys/capability.h)
diff --git a/crypto/heimdal/cf/check-compile-et.m4 b/crypto/heimdal/cf/check-compile-et.m4
index 096b267..b71833c 100644
--- a/crypto/heimdal/cf/check-compile-et.m4
+++ b/crypto/heimdal/cf/check-compile-et.m4
@@ -1,4 +1,4 @@
-dnl $Id: check-compile-et.m4,v 1.7 2003/03/12 16:48:52 lha Exp $
+dnl $Id: check-compile-et.m4,v 1.7.2.1 2003/08/15 14:40:42 lha Exp $
dnl
dnl CHECK_COMPILE_ET
AC_DEFUN([CHECK_COMPILE_ET], [
@@ -12,7 +12,7 @@ if test "${COMPILE_ET}" = "compile_et"; then
dnl We have compile_et. Now let's see if it supports `prefix' and `index'.
AC_MSG_CHECKING(whether compile_et has the features we need)
cat > conftest_et.et <<'EOF'
-error_table conf
+error_table test conf
prefix CONFTEST
index 1
error_code CODE1, "CODE1"
@@ -22,7 +22,7 @@ end
EOF
if ${COMPILE_ET} conftest_et.et >/dev/null 2>&1; then
dnl XXX Some systems have <et/com_err.h>.
- save_CPPFLAGS="${save_CPPFLAGS}"
+ save_CPPFLAGS="${CPPFLAGS}"
if test -d "/usr/include/et"; then
CPPFLAGS="-I/usr/include/et ${CPPFLAGS}"
fi
@@ -31,18 +31,18 @@ if ${COMPILE_ET} conftest_et.et >/dev/null 2>&1; then
#include <com_err.h>
#include <string.h>
#include "conftest_et.h"
-int main(){return (CONFTEST_CODE2 - CONFTEST_CODE1) != 127;}
+int main(){
+#ifndef ERROR_TABLE_BASE_conf
+#error compile_et does not handle error_table N M
+#endif
+return (CONFTEST_CODE2 - CONFTEST_CODE1) != 127;}
], [krb_cv_compile_et="yes"],[CPPFLAGS="${save_CPPFLAGS}"])
fi
AC_MSG_RESULT(${krb_cv_compile_et})
if test "${krb_cv_compile_et}" = "yes"; then
AC_MSG_CHECKING(for if com_err needs to have a initialize_error_table_r)
- save2_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS"
AC_EGREP_CPP(initialize_error_table_r,[#include "conftest_et.c"],
- [krb_cv_com_err_need_r="initialize_error_table_r(0,0,0,0);"
- CPPFLAGS="$save2_CPPFLAGS"],
- [CPPFLAGS="${save_CPPFLAGS}"])
+ [krb_cv_com_err_need_r="initialize_error_table_r(0,0,0,0);"])
if test X"$krb_cv_com_err_need_r" = X ; then
AC_MSG_RESULT(no)
else
diff --git a/crypto/heimdal/cf/check-declaration.m4 b/crypto/heimdal/cf/check-declaration.m4
index 5f584e5..18bdf8a 100644
--- a/crypto/heimdal/cf/check-declaration.m4
+++ b/crypto/heimdal/cf/check-declaration.m4
@@ -1,11 +1,11 @@
-dnl $Id: check-declaration.m4,v 1.3 1999/03/01 13:03:08 joda Exp $
+dnl $Id: check-declaration.m4,v 1.3.34.1 2004/04/01 07:27:32 joda Exp $
dnl
dnl
dnl Check if we need the declaration of a variable
dnl
dnl AC_HAVE_DECLARATION(includes, variable)
-AC_DEFUN(AC_CHECK_DECLARATION, [
+AC_DEFUN([AC_CHECK_DECLARATION], [
AC_MSG_CHECKING([if $2 is properly declared])
AC_CACHE_VAL(ac_cv_var_$2_declaration, [
AC_TRY_COMPILE([$1
diff --git a/crypto/heimdal/cf/check-getpwnam_r-posix.m4 b/crypto/heimdal/cf/check-getpwnam_r-posix.m4
index cc75666..d3b1e0f 100644
--- a/crypto/heimdal/cf/check-getpwnam_r-posix.m4
+++ b/crypto/heimdal/cf/check-getpwnam_r-posix.m4
@@ -1,8 +1,8 @@
-dnl $Id: check-getpwnam_r-posix.m4,v 1.2 1999/03/23 16:47:31 joda Exp $
+dnl $Id: check-getpwnam_r-posix.m4,v 1.2.34.1 2004/04/01 07:27:32 joda Exp $
dnl
dnl check for getpwnam_r, and if it's posix or not
-AC_DEFUN(AC_CHECK_GETPWNAM_R_POSIX,[
+AC_DEFUN([AC_CHECK_GETPWNAM_R_POSIX],[
AC_FIND_FUNC_NO_LIBS(getpwnam_r,c_r)
if test "$ac_cv_func_getpwnam_r" = yes; then
AC_CACHE_CHECK(if getpwnam_r is posix,ac_cv_func_getpwnam_r_posix,
diff --git a/crypto/heimdal/cf/check-man.m4 b/crypto/heimdal/cf/check-man.m4
index adf5477..dd04666 100644
--- a/crypto/heimdal/cf/check-man.m4
+++ b/crypto/heimdal/cf/check-man.m4
@@ -1,8 +1,8 @@
-dnl $Id: check-man.m4,v 1.3 2000/11/30 01:47:17 joda Exp $
+dnl $Id: check-man.m4,v 1.3.12.1 2004/04/01 07:27:32 joda Exp $
dnl check how to format manual pages
dnl
-AC_DEFUN(rk_CHECK_MAN,
+AC_DEFUN([rk_CHECK_MAN],
[AC_PATH_PROG(NROFF, nroff)
AC_PATH_PROG(GROFF, groff)
AC_CACHE_CHECK(how to format man pages,ac_cv_sys_man_format,
diff --git a/crypto/heimdal/cf/check-netinet-ip-and-tcp.m4 b/crypto/heimdal/cf/check-netinet-ip-and-tcp.m4
index 70b58f5..f169a4f 100644
--- a/crypto/heimdal/cf/check-netinet-ip-and-tcp.m4
+++ b/crypto/heimdal/cf/check-netinet-ip-and-tcp.m4
@@ -1,11 +1,11 @@
dnl
-dnl $Id: check-netinet-ip-and-tcp.m4,v 1.3 2000/07/18 10:33:02 joda Exp $
+dnl $Id: check-netinet-ip-and-tcp.m4,v 1.3.12.1 2004/04/01 07:27:33 joda Exp $
dnl
dnl extra magic check for netinet/{ip.h,tcp.h} because on irix 6.5.3
dnl you have to include standards.h before including these files
-AC_DEFUN(CHECK_NETINET_IP_AND_TCP,
+AC_DEFUN([CHECK_NETINET_IP_AND_TCP],
[
AC_CHECK_HEADERS(standards.h)
for i in netinet/ip.h netinet/tcp.h; do
diff --git a/crypto/heimdal/cf/check-type-extra.m4 b/crypto/heimdal/cf/check-type-extra.m4
index e6af4bd..08471a7 100644
--- a/crypto/heimdal/cf/check-type-extra.m4
+++ b/crypto/heimdal/cf/check-type-extra.m4
@@ -1,9 +1,9 @@
-dnl $Id: check-type-extra.m4,v 1.2 1999/03/01 09:52:23 joda Exp $
+dnl $Id: check-type-extra.m4,v 1.2.34.1 2004/04/01 07:27:33 joda Exp $
dnl
dnl ac_check_type + extra headers
dnl AC_CHECK_TYPE_EXTRA(TYPE, DEFAULT, HEADERS)
-AC_DEFUN(AC_CHECK_TYPE_EXTRA,
+AC_DEFUN([AC_CHECK_TYPE_EXTRA],
[AC_REQUIRE([AC_HEADER_STDC])dnl
AC_MSG_CHECKING(for $1)
AC_CACHE_VAL(ac_cv_type_$1,
diff --git a/crypto/heimdal/cf/check-x.m4 b/crypto/heimdal/cf/check-x.m4
index 1791e5a..53a3d8c 100644
--- a/crypto/heimdal/cf/check-x.m4
+++ b/crypto/heimdal/cf/check-x.m4
@@ -1,9 +1,9 @@
dnl
dnl See if there is any X11 present
dnl
-dnl $Id: check-x.m4,v 1.2 1999/11/05 04:25:23 assar Exp $
+dnl $Id: check-x.m4,v 1.2.20.1 2004/04/01 07:27:33 joda Exp $
-AC_DEFUN(KRB_CHECK_X,[
+AC_DEFUN([KRB_CHECK_X],[
AC_PATH_XTRA
# try to figure out if we need any additional ld flags, like -R
diff --git a/crypto/heimdal/cf/check-xau.m4 b/crypto/heimdal/cf/check-xau.m4
index bad2a60..94f9586 100644
--- a/crypto/heimdal/cf/check-xau.m4
+++ b/crypto/heimdal/cf/check-xau.m4
@@ -1,8 +1,8 @@
-dnl $Id: check-xau.m4,v 1.3 1999/05/14 01:17:06 assar Exp $
+dnl $Id: check-xau.m4,v 1.3.34.1 2004/04/01 07:27:33 joda Exp $
dnl
dnl check for Xau{Read,Write}Auth and XauFileName
dnl
-AC_DEFUN(AC_CHECK_XAU,[
+AC_DEFUN([AC_CHECK_XAU],[
save_CFLAGS="$CFLAGS"
CFLAGS="$X_CFLAGS $CFLAGS"
save_LIBS="$LIBS"
diff --git a/crypto/heimdal/cf/find-func-no-libs.m4 b/crypto/heimdal/cf/find-func-no-libs.m4
index 3deab02..4410330 100644
--- a/crypto/heimdal/cf/find-func-no-libs.m4
+++ b/crypto/heimdal/cf/find-func-no-libs.m4
@@ -1,9 +1,9 @@
-dnl $Id: find-func-no-libs.m4,v 1.5 1999/10/30 21:08:18 assar Exp $
+dnl $Id: find-func-no-libs.m4,v 1.5.20.1 2004/04/01 07:27:33 joda Exp $
dnl
dnl
dnl Look for function in any of the specified libraries
dnl
dnl AC_FIND_FUNC_NO_LIBS(func, libraries, includes, arguments, extra libs, extra args)
-AC_DEFUN(AC_FIND_FUNC_NO_LIBS, [
+AC_DEFUN([AC_FIND_FUNC_NO_LIBS], [
AC_FIND_FUNC_NO_LIBS2([$1], ["" $2], [$3], [$4], [$5], [$6])])
diff --git a/crypto/heimdal/cf/find-func-no-libs2.m4 b/crypto/heimdal/cf/find-func-no-libs2.m4
index 45e3f13..566504a 100644
--- a/crypto/heimdal/cf/find-func-no-libs2.m4
+++ b/crypto/heimdal/cf/find-func-no-libs2.m4
@@ -1,11 +1,11 @@
-dnl $Id: find-func-no-libs2.m4,v 1.6 2001/09/01 10:57:32 assar Exp $
+dnl $Id: find-func-no-libs2.m4,v 1.6.10.1 2004/04/01 07:27:33 joda Exp $
dnl
dnl
dnl Look for function in any of the specified libraries
dnl
dnl AC_FIND_FUNC_NO_LIBS2(func, libraries, includes, arguments, extra libs, extra args)
-AC_DEFUN(AC_FIND_FUNC_NO_LIBS2, [
+AC_DEFUN([AC_FIND_FUNC_NO_LIBS2], [
AC_MSG_CHECKING([for $1])
AC_CACHE_VAL(ac_cv_funclib_$1,
diff --git a/crypto/heimdal/cf/find-func.m4 b/crypto/heimdal/cf/find-func.m4
index bb2b3ac..a5916cd 100644
--- a/crypto/heimdal/cf/find-func.m4
+++ b/crypto/heimdal/cf/find-func.m4
@@ -1,7 +1,7 @@
-dnl $Id: find-func.m4,v 1.1 1997/12/14 15:58:58 joda Exp $
+dnl $Id: find-func.m4,v 1.1.42.1 2004/04/01 07:27:33 joda Exp $
dnl
dnl AC_FIND_FUNC(func, libraries, includes, arguments)
-AC_DEFUN(AC_FIND_FUNC, [
+AC_DEFUN([AC_FIND_FUNC], [
AC_FIND_FUNC_NO_LIBS([$1], [$2], [$3], [$4])
if test -n "$LIB_$1"; then
LIBS="$LIB_$1 $LIBS"
diff --git a/crypto/heimdal/cf/find-if-not-broken.m4 b/crypto/heimdal/cf/find-if-not-broken.m4
index 88d4fc0..87ea361 100644
--- a/crypto/heimdal/cf/find-if-not-broken.m4
+++ b/crypto/heimdal/cf/find-if-not-broken.m4
@@ -1,10 +1,10 @@
-dnl $Id: find-if-not-broken.m4,v 1.4 2002/05/19 19:37:08 joda Exp $
+dnl $Id: find-if-not-broken.m4,v 1.4.8.1 2004/04/01 07:27:33 joda Exp $
dnl
dnl
dnl Mix between AC_FIND_FUNC and AC_BROKEN
dnl
-AC_DEFUN(AC_FIND_IF_NOT_BROKEN,
+AC_DEFUN([AC_FIND_IF_NOT_BROKEN],
[AC_FIND_FUNC([$1], [$2], [$3], [$4])
if eval "test \"$ac_cv_func_$1\" != yes"; then
rk_LIBOBJ([$1])
diff --git a/crypto/heimdal/cf/have-pragma-weak.m4 b/crypto/heimdal/cf/have-pragma-weak.m4
index 330e601..a13016a 100644
--- a/crypto/heimdal/cf/have-pragma-weak.m4
+++ b/crypto/heimdal/cf/have-pragma-weak.m4
@@ -1,6 +1,6 @@
-dnl $Id: have-pragma-weak.m4,v 1.3 1999/03/01 11:55:25 joda Exp $
+dnl $Id: have-pragma-weak.m4,v 1.3.34.1 2004/04/01 07:27:33 joda Exp $
dnl
-AC_DEFUN(AC_HAVE_PRAGMA_WEAK, [
+AC_DEFUN([AC_HAVE_PRAGMA_WEAK], [
if test "${enable_shared}" = "yes"; then
AC_MSG_CHECKING(for pragma weak)
AC_CACHE_VAL(ac_have_pragma_weak, [
diff --git a/crypto/heimdal/cf/have-struct-field.m4 b/crypto/heimdal/cf/have-struct-field.m4
index 88ad5c3..341970a 100644
--- a/crypto/heimdal/cf/have-struct-field.m4
+++ b/crypto/heimdal/cf/have-struct-field.m4
@@ -1,10 +1,10 @@
-dnl $Id: have-struct-field.m4,v 1.6 1999/07/29 01:44:32 assar Exp $
+dnl $Id: have-struct-field.m4,v 1.6.22.1 2004/04/01 07:27:33 joda Exp $
dnl
dnl check for fields in a structure
dnl
dnl AC_HAVE_STRUCT_FIELD(struct, field, headers)
-AC_DEFUN(AC_HAVE_STRUCT_FIELD, [
+AC_DEFUN([AC_HAVE_STRUCT_FIELD], [
define(cache_val, translit(ac_cv_type_$1_$2, [A-Z ], [a-z_]))
AC_CACHE_CHECK([for $2 in $1], cache_val,[
AC_TRY_COMPILE([$3],[$1 x; x.$2;],
diff --git a/crypto/heimdal/cf/have-type.m4 b/crypto/heimdal/cf/have-type.m4
index 4b79e1e..c764ed6 100644
--- a/crypto/heimdal/cf/have-type.m4
+++ b/crypto/heimdal/cf/have-type.m4
@@ -1,9 +1,9 @@
-dnl $Id: have-type.m4,v 1.6 2000/07/15 18:10:00 joda Exp $
+dnl $Id: have-type.m4,v 1.6.12.1 2004/04/01 07:27:33 joda Exp $
dnl
dnl check for existance of a type
dnl AC_HAVE_TYPE(TYPE,INCLUDES)
-AC_DEFUN(AC_HAVE_TYPE, [
+AC_DEFUN([AC_HAVE_TYPE], [
AC_REQUIRE([AC_HEADER_STDC])
cv=`echo "$1" | sed 'y%./+- %__p__%'`
AC_MSG_CHECKING(for $1)
diff --git a/crypto/heimdal/cf/have-types.m4 b/crypto/heimdal/cf/have-types.m4
index b968d4b..e369910 100644
--- a/crypto/heimdal/cf/have-types.m4
+++ b/crypto/heimdal/cf/have-types.m4
@@ -1,8 +1,8 @@
dnl
-dnl $Id: have-types.m4,v 1.2 2000/07/15 18:09:16 joda Exp $
+dnl $Id: have-types.m4,v 1.2.12.1 2004/04/01 07:27:33 joda Exp $
dnl
-AC_DEFUN(AC_HAVE_TYPES, [
+AC_DEFUN([AC_HAVE_TYPES], [
for i in $1; do
AC_HAVE_TYPE($i)
done
diff --git a/crypto/heimdal/cf/krb-bigendian.m4 b/crypto/heimdal/cf/krb-bigendian.m4
index 4aa73d2..672cc25 100644
--- a/crypto/heimdal/cf/krb-bigendian.m4
+++ b/crypto/heimdal/cf/krb-bigendian.m4
@@ -1,5 +1,5 @@
dnl
-dnl $Id: krb-bigendian.m4,v 1.8 2002/08/28 19:20:19 joda Exp $
+dnl $Id: krb-bigendian.m4,v 1.8.6.1 2004/04/01 07:27:33 joda Exp $
dnl
dnl check if this computer is little or big-endian
@@ -7,7 +7,7 @@ dnl if we can figure it out at compile-time then don't define the cpp symbol
dnl otherwise test for it and define it. also allow options for overriding
dnl it when cross-compiling
-AC_DEFUN(KRB_C_BIGENDIAN, [
+AC_DEFUN([KRB_C_BIGENDIAN], [
AC_ARG_ENABLE(bigendian,
AC_HELP_STRING([--enable-bigendian],[the target is big endian]),
krb_cv_c_bigendian=yes)
diff --git a/crypto/heimdal/cf/krb-func-getcwd-broken.m4 b/crypto/heimdal/cf/krb-func-getcwd-broken.m4
index 3f08030..e3f9372 100644
--- a/crypto/heimdal/cf/krb-func-getcwd-broken.m4
+++ b/crypto/heimdal/cf/krb-func-getcwd-broken.m4
@@ -1,10 +1,10 @@
-dnl $Id: krb-func-getcwd-broken.m4,v 1.3 2002/05/19 19:17:35 joda Exp $
+dnl $Id: krb-func-getcwd-broken.m4,v 1.3.8.1 2004/04/01 07:27:34 joda Exp $
dnl
dnl
dnl test for broken getcwd in (SunOS braindamage)
dnl
-AC_DEFUN(AC_KRB_FUNC_GETCWD_BROKEN, [
+AC_DEFUN([AC_KRB_FUNC_GETCWD_BROKEN], [
if test "$ac_cv_func_getcwd" = yes; then
AC_MSG_CHECKING(if getcwd is broken)
AC_CACHE_VAL(ac_cv_func_getcwd_broken, [
diff --git a/crypto/heimdal/cf/krb-func-getlogin.m4 b/crypto/heimdal/cf/krb-func-getlogin.m4
index 921c5ab..ec091d7 100644
--- a/crypto/heimdal/cf/krb-func-getlogin.m4
+++ b/crypto/heimdal/cf/krb-func-getlogin.m4
@@ -1,11 +1,11 @@
dnl
-dnl $Id: krb-func-getlogin.m4,v 1.1 1999/07/13 17:45:30 assar Exp $
+dnl $Id: krb-func-getlogin.m4,v 1.1.32.1 2004/04/01 07:27:34 joda Exp $
dnl
dnl test for POSIX (broken) getlogin
dnl
-AC_DEFUN(AC_FUNC_GETLOGIN, [
+AC_DEFUN([AC_FUNC_GETLOGIN], [
AC_CHECK_FUNCS(getlogin setlogin)
if test "$ac_cv_func_getlogin" = yes; then
AC_CACHE_CHECK(if getlogin is posix, ac_cv_func_getlogin_posix, [
diff --git a/crypto/heimdal/cf/krb-ipv6.m4 b/crypto/heimdal/cf/krb-ipv6.m4
index ba66be7..1afcbb2 100644
--- a/crypto/heimdal/cf/krb-ipv6.m4
+++ b/crypto/heimdal/cf/krb-ipv6.m4
@@ -1,8 +1,8 @@
-dnl $Id: krb-ipv6.m4,v 1.13 2002/04/30 16:48:13 joda Exp $
+dnl $Id: krb-ipv6.m4,v 1.13.8.1 2004/04/01 07:27:34 joda Exp $
dnl
dnl test for IPv6
dnl
-AC_DEFUN(AC_KRB_IPV6, [
+AC_DEFUN([AC_KRB_IPV6], [
AC_ARG_WITH(ipv6,
AC_HELP_STRING([--without-ipv6],[do not enable IPv6 support]),[
if test "$withval" = "no"; then
diff --git a/crypto/heimdal/cf/krb-prog-ln-s.m4 b/crypto/heimdal/cf/krb-prog-ln-s.m4
index efb706e..16a4dff 100644
--- a/crypto/heimdal/cf/krb-prog-ln-s.m4
+++ b/crypto/heimdal/cf/krb-prog-ln-s.m4
@@ -1,10 +1,10 @@
-dnl $Id: krb-prog-ln-s.m4,v 1.1 1997/12/14 15:59:01 joda Exp $
+dnl $Id: krb-prog-ln-s.m4,v 1.1.42.1 2004/04/01 07:27:34 joda Exp $
dnl
dnl
dnl Better test for ln -s, ln or cp
dnl
-AC_DEFUN(AC_KRB_PROG_LN_S,
+AC_DEFUN([AC_KRB_PROG_LN_S],
[AC_MSG_CHECKING(for ln -s or something else)
AC_CACHE_VAL(ac_cv_prog_LN_S,
[rm -f conftestdata
diff --git a/crypto/heimdal/cf/krb-prog-ranlib.m4 b/crypto/heimdal/cf/krb-prog-ranlib.m4
index fd1d3db..cf06193 100644
--- a/crypto/heimdal/cf/krb-prog-ranlib.m4
+++ b/crypto/heimdal/cf/krb-prog-ranlib.m4
@@ -1,8 +1,8 @@
-dnl $Id: krb-prog-ranlib.m4,v 1.1 1997/12/14 15:59:01 joda Exp $
+dnl $Id: krb-prog-ranlib.m4,v 1.1.42.1 2004/04/01 07:27:34 joda Exp $
dnl
dnl
dnl Also look for EMXOMF for OS/2
dnl
-AC_DEFUN(AC_KRB_PROG_RANLIB,
+AC_DEFUN([AC_KRB_PROG_RANLIB],
[AC_CHECK_PROGS(RANLIB, ranlib EMXOMF, :)])
diff --git a/crypto/heimdal/cf/krb-prog-yacc.m4 b/crypto/heimdal/cf/krb-prog-yacc.m4
index f0b6e44..54dd8b4 100644
--- a/crypto/heimdal/cf/krb-prog-yacc.m4
+++ b/crypto/heimdal/cf/krb-prog-yacc.m4
@@ -1,10 +1,10 @@
-dnl $Id: krb-prog-yacc.m4,v 1.3 2000/03/28 12:12:23 assar Exp $
+dnl $Id: krb-prog-yacc.m4,v 1.3.16.1 2004/04/01 07:27:34 joda Exp $
dnl
dnl
dnl We prefer byacc or yacc because they do not use `alloca'
dnl
-AC_DEFUN(AC_KRB_PROG_YACC,
+AC_DEFUN([AC_KRB_PROG_YACC],
[AC_CHECK_PROGS(YACC, byacc yacc 'bison -y')
if test "$YACC" = ""; then
AC_MSG_WARN([yacc not found - some stuff will not build])
diff --git a/crypto/heimdal/cf/krb-readline.m4 b/crypto/heimdal/cf/krb-readline.m4
index 656a088..ed5aa0a 100644
--- a/crypto/heimdal/cf/krb-readline.m4
+++ b/crypto/heimdal/cf/krb-readline.m4
@@ -1,11 +1,11 @@
-dnl $Id: krb-readline.m4,v 1.5 2002/08/29 02:22:32 assar Exp $
+dnl $Id: krb-readline.m4,v 1.5.6.1 2004/04/01 07:27:34 joda Exp $
dnl
dnl Tests for readline functions
dnl
dnl el_init
-AC_DEFUN(KRB_READLINE,[
+AC_DEFUN([KRB_READLINE],[
AC_FIND_FUNC_NO_LIBS(el_init, edit, [], [], [$LIB_tgetent])
if test "$ac_cv_func_el_init" = yes ; then
AC_CACHE_CHECK(for four argument el_init, ac_cv_func_el_init_four,[
diff --git a/crypto/heimdal/cf/krb-struct-spwd.m4 b/crypto/heimdal/cf/krb-struct-spwd.m4
index 4ab81fd..49d8efd 100644
--- a/crypto/heimdal/cf/krb-struct-spwd.m4
+++ b/crypto/heimdal/cf/krb-struct-spwd.m4
@@ -1,8 +1,8 @@
-dnl $Id: krb-struct-spwd.m4,v 1.3 1999/07/13 21:04:11 assar Exp $
+dnl $Id: krb-struct-spwd.m4,v 1.3.32.1 2004/04/01 07:27:34 joda Exp $
dnl
dnl Test for `struct spwd'
-AC_DEFUN(AC_KRB_STRUCT_SPWD, [
+AC_DEFUN([AC_KRB_STRUCT_SPWD], [
AC_MSG_CHECKING(for struct spwd)
AC_CACHE_VAL(ac_cv_struct_spwd, [
AC_TRY_COMPILE(
diff --git a/crypto/heimdal/cf/krb-struct-winsize.m4 b/crypto/heimdal/cf/krb-struct-winsize.m4
index 8b2e1a2..3fcc527 100644
--- a/crypto/heimdal/cf/krb-struct-winsize.m4
+++ b/crypto/heimdal/cf/krb-struct-winsize.m4
@@ -1,10 +1,10 @@
-dnl $Id: krb-struct-winsize.m4,v 1.3 2001/09/01 11:56:05 assar Exp $
+dnl $Id: krb-struct-winsize.m4,v 1.3.10.1 2004/04/01 07:27:34 joda Exp $
dnl
dnl
dnl Search for struct winsize
dnl
-AC_DEFUN(AC_KRB_STRUCT_WINSIZE, [
+AC_DEFUN([AC_KRB_STRUCT_WINSIZE], [
AC_MSG_CHECKING(for struct winsize)
AC_CACHE_VAL(ac_cv_struct_winsize, [
ac_cv_struct_winsize=no
diff --git a/crypto/heimdal/cf/krb-sys-aix.m4 b/crypto/heimdal/cf/krb-sys-aix.m4
index a538005..02ba585 100644
--- a/crypto/heimdal/cf/krb-sys-aix.m4
+++ b/crypto/heimdal/cf/krb-sys-aix.m4
@@ -1,9 +1,9 @@
-dnl $Id: krb-sys-aix.m4,v 1.1 1997/12/14 15:59:02 joda Exp $
+dnl $Id: krb-sys-aix.m4,v 1.1.42.1 2004/04/01 07:27:34 joda Exp $
dnl
dnl
dnl AIX have a very different syscall convention
dnl
-AC_DEFUN(AC_KRB_SYS_AIX, [
+AC_DEFUN([AC_KRB_SYS_AIX], [
AC_MSG_CHECKING(for AIX)
AC_CACHE_VAL(krb_cv_sys_aix,
AC_EGREP_CPP(yes,
diff --git a/crypto/heimdal/cf/krb-sys-nextstep.m4 b/crypto/heimdal/cf/krb-sys-nextstep.m4
index 6e9e316..1d098bc 100644
--- a/crypto/heimdal/cf/krb-sys-nextstep.m4
+++ b/crypto/heimdal/cf/krb-sys-nextstep.m4
@@ -1,10 +1,10 @@
-dnl $Id: krb-sys-nextstep.m4,v 1.4 2002/08/28 18:44:32 joda Exp $
+dnl $Id: krb-sys-nextstep.m4,v 1.4.6.1 2004/04/01 07:27:34 joda Exp $
dnl
dnl NEXTSTEP is not posix compliant by default,
dnl you need a switch -posix to the compiler
dnl
-AC_DEFUN(rk_SYS_NEXTSTEP, [
+AC_DEFUN([rk_SYS_NEXTSTEP], [
AC_CACHE_CHECK(for NeXTSTEP, rk_cv_sys_nextstep, [
AC_EGREP_CPP(yes,
[#if defined(NeXT) && !defined(__APPLE__)
diff --git a/crypto/heimdal/cf/krb-version.m4 b/crypto/heimdal/cf/krb-version.m4
index 4b55590..e452ad0 100644
--- a/crypto/heimdal/cf/krb-version.m4
+++ b/crypto/heimdal/cf/krb-version.m4
@@ -1,10 +1,10 @@
-dnl $Id: krb-version.m4,v 1.3 2002/08/20 15:49:58 joda Exp $
+dnl $Id: krb-version.m4,v 1.3.6.1 2004/04/01 07:27:34 joda Exp $
dnl
dnl
dnl output a C header-file with some version strings
dnl
-AC_DEFUN(AC_KRB_VERSION,[
+AC_DEFUN([AC_KRB_VERSION],[
cat > include/newversion.h.in <<FOOBAR
const char *${PACKAGE_TARNAME}_long_version = "@(#)\$Version: $PACKAGE_STRING by @USER@ on @HOST@ ($host) @DATE@ \$";
const char *${PACKAGE_TARNAME}_version = "$PACKAGE_STRING";
diff --git a/crypto/heimdal/cf/mips-abi.m4 b/crypto/heimdal/cf/mips-abi.m4
index 5ad464c..401ee91 100644
--- a/crypto/heimdal/cf/mips-abi.m4
+++ b/crypto/heimdal/cf/mips-abi.m4
@@ -1,10 +1,10 @@
-dnl $Id: mips-abi.m4,v 1.6 2002/04/30 16:46:05 joda Exp $
+dnl $Id: mips-abi.m4,v 1.6.8.1 2004/04/01 07:27:34 joda Exp $
dnl
dnl
dnl Check for MIPS/IRIX ABI flags. Sets $abi and $abilibdirext to some
dnl value.
-AC_DEFUN(AC_MIPS_ABI, [
+AC_DEFUN([AC_MIPS_ABI], [
AC_ARG_WITH(mips_abi,
AC_HELP_STRING([--with-mips-abi=abi],[ABI to use for IRIX (32, n32, or 64)]))
diff --git a/crypto/heimdal/cf/need-proto.m4 b/crypto/heimdal/cf/need-proto.m4
index 52f05ba..b319076 100644
--- a/crypto/heimdal/cf/need-proto.m4
+++ b/crypto/heimdal/cf/need-proto.m4
@@ -1,4 +1,4 @@
-dnl $Id: need-proto.m4,v 1.4 2002/08/23 15:07:41 joda Exp $
+dnl $Id: need-proto.m4,v 1.4.6.1 2004/04/01 07:27:35 joda Exp $
dnl
dnl
dnl Check if we need the prototype for a function
@@ -6,7 +6,7 @@ dnl
dnl AC_NEED_PROTO(includes, function)
-AC_DEFUN(AC_NEED_PROTO, [
+AC_DEFUN([AC_NEED_PROTO], [
if test "$ac_cv_func_$2+set" != set -o "$ac_cv_func_$2" = yes; then
AC_CACHE_CHECK([if $2 needs a prototype], ac_cv_func_$2_noproto,
AC_TRY_COMPILE([$1],
diff --git a/crypto/heimdal/cf/osfc2.m4 b/crypto/heimdal/cf/osfc2.m4
index af30596..3ae889b 100644
--- a/crypto/heimdal/cf/osfc2.m4
+++ b/crypto/heimdal/cf/osfc2.m4
@@ -1,8 +1,8 @@
-dnl $Id: osfc2.m4,v 1.3 2002/04/30 16:46:18 joda Exp $
+dnl $Id: osfc2.m4,v 1.3.8.1 2004/04/01 07:27:35 joda Exp $
dnl
dnl enable OSF C2 stuff
-AC_DEFUN(AC_CHECK_OSFC2,[
+AC_DEFUN([AC_CHECK_OSFC2],[
AC_ARG_ENABLE(osfc2,
AC_HELP_STRING([--enable-osfc2],[enable some OSF C2 support]))
LIB_security=
diff --git a/crypto/heimdal/cf/proto-compat.m4 b/crypto/heimdal/cf/proto-compat.m4
index 942f658..a666a55 100644
--- a/crypto/heimdal/cf/proto-compat.m4
+++ b/crypto/heimdal/cf/proto-compat.m4
@@ -1,4 +1,4 @@
-dnl $Id: proto-compat.m4,v 1.3 1999/03/01 13:03:48 joda Exp $
+dnl $Id: proto-compat.m4,v 1.3.34.1 2004/04/01 07:27:35 joda Exp $
dnl
dnl
dnl Check if the prototype of a function is compatible with another one
@@ -6,7 +6,7 @@ dnl
dnl AC_PROTO_COMPAT(includes, function, prototype)
-AC_DEFUN(AC_PROTO_COMPAT, [
+AC_DEFUN([AC_PROTO_COMPAT], [
AC_CACHE_CHECK([if $2 is compatible with system prototype],
ac_cv_func_$2_proto_compat,
AC_TRY_COMPILE([$1],
diff --git a/crypto/heimdal/cf/retsigtype.m4 b/crypto/heimdal/cf/retsigtype.m4
index 4c3ecbd..465c654 100644
--- a/crypto/heimdal/cf/retsigtype.m4
+++ b/crypto/heimdal/cf/retsigtype.m4
@@ -1,10 +1,10 @@
dnl
-dnl $Id: retsigtype.m4,v 1.1 2000/07/15 18:05:56 joda Exp $
+dnl $Id: retsigtype.m4,v 1.1.12.1 2004/04/01 07:27:35 joda Exp $
dnl
dnl Figure out return type of signal handlers, and define SIGRETURN macro
dnl that can be used to return from one
dnl
-AC_DEFUN(rk_RETSIGTYPE,[
+AC_DEFUN([rk_RETSIGTYPE],[
AC_TYPE_SIGNAL
if test "$ac_cv_type_signal" = "void" ; then
AC_DEFINE(VOID_RETSIGTYPE, 1, [Define if signal handlers return void.])
diff --git a/crypto/heimdal/cf/roken-frag.m4 b/crypto/heimdal/cf/roken-frag.m4
index fc263ad..569777a 100644
--- a/crypto/heimdal/cf/roken-frag.m4
+++ b/crypto/heimdal/cf/roken-frag.m4
@@ -1,10 +1,10 @@
-dnl $Id: roken-frag.m4,v 1.45 2002/12/18 17:34:25 joda Exp $
+dnl $Id: roken-frag.m4,v 1.45.2.1 2004/04/01 07:27:35 joda Exp $
dnl
dnl some code to get roken working
dnl
dnl rk_ROKEN(subdir)
dnl
-AC_DEFUN(rk_ROKEN, [
+AC_DEFUN([rk_ROKEN], [
AC_REQUIRE([rk_CONFIG_HEADER])
diff --git a/crypto/heimdal/cf/roken.m4 b/crypto/heimdal/cf/roken.m4
index c835a15..04a8076 100644
--- a/crypto/heimdal/cf/roken.m4
+++ b/crypto/heimdal/cf/roken.m4
@@ -1,4 +1,4 @@
-dnl $Id: roken.m4,v 1.3 2002/04/30 16:46:33 joda Exp $
+dnl $Id: roken.m4,v 1.3.8.1 2004/04/01 07:27:35 joda Exp $
dnl
dnl try to look for an installed roken library with sufficient stuff
dnl
@@ -7,7 +7,7 @@ dnl set DIR_roken to if the directory should be built
dnl set CPPFLAGS_roken to stuff to add to CPPFLAGS
dnl AC_ROKEN(version,directory-to-try,roken-dir,fallback-library,fallback-cppflags)
-AC_DEFUN(AC_ROKEN, [
+AC_DEFUN([AC_ROKEN], [
AC_ARG_WITH(roken,
AC_HELP_STRING([--with-roken=dir],[use the roken library in dir]),
diff --git a/crypto/heimdal/cf/test-package.m4 b/crypto/heimdal/cf/test-package.m4
index 9cdccc7..dd38e1e 100644
--- a/crypto/heimdal/cf/test-package.m4
+++ b/crypto/heimdal/cf/test-package.m4
@@ -1,9 +1,9 @@
-dnl $Id: test-package.m4,v 1.12 2002/09/10 15:23:38 joda Exp $
+dnl $Id: test-package.m4,v 1.12.4.1 2004/04/01 07:27:35 joda Exp $
dnl
dnl rk_TEST_PACKAGE(package,headers,libraries,extra libs,
dnl default locations, conditional, config-program)
-AC_DEFUN(rk_TEST_PACKAGE,[
+AC_DEFUN([rk_TEST_PACKAGE],[
AC_ARG_WITH($1,
AC_HELP_STRING([--with-$1=dir],[use $1 in dir]))
AC_ARG_WITH($1-lib,
diff --git a/crypto/heimdal/cf/wflags.m4 b/crypto/heimdal/cf/wflags.m4
index 6d9e073..4051f29 100644
--- a/crypto/heimdal/cf/wflags.m4
+++ b/crypto/heimdal/cf/wflags.m4
@@ -1,8 +1,8 @@
-dnl $Id: wflags.m4,v 1.3 1999/03/11 12:11:41 joda Exp $
+dnl $Id: wflags.m4,v 1.3.34.1 2004/04/01 07:27:35 joda Exp $
dnl
dnl set WFLAGS
-AC_DEFUN(AC_WFLAGS,[
+AC_DEFUN([AC_WFLAGS],[
WFLAGS_NOUNUSED=""
WFLAGS_NOIMPLICITINT=""
if test -z "$WFLAGS" -a "$GCC" = "yes"; then
OpenPOWER on IntegriCloud