Fix m4-underquoting.

43 files changed, 54 insertions, 54 deletions

diff --git a/aclocal/bsp-alias.m4 b/aclocal/bsp-alias.m4
index 85b5fbbef3..aee2ecab1e 100644
--- a/aclocal/bsp-alias.m4
+++ b/aclocal/bsp-alias.m4
@@ -4,7 +4,7 @@ dnl
 
 dnl _RTEMS_BSP_ALIAS(BSP_ALIAS,RTEMS_BSP_FAMILY)
 dnl Internal subroutine to RTEMS_BSP_ALIAS
-AC_DEFUN(_RTEMS_BSP_ALIAS,
+AC_DEFUN([_RTEMS_BSP_ALIAS],
 [# account for "aliased" bsps which share source code
   case $1 in
     simcpu32)     $2=sim68000         ;; # BSVC CPU32 variant
@@ -34,7 +34,7 @@ AC_DEFUN(_RTEMS_BSP_ALIAS,
 
 dnl RTEMS_BSP_ALIAS(BSP_ALIAS,RTEMS_BSP_FAMILY)
 dnl convert a bsp alias $1 into its bsp directory RTEMS_BSP_FAMILY
-AC_DEFUN(RTEMS_BSP_ALIAS,
+AC_DEFUN([RTEMS_BSP_ALIAS],
 [_RTEMS_BSP_ALIAS(m4_if([$1],,[$RTEMS_BSP],[$1]),
   m4_if([$2],,[RTEMS_BSP_FAMILY],[$2]))]
 )
diff --git a/aclocal/bsp-arg-enable.m4 b/aclocal/bsp-arg-enable.m4
index 91972a5303..a03d78b5c2 100644
--- a/aclocal/bsp-arg-enable.m4
+++ b/aclocal/bsp-arg-enable.m4
@@ -9,7 +9,7 @@ dnl Configure scripts will receive <bsp-value> if <RTEMS_BSP> matches the
 dnl actual value of the shell variable RTEMS_BSP (cf. RTEMS_ENV_RTEMSBSP), 
 dnl and the raw value passed to --enable-FEATURE otherwise.
 dnl
-AC_DEFUN(RTEMS_BSP_ARG_ENABLE,
+AC_DEFUN([RTEMS_BSP_ARG_ENABLE],
 [AC_REQUIRE([RTEMS_ENV_RTEMSBSP])
 AC_ARG_ENABLE([$1],[$2],
 [enableval=`echo "[$enable_]patsubst([$1], -, _)" | sed -e "s%^${RTEMS_BSP}:%%"`
diff --git a/aclocal/canonical-host.m4 b/aclocal/canonical-host.m4
index 7077ab31c5..8e4c710b2f 100644
--- a/aclocal/canonical-host.m4
+++ b/aclocal/canonical-host.m4
@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_CANONICAL_HOST,
+AC_DEFUN([RTEMS_CANONICAL_HOST],
 [dnl
 AC_REQUIRE([AC_CANONICAL_HOST])
 RTEMS_HOST=$host_os
diff --git a/aclocal/canonical-target-name.m4 b/aclocal/canonical-target-name.m4
index ab710dc722..990c84e2d1 100644
--- a/aclocal/canonical-target-name.m4
+++ b/aclocal/canonical-target-name.m4
@@ -8,7 +8,7 @@ dnl target naming conventions "processor-vendor-os"
 dnl Therefore autoconf's AC_CANONICAL_TARGET will fail for them
 dnl and we have to fix it for rtems ourselves 
 
-AC_DEFUN(RTEMS_CANONICAL_TARGET_CPU,
+AC_DEFUN([RTEMS_CANONICAL_TARGET_CPU],
 [
 AC_CANONICAL_TARGET
 AC_MSG_CHECKING(rtems target cpu)
diff --git a/aclocal/canonicalize-tools.m4 b/aclocal/canonicalize-tools.m4
index 4d37fa9c69..190afca09a 100644
--- a/aclocal/canonicalize-tools.m4
+++ b/aclocal/canonicalize-tools.m4
@@ -4,7 +4,7 @@ dnl
 dnl Set target tools
 dnl
 
-AC_DEFUN(RTEMS_CANONICALIZE_TOOLS,
+AC_DEFUN([RTEMS_CANONICALIZE_TOOLS],
 [AC_REQUIRE([RTEMS_PROG_CC])dnl
 
 dnl FIXME: What shall be done if these tools are not available?
diff --git a/aclocal/check-bsps.m4 b/aclocal/check-bsps.m4
index ad760e7439..3ca0bfac5d 100644
--- a/aclocal/check-bsps.m4
+++ b/aclocal/check-bsps.m4
@@ -4,7 +4,7 @@ dnl Report all available bsps for a target,
 dnl check if a bsp-subdirectory is present for all bsps found
 dnl
 dnl RTEMS_CHECK_BSPS(bsp_list)
-AC_DEFUN(RTEMS_CHECK_BSPS,
+AC_DEFUN([RTEMS_CHECK_BSPS],
 [
 AC_REQUIRE([RTEMS_CHECK_CPU])dnl sets RTEMS_CPU, target
 AC_REQUIRE([RTEMS_TOP])dnl sets RTEMS_TOPdir
diff --git a/aclocal/check-cpu.m4 b/aclocal/check-cpu.m4
index f3bc2141ae..5557264866 100644
--- a/aclocal/check-cpu.m4
+++ b/aclocal/check-cpu.m4
@@ -1,7 +1,7 @@
 dnl $Id$
 
 dnl check if RTEMS support a cpu
-AC_DEFUN(RTEMS_CHECK_CPU,
+AC_DEFUN([RTEMS_CHECK_CPU],
 [dnl
 AC_REQUIRE([RTEMS_TOP])
 AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])
diff --git a/aclocal/check-custom-bsp.m4 b/aclocal/check-custom-bsp.m4
index de9d61b79e..8128906111 100644
--- a/aclocal/check-custom-bsp.m4
+++ b/aclocal/check-custom-bsp.m4
@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_CHECK_CUSTOM_BSP,[
+AC_DEFUN([RTEMS_CHECK_CUSTOM_BSP],[
 AC_REQUIRE([RTEMS_TOP])
 
 AC_MSG_CHECKING([for make/custom/[$]$1.cfg])
diff --git a/aclocal/check-cxx.m4 b/aclocal/check-cxx.m4
index a780c3a8de..7d549c7913 100644
--- a/aclocal/check-cxx.m4
+++ b/aclocal/check-cxx.m4
@@ -1,6 +1,6 @@
 dnl $Id$
 dnl
-AC_DEFUN(RTEMS_CHECK_CXX,
+AC_DEFUN([RTEMS_CHECK_CXX],
 [dnl
 AC_REQUIRE([RTEMS_CHECK_CPU])dnl
 AC_REQUIRE([RTEMS_PROG_CC_FOR_TARGET])dnl
diff --git a/aclocal/check-itron.m4 b/aclocal/check-itron.m4
index 4c4dbf0042..951aea8503 100644
--- a/aclocal/check-itron.m4
+++ b/aclocal/check-itron.m4
@@ -1,6 +1,6 @@
 dnl $Id$
 dnl
-AC_DEFUN(RTEMS_CHECK_ITRON_API,
+AC_DEFUN([RTEMS_CHECK_ITRON_API],
 [dnl
 AC_REQUIRE([RTEMS_CHECK_CPU])dnl
 AC_REQUIRE([RTEMS_ENABLE_ITRON])dnl
@@ -28,7 +28,7 @@ fi
 AC_SUBST(HAS_ITRON_API)dnl
 ])
 
-AC_DEFUN(RTEMS_DEFINE_ITRON_API,
+AC_DEFUN([RTEMS_DEFINE_ITRON_API],
 [AC_REQUIRE([RTEMS_CHECK_ITRON_API])dnl
 if test x"${HAS_ITRON_API}" = x"yes";
 then
diff --git a/aclocal/check-multiprocessing.m4 b/aclocal/check-multiprocessing.m4
index 355635ce54..6e931f0c4c 100644
--- a/aclocal/check-multiprocessing.m4
+++ b/aclocal/check-multiprocessing.m4
@@ -2,7 +2,7 @@ dnl
 dnl $Id$
 dnl
 
-AC_DEFUN(RTEMS_CHECK_MULTIPROCESSING,
+AC_DEFUN([RTEMS_CHECK_MULTIPROCESSING],
 [dnl
 AC_REQUIRE([RTEMS_ENABLE_MULTILIB])dnl
 AC_REQUIRE([RTEMS_ENV_RTEMSBSP])dnl
diff --git a/aclocal/check-networking.m4 b/aclocal/check-networking.m4
index db3a0c60d3..88391454c4 100644
--- a/aclocal/check-networking.m4
+++ b/aclocal/check-networking.m4
@@ -1,6 +1,6 @@
 dnl $Id$
 dnl
-AC_DEFUN(RTEMS_CHECK_NETWORKING,
+AC_DEFUN([RTEMS_CHECK_NETWORKING],
 [dnl
 AC_REQUIRE([RTEMS_CHECK_CPU])dnl
 AC_REQUIRE([RTEMS_ENABLE_NETWORKING])dnl
diff --git a/aclocal/check-newlib.m4 b/aclocal/check-newlib.m4
index e80755d462..bbf5f68dc2 100644
--- a/aclocal/check-newlib.m4
+++ b/aclocal/check-newlib.m4
@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_CHECK_NEWLIB,
+AC_DEFUN([RTEMS_CHECK_NEWLIB],
 [dnl
 AC_REQUIRE([RTEMS_PROG_CC_FOR_TARGET])dnl
 AC_REQUIRE([RTEMS_CANONICALIZE_TOOLS])dnl
diff --git a/aclocal/check-posix.m4 b/aclocal/check-posix.m4
index 7512f663f5..21a14b0878 100644
--- a/aclocal/check-posix.m4
+++ b/aclocal/check-posix.m4
@@ -1,6 +1,6 @@
 dnl $Id$
 dnl
-AC_DEFUN(RTEMS_CHECK_POSIX_API,
+AC_DEFUN([RTEMS_CHECK_POSIX_API],
 [dnl
 AC_REQUIRE([RTEMS_CHECK_CPU])dnl
 AC_REQUIRE([RTEMS_ENABLE_POSIX])dnl
@@ -28,7 +28,7 @@ fi
 AC_SUBST(HAS_POSIX_API)dnl
 ])
 
-AC_DEFUN(RTEMS_DEFINE_POSIX_API,
+AC_DEFUN([RTEMS_DEFINE_POSIX_API],
 [AC_REQUIRE([RTEMS_CHECK_POSIX_API])dnl
 AS_IF(
   [test x"${HAS_POSIX_API}" = x"yes"],
diff --git a/aclocal/check-rdbg.m4 b/aclocal/check-rdbg.m4
index 0e38b59593..3a58bff02b 100644
--- a/aclocal/check-rdbg.m4
+++ b/aclocal/check-rdbg.m4
@@ -1,6 +1,6 @@
 dnl $Id$
 dnl
-AC_DEFUN(RTEMS_CHECK_RDBG,
+AC_DEFUN([RTEMS_CHECK_RDBG],
 [dnl
 AC_REQUIRE([RTEMS_TOP])dnl
 AC_REQUIRE([RTEMS_CHECK_CPU])dnl
diff --git a/aclocal/check-tool.m4 b/aclocal/check-tool.m4
index 5a91490e74..4c412c074a 100644
--- a/aclocal/check-tool.m4
+++ b/aclocal/check-tool.m4
@@ -3,7 +3,7 @@ dnl $Id$
 ## Check for a cross tool, similar to AC_CHECK_TOOL, but do not fall back to
 ## the un-prefixed version of PROG-TO-CHECK-FOR.
 dnl RTEMS_CHECK_TOOL(VARIABLE, PROG-TO-CHECK-FOR[, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN(RTEMS_CHECK_TOOL,
+AC_DEFUN([RTEMS_CHECK_TOOL],
 [
   AS_IF([test "x$build_alias" != "x$host_alias"],
     [rtems_tool_prefix=${ac_tool_prefix}])
diff --git a/aclocal/config-subdirs.m4 b/aclocal/config-subdirs.m4
index 6f9360bc80..38e059d9e6 100644
--- a/aclocal/config-subdirs.m4
+++ b/aclocal/config-subdirs.m4
@@ -11,7 +11,7 @@ dnl
 dnl
 dnl _AC_DOTS(PATH)
 dnl
-AC_DEFUN(_AC_DOTS,[
+AC_DEFUN([_AC_DOTS],[
 # A "../" for each directory in $1.
     ac_dots=`echo $1 | \
              sed -e 's%^\./%%' -e 's%[[^/]]$%&/%' -e 's%[[^/]]*/%../%g'`
@@ -20,7 +20,7 @@ AC_DEFUN(_AC_DOTS,[
 dnl
 dnl _RTEMS_ADJUST_SRCDIR(REVAR,CONFIG_DIR[,TARGET_SUBDIR])
 dnl
-AC_DEFUN(_RTEMS_ADJUST_SRCDIR,[
+AC_DEFUN([_RTEMS_ADJUST_SRCDIR],[
     _AC_DOTS(ifelse([$3], ,[$2],[$3/$2]))
 
     case "$srcdir" in
diff --git a/aclocal/enable-bare.m4 b/aclocal/enable-bare.m4
index 43219461f8..a52a927d1c 100644
--- a/aclocal/enable-bare.m4
+++ b/aclocal/enable-bare.m4
@@ -1,4 +1,4 @@
-AC_DEFUN(RTEMS_ENABLE_BARE,
+AC_DEFUN([RTEMS_ENABLE_BARE],
 [
 AC_ARG_ENABLE(bare-cpu-cflags,
 [AC_HELP_STRING([--enable-bare-cpu-cflags],
diff --git a/aclocal/enable-cxx.m4 b/aclocal/enable-cxx.m4
index cde862d39f..eb46663381 100644
--- a/aclocal/enable-cxx.m4
+++ b/aclocal/enable-cxx.m4
@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_CXX,
+AC_DEFUN([RTEMS_ENABLE_CXX],
 [
 AC_ARG_ENABLE(cxx,
 [AC_HELP_STRING([--enable-cxx],
diff --git a/aclocal/enable-inlines.m4 b/aclocal/enable-inlines.m4
index 4e0eb80d24..30a243154b 100644
--- a/aclocal/enable-inlines.m4
+++ b/aclocal/enable-inlines.m4
@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_INLINES,
+AC_DEFUN([RTEMS_ENABLE_INLINES],
 [AC_ARG_ENABLE(rtems-inlines,
 [AC_HELP_STRING([--enable-rtems-inlines],
 [enable RTEMS inline functions (default:enabled, disable to use macros)])],
diff --git a/aclocal/enable-itron.m4 b/aclocal/enable-itron.m4
index 3157ce0641..d2911ad29d 100644
--- a/aclocal/enable-itron.m4
+++ b/aclocal/enable-itron.m4
@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_ITRON,
+AC_DEFUN([RTEMS_ENABLE_ITRON],
 [
 ## AC_BEFORE([$0], [RTEMS_CHECK_ITRON_API])dnl
 
diff --git a/aclocal/enable-multiprocessing.m4 b/aclocal/enable-multiprocessing.m4
index 129de0a735..3d5c8f81b7 100644
--- a/aclocal/enable-multiprocessing.m4
+++ b/aclocal/enable-multiprocessing.m4
@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_MULTIPROCESSING,
+AC_DEFUN([RTEMS_ENABLE_MULTIPROCESSING],
 [
 AC_ARG_ENABLE(multiprocessing,
 [AC_HELP_STRING([--enable-multiprocessing],
diff --git a/aclocal/enable-networking.m4 b/aclocal/enable-networking.m4
index 47801fff7c..03dedfd4f0 100644
--- a/aclocal/enable-networking.m4
+++ b/aclocal/enable-networking.m4
@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_NETWORKING,
+AC_DEFUN([RTEMS_ENABLE_NETWORKING],
 [
 ## AC_BEFORE([$0], [RTEMS_CHECK_NETWORKING])dnl
 
diff --git a/aclocal/enable-posix.m4 b/aclocal/enable-posix.m4
index 13be1417dd..63d5e4db93 100644
--- a/aclocal/enable-posix.m4
+++ b/aclocal/enable-posix.m4
@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_POSIX,
+AC_DEFUN([RTEMS_ENABLE_POSIX],
 [
 ## AC_BEFORE([$0], [RTEMS_CHECK_POSIX_API])dnl
 
diff --git a/aclocal/enable-rdbg.m4 b/aclocal/enable-rdbg.m4
index 8fa0cc8532..a636ba4850 100644
--- a/aclocal/enable-rdbg.m4
+++ b/aclocal/enable-rdbg.m4
@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_RDBG,
+AC_DEFUN([RTEMS_ENABLE_RDBG],
 [
 AC_BEFORE([$0], [RTEMS_CHECK_RDBG])dnl
 
diff --git a/aclocal/enable-rtemsbsp.m4 b/aclocal/enable-rtemsbsp.m4
index 10ffcf6827..2bf0310ade 100644
--- a/aclocal/enable-rtemsbsp.m4
+++ b/aclocal/enable-rtemsbsp.m4
@@ -3,7 +3,7 @@ dnl $Id$
 dnl Override the set of BSPs to be built.
 dnl used by the toplevel configure script
 dnl RTEMS_ENABLE_RTEMSBSP(rtems_bsp_list)
-AC_DEFUN(RTEMS_ENABLE_RTEMSBSP,
+AC_DEFUN([RTEMS_ENABLE_RTEMSBSP],
 [
 AC_BEFORE([$0], [RTEMS_ENV_RTEMSBSP])
 AC_ARG_ENABLE(rtemsbsp,
diff --git a/aclocal/enable-tests.m4 b/aclocal/enable-tests.m4
index 027dc212c0..e4a2d37546 100644
--- a/aclocal/enable-tests.m4
+++ b/aclocal/enable-tests.m4
@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_TESTS,
+AC_DEFUN([RTEMS_ENABLE_TESTS],
 [
 # If the tests are enabled, then find all the test suite Makefiles
 AC_MSG_CHECKING([if the test suites are enabled? ])
diff --git a/aclocal/env-rtemsbsp.m4 b/aclocal/env-rtemsbsp.m4
index 77ab9dfa9b..057f09cb0d 100644
--- a/aclocal/env-rtemsbsp.m4
+++ b/aclocal/env-rtemsbsp.m4
@@ -2,7 +2,7 @@ dnl $Id$
 
 dnl Pass a single BSP via an environment variable
 dnl used by per BSP configure scripts
-AC_DEFUN(RTEMS_ENV_RTEMSBSP,
+AC_DEFUN([RTEMS_ENV_RTEMSBSP],
 [dnl
 AC_BEFORE([$0], [RTEMS_ENABLE_RTEMSBSP])dnl
 AC_BEFORE([$0], [RTEMS_PROJECT_ROOT])dnl
diff --git a/aclocal/gcc-isystem.m4 b/aclocal/gcc-isystem.m4
index c230508208..94098cf33c 100644
--- a/aclocal/gcc-isystem.m4
+++ b/aclocal/gcc-isystem.m4
@@ -4,7 +4,7 @@ dnl
 dnl Check whether the gcc accepts -isystem
 dnl
 
-AC_DEFUN(RTEMS_GCC_ISYSTEM,
+AC_DEFUN([RTEMS_GCC_ISYSTEM],
 [AC_REQUIRE([RTEMS_PROG_CC])
 AC_CACHE_CHECK(whether $CC accepts -isystem,rtems_cv_gcc_isystem,
 [
diff --git a/aclocal/gcc-pipe.m4 b/aclocal/gcc-pipe.m4
index 093ea2edf4..2a04629bb2 100644
--- a/aclocal/gcc-pipe.m4
+++ b/aclocal/gcc-pipe.m4
@@ -4,7 +4,7 @@ dnl
 dnl Check whether the target compiler accepts -pipe
 dnl
 
-AC_DEFUN(RTEMS_GCC_PIPE,
+AC_DEFUN([RTEMS_GCC_PIPE],
 [AC_REQUIRE([RTEMS_PROG_CC]) 
 AC_REQUIRE([AC_CANONICAL_HOST])
 AC_CACHE_CHECK(whether $CC accepts --pipe,rtems_cv_gcc_pipe,
diff --git a/aclocal/gcc-specs.m4 b/aclocal/gcc-specs.m4
index ca0271424f..dd49bb95d4 100644
--- a/aclocal/gcc-specs.m4
+++ b/aclocal/gcc-specs.m4
@@ -4,7 +4,7 @@ dnl
 dnl Check whether the target compiler accepts -specs
 dnl
 
-AC_DEFUN(RTEMS_GCC_SPECS,
+AC_DEFUN([RTEMS_GCC_SPECS],
 [AC_REQUIRE([RTEMS_PROG_CC])
 AC_CACHE_CHECK(whether $CC accepts -specs,rtems_cv_gcc_specs,
 [
diff --git a/aclocal/i386-gas-code16.m4 b/aclocal/i386-gas-code16.m4
index 9bb0030d94..7b9ce2f91c 100644
--- a/aclocal/i386-gas-code16.m4
+++ b/aclocal/i386-gas-code16.m4
@@ -5,7 +5,7 @@ dnl
 dnl check for i386 gas supporting 16 bit mode
 dnl     - binutils 2.9.1.0.7 and higher
 
-AC_DEFUN(RTEMS_I386_GAS_CODE16,
+AC_DEFUN([RTEMS_I386_GAS_CODE16],
 [ if test "${host_cpu}" = "i386"; then
     AC_CACHE_CHECK([for 16 bit mode assembler support],
       rtems_cv_prog_gas_code16,
diff --git a/aclocal/multilib.m4 b/aclocal/multilib.m4
index 66896f9ce5..d76c71d26f 100644
--- a/aclocal/multilib.m4
+++ b/aclocal/multilib.m4
@@ -2,7 +2,7 @@ dnl This provides configure definitions used for multilib support
 
 dnl parts of these macros are derived from newlib-1.8.2's multilib support
 
-AC_DEFUN(RTEMS_ENABLE_MULTILIB,
+AC_DEFUN([RTEMS_ENABLE_MULTILIB],
 [
 AC_ARG_ENABLE(multilib,
 AC_HELP_STRING([--enable-multilib],
diff --git a/aclocal/path-ksh.m4 b/aclocal/path-ksh.m4
index 881dd0c9ec..306c4ca2e7 100644
--- a/aclocal/path-ksh.m4
+++ b/aclocal/path-ksh.m4
@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_PATH_KSH,
+AC_DEFUN([RTEMS_PATH_KSH],
 [
 dnl NOTE: prefer bash over ksh over sh
 AC_PATH_PROGS(KSH,bash ksh sh)
diff --git a/aclocal/path-perl.m4 b/aclocal/path-perl.m4
index e0e7dbb1f0..e795275203 100644
--- a/aclocal/path-perl.m4
+++ b/aclocal/path-perl.m4
@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_DEFUN(RTEMS_PATH_PERL,
+AC_DEFUN([RTEMS_PATH_PERL],
 [
 AC_PATH_PROG(PERL,perl)
 if test -z "$PERL" ; then
diff --git a/aclocal/prog-cc.m4 b/aclocal/prog-cc.m4
index 24a9d842a1..7b4335ca17 100644
--- a/aclocal/prog-cc.m4
+++ b/aclocal/prog-cc.m4
@@ -4,7 +4,7 @@ dnl
 dnl Check for target gcc
 dnl
 
-AC_DEFUN(RTEMS_PROG_CC,
+AC_DEFUN([RTEMS_PROG_CC],
 [
 AC_BEFORE([$0], [AC_PROG_CPP])dnl
 AC_BEFORE([$0], [AC_PROG_CC])dnl
@@ -22,7 +22,7 @@ AC_PROG_CPP
 AM_CONDITIONAL(RTEMS_USE_GCC,test x"$GCC" = x"yes")
 ])
 
-AC_DEFUN(RTEMS_PROG_CC_FOR_TARGET,
+AC_DEFUN([RTEMS_PROG_CC_FOR_TARGET],
 [
 dnl check target cc
 RTEMS_PROG_CC
diff --git a/aclocal/prog-cxx.m4 b/aclocal/prog-cxx.m4
index 8db69bf804..8991489814 100644
--- a/aclocal/prog-cxx.m4
+++ b/aclocal/prog-cxx.m4
@@ -4,7 +4,7 @@ dnl
 dnl Check for target g++
 dnl 
 
-AC_DEFUN(RTEMS_PROG_CXX_FOR_TARGET,
+AC_DEFUN([RTEMS_PROG_CXX_FOR_TARGET],
 [
 AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
 AC_REQUIRE([RTEMS_ENABLE_CXX])
diff --git a/aclocal/project-root.m4 b/aclocal/project-root.m4
index b520b94b5a..2f27bfe55b 100644
--- a/aclocal/project-root.m4
+++ b/aclocal/project-root.m4
@@ -12,7 +12,7 @@ dnl RTEMS_ROOT         .. path to the top of a bsp's build directory
 dnl                       [Applied by custom/*.cfg, depredicated otherwise]
 dnl
 
-AC_DEFUN(RTEMS_PROJECT_ROOT,
+AC_DEFUN([RTEMS_PROJECT_ROOT],
 [dnl
 AC_REQUIRE([RTEMS_TOP])
 
diff --git a/aclocal/rtems-debug.m4 b/aclocal/rtems-debug.m4
index 9a9f15a33f..931a4b085a 100644
--- a/aclocal/rtems-debug.m4
+++ b/aclocal/rtems-debug.m4
@@ -1,6 +1,6 @@
 ## $Id$
 
-AC_DEFUN(RTEMS_ENABLE_RTEMS_DEBUG,
+AC_DEFUN([RTEMS_ENABLE_RTEMS_DEBUG],
 [
 AC_ARG_ENABLE(rtems-debug,
 AC_HELP_STRING([--enable-rtems-debug],[enable RTEMS_DEBUG]),
@@ -11,7 +11,7 @@ AC_HELP_STRING([--enable-rtems-debug],[enable RTEMS_DEBUG]),
 esac],[enable_rtems_debug=no])
 ])
 
-AC_DEFUN(RTEMS_CHECK_RTEMS_DEBUG,
+AC_DEFUN([RTEMS_CHECK_RTEMS_DEBUG],
 [AC_REQUIRE([RTEMS_ENABLE_RTEMS_DEBUG])
 AS_IF([test x"${enable_rtems_debug}" = x"yes"]
   [AC_DEFINE_UNQUOTED(RTEMS_DEBUG,1,[if RTEMS_DEBUG is enabled])])
diff --git a/aclocal/rtems-test-no-pause.m4 b/aclocal/rtems-test-no-pause.m4
index 17d92e9a12..2223c4fa63 100644
--- a/aclocal/rtems-test-no-pause.m4
+++ b/aclocal/rtems-test-no-pause.m4
@@ -1,4 +1,4 @@
-AC_DEFUN(RTEMS_ENABLE_RTEMS_TEST_NO_PAUSE,
+AC_DEFUN([RTEMS_ENABLE_RTEMS_TEST_NO_PAUSE],
 [AC_ARG_ENABLE(test-no-pause,
 AC_HELP_STRING([--disable-test-no-pause],[disable RTEMS_TEST_NO_PAUSE]),
 [case "${enableval}" in
@@ -8,7 +8,7 @@ AC_HELP_STRING([--disable-test-no-pause],[disable RTEMS_TEST_NO_PAUSE]),
 esac],[RTEMS_TEST_NO_PAUSE=yes])
 ])
 
-AC_DEFUN(RTEMS_CHECK_RTEMS_TEST_NO_PAUSE,
+AC_DEFUN([RTEMS_CHECK_RTEMS_TEST_NO_PAUSE],
 [AC_REQUIRE([RTEMS_ENABLE_RTEMS_TEST_NO_PAUSE])
 if test x"${RTEMS_TEST_NO_PAUSE}" = x"yes";
 then
diff --git a/aclocal/rtems-top.m4 b/aclocal/rtems-top.m4
index 28bbfd9379..585897f049 100644
--- a/aclocal/rtems-top.m4
+++ b/aclocal/rtems-top.m4
@@ -7,7 +7,7 @@ dnl RTEMS_TOP($1)
 dnl 
 dnl $1 .. relative path from this configure.in to the toplevel configure.in
 dnl
-AC_DEFUN(RTEMS_TOP,
+AC_DEFUN([RTEMS_TOP],
 [dnl
 AC_REQUIRE([RTEMS_VERSIONING])
 AC_CONFIG_AUX_DIR([$1])
diff --git a/aclocal/target.m4 b/aclocal/target.m4
index d6c2de9fd2..5783146f87 100644
--- a/aclocal/target.m4
+++ b/aclocal/target.m4
@@ -2,7 +2,7 @@ dnl $Id$
 
 ## HACK: Work-around to structural issue with RTEMS
 ## The macros below violate most autoconf and canonicalization standards
-AC_DEFUN(RTEMS_CONFIG_BUILD_SUBDIRS,
+AC_DEFUN([RTEMS_CONFIG_BUILD_SUBDIRS],
 [AC_REQUIRE([_RTEMS_OUTPUT_BUILD_SUBDIRS])
 RTEMS_BUILD_SUBDIRS="$RTEMS_BUILD_SUBDIRS [$1]"
 ])
@@ -86,7 +86,7 @@ dnl
 dnl
 dnl _RTEMS_PUSH_BUILDDIR(SUBDIR)
 dnl
-AC_DEFUN(_RTEMS_PUSH_BUILDDIR,
+AC_DEFUN([_RTEMS_PUSH_BUILDDIR],
 [
 # _RTEMS_PUSH_BUILDDIR
     echo configuring in $1
@@ -103,7 +103,7 @@ AC_DEFUN(_RTEMS_PUSH_BUILDDIR,
 dnl
 dnl _RTEMS_POP_BUILDDIR
 dnl
-AC_DEFUN(_RTEMS_POP_BUILDDIR,
+AC_DEFUN([_RTEMS_POP_BUILDDIR],
 [
   cd $ac_popdir
 ])
@@ -111,7 +111,7 @@ AC_DEFUN(_RTEMS_POP_BUILDDIR,
 dnl
 dnl _RTEMS_GIVEN_INSTALL
 dnl
-AC_DEFUN(_RTEMS_GIVEN_INSTALL,
+AC_DEFUN([_RTEMS_GIVEN_INSTALL],
 [
 ifdef([AC_PROVIDE_AC_PROG_INSTALL],[  
   case "$ac_given_INSTALL" in
@@ -124,7 +124,7 @@ ifdef([AC_PROVIDE_AC_PROG_INSTALL],[
 dnl
 dnl _RTEMS_SUB_SRCDIR(AC_CONFIG_DIR[,TARGET_SUBDIR])
 dnl
-AC_DEFUN(_RTEMS_SUB_SRCDIR,[
+AC_DEFUN([_RTEMS_SUB_SRCDIR],[
 # _RTEMS_SUB_SRCDIR
     _RTEMS_ADJUST_SRCDIR(ac_sub_srcdir,$1,$2)
 
diff --git a/aclocal/tool-paths.m4 b/aclocal/tool-paths.m4
index cb61747afd..ff6e5f830e 100644
--- a/aclocal/tool-paths.m4
+++ b/aclocal/tool-paths.m4
@@ -1,4 +1,4 @@
-AC_DEFUN(RTEMS_TOOLPATHS,
+AC_DEFUN([RTEMS_TOOLPATHS],
 [
 # tooldir='$(exec_prefix)/'$target_alias
 # Temporary work-around until building in source tree is supported