From 4a69168cdf111e1e0ea77e7ecee612602bb75937 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist-=C3=85strand?= <lha@stacken.kth.se>
Date: Thu, 3 Jun 2004 06:13:27 +0000
Subject: [PATCH] i-hate-aclocal-20040603

FIXES 4922

aclocal wants [] around macro names.
good for aclocal.
---
 acinclude.m4                |  2 +-
 src/cf/aix-cc.m4            |  2 +-
 src/cf/bigendian.m4         |  2 +-
 src/cf/function-macro.m4    |  2 +-
 src/cf/irix-test.m4         |  2 +-
 src/cf/linux-test1.m4       |  2 +-
 src/cf/linux-test2.m4       | 12 +++++-----
 src/cf/linux-test3.m4       |  6 ++---
 src/cf/linux-test4.m4       | 46 ++++++++++++++++++-------------------
 src/cf/linux-test5.m4       | 10 ++++----
 src/cf/osconf.m4            |  2 +-
 src/cf/ressearch.m4         |  2 +-
 src/cf/solaris-cc.m4        |  2 +-
 src/cf/solaris-dqrwlock.m4  |  2 +-
 src/cf/solaris-fs-rolled.m4 |  2 +-
 src/cf/solaris-pcorefile.m4 |  2 +-
 16 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index d6bf77e35e..de564d484d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -4,7 +4,7 @@ dnl
 dnl NB: Because this code is a macro, references to positional shell
 dnl parameters must be done like $[]1 instead of $1
 
-AC_DEFUN(OPENAFS_CONFIGURE_COMMON,[
+AC_DEFUN([OPENAFS_CONFIGURE_COMMON],[
 
 AC_CANONICAL_HOST
 SRCDIR_PARENT=`pwd`
diff --git a/src/cf/aix-cc.m4 b/src/cf/aix-cc.m4
index acdec7abeb..6b1a5b06de 100644
--- a/src/cf/aix-cc.m4
+++ b/src/cf/aix-cc.m4
@@ -14,7 +14,7 @@ dnl vac.C 4.4.0.0		440
 dnl vac.C 5.0.2.1		502
 dnl
 
-AC_DEFUN(AC_AIX_CC_GOOD, [
+AC_DEFUN([AC_AIX_CC_GOOD], [
 AIXCC="$CC"
 save_CC="$CC"
 if test "$CC" ; then
diff --git a/src/cf/bigendian.m4 b/src/cf/bigendian.m4
index 55d72a13c7..4e92ff640f 100644
--- a/src/cf/bigendian.m4
+++ b/src/cf/bigendian.m4
@@ -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(OPENAFS_CHECK_BIGENDIAN, [
+AC_DEFUN([OPENAFS_CHECK_BIGENDIAN], [
 AC_ARG_ENABLE(bigendian,
 [  --enable-bigendian	the target is big endian],
 openafs_cv_c_bigendian=yes)
diff --git a/src/cf/function-macro.m4 b/src/cf/function-macro.m4
index ea11ecb6ab..18d7291629 100644
--- a/src/cf/function-macro.m4
+++ b/src/cf/function-macro.m4
@@ -1,4 +1,4 @@
-AC_DEFUN(COMPILER_HAS_FUNCTION_MACRO, [
+AC_DEFUN([COMPILER_HAS_FUNCTION_MACRO], [
 AC_MSG_CHECKING(for __FUNCTION__ and __LINE__ macros)
 AC_CACHE_VAL(ac_cv_compiler_has_function_macro,
 [
diff --git a/src/cf/irix-test.m4 b/src/cf/irix-test.m4
index 354d15945d..81b23c5c64 100644
--- a/src/cf/irix-test.m4
+++ b/src/cf/irix-test.m4
@@ -1,4 +1,4 @@
-AC_DEFUN(IRIX_SYS_SYSTM_H_HAS_MEM_FUNCS, [
+AC_DEFUN([IRIX_SYS_SYSTM_H_HAS_MEM_FUNCS], [
 AC_MSG_CHECKING(for mem* in sys/systm.h)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS -D_KERNEL -D__STRING_H__"
diff --git a/src/cf/linux-test1.m4 b/src/cf/linux-test1.m4
index ee298b29aa..44f2d9f94f 100644
--- a/src/cf/linux-test1.m4
+++ b/src/cf/linux-test1.m4
@@ -1,4 +1,4 @@
-AC_DEFUN(LINUX_INODE_SETATTR_RETURN_TYPE,[
+AC_DEFUN([LINUX_INODE_SETATTR_RETURN_TYPE],[
 AC_MSG_CHECKING(for inode_setattr return type)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
diff --git a/src/cf/linux-test2.m4 b/src/cf/linux-test2.m4
index ff54411c4a..cc7d39c1c6 100644
--- a/src/cf/linux-test2.m4
+++ b/src/cf/linux-test2.m4
@@ -1,4 +1,4 @@
-AC_DEFUN(LINUX_FS_STRUCT_ADDRESS_SPACE_HAS_GFP_MASK, [
+AC_DEFUN([LINUX_FS_STRUCT_ADDRESS_SPACE_HAS_GFP_MASK], [
 AC_MSG_CHECKING(for gfp_mask in struct address_space)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
@@ -13,7 +13,7 @@ ac_cv_linux_fs_struct_address_space_has_gfp_mask=no)])
 AC_MSG_RESULT($ac_cv_linux_fs_struct_address_space_has_gfp_mask)
 CPPFLAGS="$save_CPPFLAGS"])
 
-AC_DEFUN(LINUX_FS_STRUCT_INODE_HAS_I_BYTES, [
+AC_DEFUN([LINUX_FS_STRUCT_INODE_HAS_I_BYTES], [
 AC_MSG_CHECKING(for i_bytes in struct inode)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
@@ -28,7 +28,7 @@ ac_cv_linux_fs_struct_inode_has_i_bytes=no)])
 AC_MSG_RESULT($ac_cv_linux_fs_struct_inode_has_i_bytes)
 CPPFLAGS="$save_CPPFLAGS"])
 
-AC_DEFUN(LINUX_FS_STRUCT_INODE_HAS_I_ALLOC_SEM, [
+AC_DEFUN([LINUX_FS_STRUCT_INODE_HAS_I_ALLOC_SEM], [
 AC_MSG_CHECKING(for i_alloc_sem in struct inode)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
@@ -43,7 +43,7 @@ ac_cv_linux_fs_struct_inode_has_i_alloc_sem=no)])
 AC_MSG_RESULT($ac_cv_linux_fs_struct_inode_has_i_alloc_sem)
 CPPFLAGS="$save_CPPFLAGS"])
 
-AC_DEFUN(LINUX_FS_STRUCT_INODE_HAS_I_TRUNCATE_SEM, [
+AC_DEFUN([LINUX_FS_STRUCT_INODE_HAS_I_TRUNCATE_SEM], [
 AC_MSG_CHECKING(for i_truncate_sem in struct inode)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
@@ -58,7 +58,7 @@ ac_cv_linux_fs_struct_inode_has_i_truncate_sem=no)])
 AC_MSG_RESULT($ac_cv_linux_fs_struct_inode_has_i_truncate_sem)
 CPPFLAGS="$save_CPPFLAGS"])
 
-AC_DEFUN(LINUX_FS_STRUCT_ADDRESS_SPACE_HAS_PAGE_LOCK, [
+AC_DEFUN([LINUX_FS_STRUCT_ADDRESS_SPACE_HAS_PAGE_LOCK], [
 AC_MSG_CHECKING(for page_lock in struct address_space)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
@@ -77,7 +77,7 @@ CPPFLAGS="$save_CPPFLAGS"])
 dnl LINUX_BUILD_VNODE_FROM_INODE (configdir, outputdir, tmpldir)
 dnl		defaults: (src/config, src/afs/LINUX, src/afs/linux)
 
-AC_DEFUN(LINUX_BUILD_VNODE_FROM_INODE, [
+AC_DEFUN([LINUX_BUILD_VNODE_FROM_INODE], [
 AC_MSG_CHECKING(whether to build osi_vfs.h)
 configdir=ifelse([$1], ,[src/config],$1)
 outputdir=ifelse([$2], ,[src/afs/LINUX],$2)
diff --git a/src/cf/linux-test3.m4 b/src/cf/linux-test3.m4
index 53abcfab13..ba8881797d 100644
--- a/src/cf/linux-test3.m4
+++ b/src/cf/linux-test3.m4
@@ -1,4 +1,4 @@
-AC_DEFUN(LINUX_KERNEL_LINUX_SYSCALL_H,[
+AC_DEFUN([LINUX_KERNEL_LINUX_SYSCALL_H],[
   AC_MSG_CHECKING(for linux/syscall.h in kernel)
   if test -f "${LINUX_KERNEL_PATH}/include/linux/syscall.h"; then
     ac_linux_syscall=yes
@@ -9,7 +9,7 @@ AC_DEFUN(LINUX_KERNEL_LINUX_SYSCALL_H,[
   fi
 ])
 
-AC_DEFUN(LINUX_NEED_RHCONFIG,[
+AC_DEFUN([LINUX_NEED_RHCONFIG],[
 RHCONFIG_SP=""
 RHCONFIG_MP=""
 if test "x$enable_redhat_buildsys" = "xyes"; then
@@ -33,7 +33,7 @@ AC_SUBST(RHCONFIG_SP)
 AC_SUBST(RHCONFIG_MP)
 ])
 
-AC_DEFUN(LINUX_WHICH_MODULES,[
+AC_DEFUN([LINUX_WHICH_MODULES],[
 if test "x$enable_redhat_buildsys" = "xyes"; then
   MPS=Default
 else
diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4
index fb8c796ad4..dc4b79d941 100644
--- a/src/cf/linux-test4.m4
+++ b/src/cf/linux-test4.m4
@@ -1,4 +1,4 @@
-AC_DEFUN(LINUX_COMPLETION_H_EXISTS, [
+AC_DEFUN([LINUX_COMPLETION_H_EXISTS], [
 AC_MSG_CHECKING(for linux/completion.h existance)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
@@ -18,7 +18,7 @@ AC_MSG_RESULT($ac_cv_linux_completion_h_exists)
 CPPFLAGS="$save_CPPFLAGS"])
 
 
-AC_DEFUN(LINUX_DEFINES_FOR_EACH_PROCESS, [
+AC_DEFUN([LINUX_DEFINES_FOR_EACH_PROCESS], [
 AC_MSG_CHECKING(for defined for_each_process)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
@@ -35,7 +35,7 @@ AC_MSG_RESULT($ac_cv_linux_defines_for_each_process)
 CPPFLAGS="$save_CPPFLAGS"])
 
 
-AC_DEFUN(LINUX_DEFINES_PREV_TASK, [
+AC_DEFUN([LINUX_DEFINES_PREV_TASK], [
 AC_MSG_CHECKING(for defined prev_task)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
@@ -52,7 +52,7 @@ AC_MSG_RESULT($ac_cv_linux_defines_prev_task)
 CPPFLAGS="$save_CPPFLAGS"])
 
 
-AC_DEFUN(LINUX_EXPORTS_INIT_MM, [
+AC_DEFUN([LINUX_EXPORTS_INIT_MM], [
 AC_MSG_CHECKING(for exported init_mm)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
@@ -69,7 +69,7 @@ AC_MSG_RESULT($ac_cv_linux_exports_init_mm)
 CPPFLAGS="$save_CPPFLAGS"])
 
 
-AC_DEFUN(LINUX_EXPORTS_KALLSYMS_ADDRESS, [
+AC_DEFUN([LINUX_EXPORTS_KALLSYMS_ADDRESS], [
 AC_MSG_CHECKING(for exported kallsyms_address_to_symbol)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
@@ -86,7 +86,7 @@ AC_MSG_RESULT($ac_cv_linux_exports_kallsyms_address)
 CPPFLAGS="$save_CPPFLAGS"])
 
 
-AC_DEFUN(LINUX_EXPORTS_KALLSYMS_SYMBOL, [
+AC_DEFUN([LINUX_EXPORTS_KALLSYMS_SYMBOL], [
 AC_MSG_CHECKING(for exported kallsyms_symbol_to_address)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
@@ -103,7 +103,7 @@ AC_MSG_RESULT($ac_cv_linux_exports_kallsyms_symbol)
 CPPFLAGS="$save_CPPFLAGS"])
 
 
-AC_DEFUN(LINUX_EXPORTS_SYS_CALL_TABLE, [
+AC_DEFUN([LINUX_EXPORTS_SYS_CALL_TABLE], [
 AC_MSG_CHECKING(for exported sys_call_table)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
@@ -120,7 +120,7 @@ AC_MSG_RESULT($ac_cv_linux_exports_sys_call_table)
 CPPFLAGS="$save_CPPFLAGS"])
 
 
-AC_DEFUN(LINUX_EXPORTS_IA32_SYS_CALL_TABLE, [
+AC_DEFUN([LINUX_EXPORTS_IA32_SYS_CALL_TABLE], [
 AC_MSG_CHECKING(for exported ia32_sys_call_table)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
@@ -137,7 +137,7 @@ AC_MSG_RESULT($ac_cv_linux_exports_ia32_sys_call_table)
 CPPFLAGS="$save_CPPFLAGS"])
 
 
-AC_DEFUN(LINUX_EXPORTS_SYS_CHDIR, [
+AC_DEFUN([LINUX_EXPORTS_SYS_CHDIR], [
 AC_MSG_CHECKING(for exported sys_chdir)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
@@ -154,7 +154,7 @@ AC_MSG_RESULT($ac_cv_linux_exports_sys_chdir)
 CPPFLAGS="$save_CPPFLAGS"])
 
 
-AC_DEFUN(LINUX_EXPORTS_SYS_CLOSE, [
+AC_DEFUN([LINUX_EXPORTS_SYS_CLOSE], [
 AC_MSG_CHECKING(for exported sys_close)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
@@ -171,7 +171,7 @@ AC_MSG_RESULT($ac_cv_linux_exports_sys_close)
 CPPFLAGS="$save_CPPFLAGS"])
 
 
-AC_DEFUN(LINUX_EXPORTS_SYS_WAIT4, [
+AC_DEFUN([LINUX_EXPORTS_SYS_WAIT4], [
 AC_MSG_CHECKING(for exported sys_wait4)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
@@ -188,7 +188,7 @@ AC_MSG_RESULT($ac_cv_linux_exports_sys_wait4)
 CPPFLAGS="$save_CPPFLAGS"])
 
 
-AC_DEFUN(LINUX_EXPORTS_TASKLIST_LOCK, [
+AC_DEFUN([LINUX_EXPORTS_TASKLIST_LOCK], [
 AC_MSG_CHECKING(for exported tasklist_lock)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
@@ -205,7 +205,7 @@ AC_MSG_RESULT($ac_cv_linux_exports_tasklist_lock)
 CPPFLAGS="$save_CPPFLAGS"])
 
 
-AC_DEFUN(LINUX_FS_STRUCT_INODE_HAS_I_CDEV, [
+AC_DEFUN([LINUX_FS_STRUCT_INODE_HAS_I_CDEV], [
 AC_MSG_CHECKING(for i_cdev in struct inode)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
@@ -221,7 +221,7 @@ AC_MSG_RESULT($ac_cv_linux_fs_struct_inode_has_i_cdev)
 CPPFLAGS="$save_CPPFLAGS"])
 
 
-AC_DEFUN(LINUX_FS_STRUCT_INODE_HAS_I_DEVICES, [
+AC_DEFUN([LINUX_FS_STRUCT_INODE_HAS_I_DEVICES], [
 AC_MSG_CHECKING(for i_devices in struct inode)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
@@ -237,7 +237,7 @@ AC_MSG_RESULT($ac_cv_linux_fs_struct_inode_has_i_devices)
 CPPFLAGS="$save_CPPFLAGS"])
 
 
-AC_DEFUN(LINUX_FS_STRUCT_INODE_HAS_I_DIRTY_DATA_BUFFERS, [
+AC_DEFUN([LINUX_FS_STRUCT_INODE_HAS_I_DIRTY_DATA_BUFFERS], [
 AC_MSG_CHECKING(for i_dirty_data_buffers in struct inode)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
@@ -253,7 +253,7 @@ AC_MSG_RESULT($ac_cv_linux_fs_struct_inode_has_i_dirty_data_buffers)
 CPPFLAGS="$save_CPPFLAGS"])
 
 
-AC_DEFUN(LINUX_FS_STRUCT_INODE_HAS_I_MAPPING_OVERLOAD, [
+AC_DEFUN([LINUX_FS_STRUCT_INODE_HAS_I_MAPPING_OVERLOAD], [
 AC_MSG_CHECKING(for i_mapping_overload in struct inode)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
@@ -269,7 +269,7 @@ AC_MSG_RESULT($ac_cv_linux_fs_struct_inode_has_i_mapping_overload)
 CPPFLAGS="$save_CPPFLAGS"])
 
 
-AC_DEFUN(LINUX_FS_STRUCT_INODE_HAS_I_MMAP_SHARED, [
+AC_DEFUN([LINUX_FS_STRUCT_INODE_HAS_I_MMAP_SHARED], [
 AC_MSG_CHECKING(for i_mmap_shared in struct inode)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
@@ -285,7 +285,7 @@ AC_MSG_RESULT($ac_cv_linux_fs_struct_inode_has_i_mmap_shared)
 CPPFLAGS="$save_CPPFLAGS"])
 
 
-AC_DEFUN(LINUX_RECALC_SIGPENDING_ARG_TYPE,[
+AC_DEFUN([LINUX_RECALC_SIGPENDING_ARG_TYPE],[
 AC_MSG_CHECKING(for recalc_sigpending arg type)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
@@ -300,7 +300,7 @@ AC_MSG_RESULT($ac_cv_linux_func_recalc_sigpending_takes_void)
 CPPFLAGS="$save_CPPFLAGS"])
 
 
-AC_DEFUN(LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_PARENT, [
+AC_DEFUN([LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_PARENT], [
 AC_MSG_CHECKING(for parent in struct task_struct)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
@@ -316,7 +316,7 @@ AC_MSG_RESULT($ac_cv_linux_sched_struct_task_struct_has_parent)
 CPPFLAGS="$save_CPPFLAGS"])
 
 
-AC_DEFUN(LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_REAL_PARENT, [
+AC_DEFUN([LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_REAL_PARENT], [
 AC_MSG_CHECKING(for real_parent in struct task_struct)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
@@ -332,7 +332,7 @@ AC_MSG_RESULT($ac_cv_linux_sched_struct_task_struct_has_real_parent)
 CPPFLAGS="$save_CPPFLAGS"])
 
 
-AC_DEFUN(LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_SIG, [
+AC_DEFUN([LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_SIG], [
 AC_MSG_CHECKING(for sig in struct task_struct)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
@@ -347,7 +347,7 @@ ac_cv_linux_sched_struct_task_struct_has_sig=no)])
 AC_MSG_RESULT($ac_cv_linux_sched_struct_task_struct_has_sig)
 CPPFLAGS="$save_CPPFLAGS"])
 
-AC_DEFUN(LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_SIGMASK_LOCK, [
+AC_DEFUN([LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_SIGMASK_LOCK], [
 AC_MSG_CHECKING(for sigmask_lock in struct task_struct)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
@@ -362,7 +362,7 @@ ac_cv_linux_sched_struct_task_struct_has_sigmask_lock=no)])
 AC_MSG_RESULT($ac_cv_linux_sched_struct_task_struct_has_sigmask_lock)
 CPPFLAGS="$save_CPPFLAGS"])
 
-AC_DEFUN(LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_SIGHAND, [
+AC_DEFUN([LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_SIGHAND], [
 AC_MSG_CHECKING(for sighand in struct task_struct)
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
diff --git a/src/cf/linux-test5.m4 b/src/cf/linux-test5.m4
index 73724f66c3..209683da4a 100644
--- a/src/cf/linux-test5.m4
+++ b/src/cf/linux-test5.m4
@@ -1,5 +1,5 @@
 
-AC_DEFUN(OPENAFS_GCC_SUPPORTS_MARCH, [
+AC_DEFUN([OPENAFS_GCC_SUPPORTS_MARCH], [
 AC_MSG_CHECKING(if $CC accepts -march=pentium)
 save_CFLAGS="$CFLAGS"
 CFLAGS="-MARCH=pentium"
@@ -18,7 +18,7 @@ fi
 CFLAGS="$save_CFLAGS"
 ])
 
-AC_DEFUN(OPENAFS_GCC_NEEDS_NO_STRICT_ALIASING, [
+AC_DEFUN([OPENAFS_GCC_NEEDS_NO_STRICT_ALIASING], [
 AC_MSG_CHECKING(if $CC needs -fno-strict-aliasing)
 save_CFLAGS="$CFLAGS"
 CFLAGS="-fno-strict-aliasing"
@@ -35,7 +35,7 @@ fi
 CFLAGS="$save_CFLAGS"
 ])
 
-AC_DEFUN(OPENAFS_GCC_NEEDS_NO_STRENGTH_REDUCE, [
+AC_DEFUN([OPENAFS_GCC_NEEDS_NO_STRENGTH_REDUCE], [
 AC_MSG_CHECKING(if $CC needs -fno-strength-reduce)
 save_CFLAGS="$CFLAGS"
 CFLAGS="-fno-strength-reduce"
@@ -52,7 +52,7 @@ fi
 CFLAGS="$save_CFLAGS"
 ])
 
-AC_DEFUN(OPENAFS_GCC_SUPPORTS_NO_COMMON, [
+AC_DEFUN([OPENAFS_GCC_SUPPORTS_NO_COMMON], [
 AC_MSG_CHECKING(if $CC supports -fno-common)
 save_CFLAGS="$CFLAGS"
 CFLAGS="-fno-common"
@@ -69,7 +69,7 @@ fi
 CFLAGS="$save_CFLAGS"
 ])
 
-AC_DEFUN(OPENAFS_GCC_SUPPORTS_PIPE, [
+AC_DEFUN([OPENAFS_GCC_SUPPORTS_PIPE], [
 AC_MSG_CHECKING(if $CC supports -pipe)
 save_CFLAGS="$CFLAGS"
 CFLAGS="-pipe"
diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index 350a0f73e2..44bec02b08 100644
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -1,5 +1,5 @@
 
-AC_DEFUN(OPENAFS_OSCONF, [
+AC_DEFUN([OPENAFS_OSCONF], [
 
 dnl defaults, override in case below as needed
 XCFLAGS='${DBG} ${OPTMZ}'
diff --git a/src/cf/ressearch.m4 b/src/cf/ressearch.m4
index a0861dea2e..c8cc0f4cc1 100644
--- a/src/cf/ressearch.m4
+++ b/src/cf/ressearch.m4
@@ -1,4 +1,4 @@
-AC_DEFUN(AC_FUNC_RES_SEARCH, [
+AC_DEFUN([AC_FUNC_RES_SEARCH], [
   ac_cv_func_res_search=no
   AC_TRY_LINK([
 #include <sys/types.h>
diff --git a/src/cf/solaris-cc.m4 b/src/cf/solaris-cc.m4
index abb2e74296..d9e379ac9e 100644
--- a/src/cf/solaris-cc.m4
+++ b/src/cf/solaris-cc.m4
@@ -8,7 +8,7 @@ dnl whose digits correspond to the digits in the compiler
 dnl version. Thus compiler version 4.2.0 is 0x420.
 dnl
 
-AC_DEFUN(AC_SOLARIS_CC_GOOD, [
+AC_DEFUN([AC_SOLARIS_CC_GOOD], [
 SOLARISCC="$CC"
 save_CC="$CC"
 if test "$CC" ; then
diff --git a/src/cf/solaris-dqrwlock.m4 b/src/cf/solaris-dqrwlock.m4
index b5aa65702b..c26aa1c018 100644
--- a/src/cf/solaris-dqrwlock.m4
+++ b/src/cf/solaris-dqrwlock.m4
@@ -1,4 +1,4 @@
-AC_DEFUN(SOLARIS_UFSVFS_HAS_DQRWLOCK, [
+AC_DEFUN([SOLARIS_UFSVFS_HAS_DQRWLOCK], [
 AC_MSG_CHECKING(for vfs_dqrwlock in struct ufsvfs)
 AC_CACHE_VAL(ac_cv_solaris_ufsvfs_has_dqrwlock,
 [
diff --git a/src/cf/solaris-fs-rolled.m4 b/src/cf/solaris-fs-rolled.m4
index 01d78d0f5f..3fc22c6ad9 100644
--- a/src/cf/solaris-fs-rolled.m4
+++ b/src/cf/solaris-fs-rolled.m4
@@ -1,4 +1,4 @@
-AC_DEFUN(SOLARIS_FS_HAS_FS_ROLLED, [
+AC_DEFUN([SOLARIS_FS_HAS_FS_ROLLED], [
 AC_MSG_CHECKING(for fs_rolled in struct proc)
 AC_CACHE_VAL(ac_cv_solaris_fs_has_fs_rolled,
 [
diff --git a/src/cf/solaris-pcorefile.m4 b/src/cf/solaris-pcorefile.m4
index 6764e42158..a350a60005 100644
--- a/src/cf/solaris-pcorefile.m4
+++ b/src/cf/solaris-pcorefile.m4
@@ -1,4 +1,4 @@
-AC_DEFUN(SOLARIS_PROC_HAS_P_COREFILE, [
+AC_DEFUN([SOLARIS_PROC_HAS_P_COREFILE], [
 AC_MSG_CHECKING(for p_corefile in struct proc)
 AC_CACHE_VAL(ac_cv_solaris_proc_has_p_corefile,
 [