From 3959276ec197da8604c03aae2435118b5f02ae19 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 26 Nov 2003 05:32:03 +0000 Subject: 2003-11-26 Ralf Corsepius * aclocal/bsp-alias.m4, aclocal/canonical-target-name.m4, aclocal/check-bsps.m4, aclocal/check-custom-bsp.m4, aclocal/enable-bare.m4, aclocal/enable-cxx.m4, aclocal/enable-inlines.m4, aclocal/enable-itron.m4, aclocal/enable-multiprocessing.m4, aclocal/enable-networking.m4, aclocal/enable-posix.m4, aclocal/enable-rdbg.m4, aclocal/enable-rtems-debug.m4, aclocal/enable-rtemsbsp.m4, aclocal/enable-tests.m4, aclocal/multilib.m4, aclocal/path-ksh.m4, aclocal/project-root.m4, aclocal/rtems-top.m4, aclocal/tool-paths.m4, acinclude.m4: Fix underquoting to silence automake-1.8. --- aclocal/bsp-alias.m4 | 4 ++-- aclocal/canonical-target-name.m4 | 2 +- aclocal/check-bsps.m4 | 2 +- aclocal/check-custom-bsp.m4 | 3 ++- aclocal/enable-bare.m4 | 2 +- aclocal/enable-cxx.m4 | 2 +- aclocal/enable-inlines.m4 | 18 ++++++------------ aclocal/enable-itron.m4 | 2 +- aclocal/enable-multiprocessing.m4 | 2 +- aclocal/enable-networking.m4 | 2 +- aclocal/enable-posix.m4 | 2 +- aclocal/enable-rdbg.m4 | 2 +- aclocal/enable-rtems-debug.m4 | 2 +- aclocal/enable-rtemsbsp.m4 | 2 +- aclocal/enable-tests.m4 | 2 +- aclocal/multilib.m4 | 2 +- aclocal/path-ksh.m4 | 2 +- aclocal/project-root.m4 | 2 +- aclocal/rtems-top.m4 | 2 +- aclocal/tool-paths.m4 | 2 +- 20 files changed, 27 insertions(+), 32 deletions(-) (limited to 'aclocal') 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/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/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-custom-bsp.m4 b/aclocal/check-custom-bsp.m4 index de9d61b79e..101d3cf79f 100644 --- a/aclocal/check-custom-bsp.m4 +++ b/aclocal/check-custom-bsp.m4 @@ -1,6 +1,7 @@ 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/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..9852005e06 100644 --- a/aclocal/enable-inlines.m4 +++ b/aclocal/enable-inlines.m4 @@ -1,17 +1,11 @@ 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)])], +AC_HELP_STRING([--enable-rtems-inlines],[enable RTEMS inline functions (default:enabled, disable to use macros)]), [case "${enableval}" in - yes) RTEMS_USE_MACROS=no ;; - no) RTEMS_USE_MACROS=yes ;; - *) AC_MSG_ERROR(bad value ${enableval} for disable-rtems-inlines option) ;; -esac],[RTEMS_USE_MACROS=no]) -AC_SUBST(RTEMS_USE_MACROS)dnl - -AS_IF([test x"${RTEMS_USE_MACROS}" = x"yes"], - [AC_DEFINE_UNQUOTED(USE_MACROS,1,[if using macros])], - [AC_DEFINE_UNQUOTED(USE_INLINES,1,[if using inlines])]) + yes) enable_rtems_inlines=yes ;; + no) enable_rtems_inlines=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for enable-rtems-inlines option) ;; +esac],[enable_rtems_inlines=yes]) ]) 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-rtems-debug.m4 b/aclocal/enable-rtems-debug.m4 index 47dfb32c4f..2f03a837b6 100644 --- a/aclocal/enable-rtems-debug.m4 +++ b/aclocal/enable-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]), 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 a535f8214b..449185e1ad 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], [ AC_ARG_ENABLE(tests, [AC_HELP_STRING([--enable-tests],[enable tests (default:samples)])], 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/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-top.m4 b/aclocal/rtems-top.m4 index 7c9b7ccadc..1cd739f8f7 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/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 -- cgit v1.2.3