7 files changed, 14 insertions, 14 deletions
diff --git a/macros/curses.m4 b/macros/curses.m4
index 3e7092685f..5307e13d38 100644
--- a/macros/curses.m4
+++ b/macros/curses.m4
@@ -86,7 +86,7 @@ dnl /*=== End new stuff for acconfig.h ===*/
 dnl 
 
 
-AC_DEFUN(AC_CHECK_CURSES,[
+AC_DEFUN([AC_CHECK_CURSES],[
 	search_ncurses=true
 	screen_manager=""
 	has_curses=false
@@ -150,7 +150,7 @@ AC_DEFUN(AC_CHECK_CURSES,[
 ])
 
 
-AC_DEFUN(AC_USE_SUNOS_CURSES, [
+AC_DEFUN([AC_USE_SUNOS_CURSES], [
 	search_ncurses=false
 	screen_manager="SunOS 4.x /usr/5include curses"
 	AC_MSG_RESULT(Using SunOS 4.x /usr/5include curses)
@@ -164,7 +164,7 @@ AC_DEFUN(AC_USE_SUNOS_CURSES, [
 	AC_MSG_RESULT(Please note that some screen refreshs may fail)
 ])
 
-AC_DEFUN(AC_USE_OSF1_CURSES, [
+AC_DEFUN([AC_USE_OSF1_CURSES], [
        AC_MSG_RESULT(Using OSF1 curses)
        search_ncurses=false
        screen_manager="OSF1 curses"
@@ -175,7 +175,7 @@ AC_DEFUN(AC_USE_OSF1_CURSES, [
        CURSES_LIBS="-lcurses"
 ])
 
-AC_DEFUN(AC_USE_SYSV_CURSES, [
+AC_DEFUN([AC_USE_SYSV_CURSES], [
 	AC_MSG_RESULT(Using SysV curses)
 	AC_DEFINE(HAS_CURSES)
 	has_curses=true
@@ -210,7 +210,7 @@ dnl)
 dnl
 dnl Parameters: directory filename cureses_LIBS curses_INCLUDEDIR nicename
 dnl
-AC_DEFUN(AC_NCURSES, [
+AC_DEFUN([AC_NCURSES], [
     if $search_ncurses
     then
         if test -f $1/$2
@@ -227,7 +227,7 @@ AC_DEFUN(AC_NCURSES, [
     fi
 ])
 
-AC_DEFUN(AC_SEARCH_NCURSES, [
+AC_DEFUN([AC_SEARCH_NCURSES], [
     AC_CHECKING("location of ncurses.h file")
 
     AC_NCURSES(/usr/include, ncurses.h, -lncurses,, "ncurses on /usr/include")
diff --git a/macros/gnome-cxx-check.m4 b/macros/gnome-cxx-check.m4
index 786138c5d9..3c54d62bca 100644
--- a/macros/gnome-cxx-check.m4
+++ b/macros/gnome-cxx-check.m4
@@ -1,5 +1,5 @@
 dnl GNOME_CHECK_CXX(not_found_string)
-AC_DEFUN(GNOME_CHECK_CXX,
+AC_DEFUN([GNOME_CHECK_CXX],
 [
   # see if a C++ compiler exists and works
   AC_REQUIRE([AC_PROG_CXX])dnl
diff --git a/macros/gnome-gettext.m4 b/macros/gnome-gettext.m4
index 813db3ee2d..6839855c1b 100644
--- a/macros/gnome-gettext.m4
+++ b/macros/gnome-gettext.m4
@@ -12,7 +12,7 @@
 
 # serial 5
 
-AC_DEFUN(AM_GNOME_WITH_NLS,
+AC_DEFUN([AM_GNOME_WITH_NLS],
   [AC_MSG_CHECKING([whether NLS is requested])
     dnl Default is enabled NLS
     AC_ARG_ENABLE(nls,
@@ -210,7 +210,7 @@ AC_DEFUN(AM_GNOME_WITH_NLS,
     AC_SUBST(POSUB)
   ])
 
-AC_DEFUN(AM_GNOME_GETTEXT,
+AC_DEFUN([AM_GNOME_GETTEXT],
   [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
    AC_REQUIRE([AC_PROG_CC])dnl
    AC_REQUIRE([AC_PROG_RANLIB])dnl
diff --git a/macros/gnome-libgtop-check.m4 b/macros/gnome-libgtop-check.m4
index 0ce6f6f612..1b4e1745cb 100644
--- a/macros/gnome-libgtop-check.m4
+++ b/macros/gnome-libgtop-check.m4
@@ -6,7 +6,7 @@ dnl that we need to #include some other header files on some
 dnl systems to get some types.
 
 dnl AC_LIBGTOP_CHECK_TYPE(TYPE, DEFAULT)
-AC_DEFUN(AC_LIBGTOP_CHECK_TYPE,
+AC_DEFUN([AC_LIBGTOP_CHECK_TYPE],
 [AC_REQUIRE([AC_HEADER_STDC])dnl
 AC_MSG_CHECKING(for $1)
 AC_CACHE_VAL(ac_cv_type_$1,
diff --git a/macros/gnome-print-check.m4 b/macros/gnome-print-check.m4
index 7d98281d9c..4dca727469 100644
--- a/macros/gnome-print-check.m4
+++ b/macros/gnome-print-check.m4
@@ -8,7 +8,7 @@
 dnl AM_PATH_GNOME_PRINT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 dnl Test for GNOME-PRINT, and define GNOME_PRINT_CFLAGS and GNOME_PRINT_LIBS
 dnl
-AC_DEFUN(AM_PATH_GNOME_PRINT,
+AC_DEFUN([AM_PATH_GNOME_PRINT],
 [dnl 
 dnl Get the cflags and libraries from the gnome-config script
 dnl
diff --git a/macros/linger.m4 b/macros/linger.m4
index dfa7c8aea0..1dfb89dc96 100644
--- a/macros/linger.m4
+++ b/macros/linger.m4
@@ -1,7 +1,7 @@
 dnl
 dnl Check for struct linger
 dnl
-AC_DEFUN(AC_STRUCT_LINGER, [
+AC_DEFUN([AC_STRUCT_LINGER], [
 av_struct_linger=no
 AC_MSG_CHECKING(struct linger is available)
 AC_TRY_RUN([
diff --git a/macros/need-declaration.m4 b/macros/need-declaration.m4
index d5b7bc66d5..8a217b8a30 100644
--- a/macros/need-declaration.m4
+++ b/macros/need-declaration.m4
@@ -1,6 +1,6 @@
 dnl See whether we need a declaration for a function.
 dnl GCC_NEED_DECLARATION(FUNCTION [, EXTRA-HEADER-FILES])
-AC_DEFUN(GCC_NEED_DECLARATION,
+AC_DEFUN([GCC_NEED_DECLARATION],
 [AC_MSG_CHECKING([whether $1 must be declared])
 AC_CACHE_VAL(gcc_cv_decl_needed_$1,
 [AC_TRY_COMPILE([
@@ -33,7 +33,7 @@ fi
 
 dnl Check multiple functions to see whether each needs a declaration.
 dnl GCC_NEED_DECLARATIONS(FUNCTION... [, EXTRA-HEADER-FILES])
-AC_DEFUN(GCC_NEED_DECLARATIONS,
+AC_DEFUN([GCC_NEED_DECLARATIONS],
 [for ac_func in $1
 do
 GCC_NEED_DECLARATION($ac_func, $2)