diff options
30 files changed, 55 insertions, 36 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index c03d1b53b3..a0cf767291 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,22 @@ +2003-11-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * aclocal/bsp-arg-enable.m4, aclocal/canonical-target-name.m4, + aclocal/canonicalize-tools.m4, aclocal/check-custom-bsp.m4, + aclocal/check-posix.m4, aclocal/check-rdbg.m4, + aclocal/check-tool.m4, aclocal/config-subdirs.m4, + aclocal/enable-bare.m4, aclocal/enable-cxx.m4, + aclocal/enable-itron.m4, aclocal/enable-multiprocessing.m4, + aclocal/enable-networking.m4, aclocal/enable-posix.m4, + aclocal/enable-rdbg.m4, aclocal/enable-rtemsbsp.m4, + aclocal/env-rtemsbsp.m4, aclocal/gcc-isystem.m4, + aclocal/gcc-pipe.m4, aclocal/gcc-specs.m4, + aclocal/i386-gas-code16.m4, aclocal/multilib.m4, + aclocal/path-ksh.m4, aclocal/prog-cc.m4, + aclocal/prog-cxx.m4, aclocal/project-root.m4, + aclocal/rtems-top.m4, aclocal/target.m4, + aclocal/tool-paths.m4: + Fix underquoting to silence automake-1.8. + 2003-11-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * configure.ac: Reflect having moved tests to ../../testsuites. diff --git a/c/src/aclocal/bsp-arg-enable.m4 b/c/src/aclocal/bsp-arg-enable.m4 index 91972a5303..a03d78b5c2 100644 --- a/c/src/aclocal/bsp-arg-enable.m4 +++ b/c/src/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/c/src/aclocal/canonical-target-name.m4 b/c/src/aclocal/canonical-target-name.m4 index 34126b0483..8d0efa13c9 100644 --- a/c/src/aclocal/canonical-target-name.m4 +++ b/c/src/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_HOST AC_MSG_CHECKING(rtems target cpu) diff --git a/c/src/aclocal/canonicalize-tools.m4 b/c/src/aclocal/canonicalize-tools.m4 index 4d37fa9c69..190afca09a 100644 --- a/c/src/aclocal/canonicalize-tools.m4 +++ b/c/src/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/c/src/aclocal/check-custom-bsp.m4 b/c/src/aclocal/check-custom-bsp.m4 index de9d61b79e..8128906111 100644 --- a/c/src/aclocal/check-custom-bsp.m4 +++ b/c/src/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/c/src/aclocal/check-posix.m4 b/c/src/aclocal/check-posix.m4 index bcb7f3c728..9c66a78118 100644 --- a/c/src/aclocal/check-posix.m4 +++ b/c/src/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_CANONICAL_TARGET_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/c/src/aclocal/check-rdbg.m4 b/c/src/aclocal/check-rdbg.m4 index ac890ef8a9..985a52e613 100644 --- a/c/src/aclocal/check-rdbg.m4 +++ b/c/src/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_CANONICAL_TARGET_CPU])dnl diff --git a/c/src/aclocal/check-tool.m4 b/c/src/aclocal/check-tool.m4 index 5a91490e74..4c412c074a 100644 --- a/c/src/aclocal/check-tool.m4 +++ b/c/src/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/c/src/aclocal/config-subdirs.m4 b/c/src/aclocal/config-subdirs.m4 index 6f9360bc80..38e059d9e6 100644 --- a/c/src/aclocal/config-subdirs.m4 +++ b/c/src/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/c/src/aclocal/enable-bare.m4 b/c/src/aclocal/enable-bare.m4 index 43219461f8..a52a927d1c 100644 --- a/c/src/aclocal/enable-bare.m4 +++ b/c/src/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/c/src/aclocal/enable-cxx.m4 b/c/src/aclocal/enable-cxx.m4 index cde862d39f..eb46663381 100644 --- a/c/src/aclocal/enable-cxx.m4 +++ b/c/src/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/c/src/aclocal/enable-itron.m4 b/c/src/aclocal/enable-itron.m4 index 3157ce0641..d2911ad29d 100644 --- a/c/src/aclocal/enable-itron.m4 +++ b/c/src/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/c/src/aclocal/enable-multiprocessing.m4 b/c/src/aclocal/enable-multiprocessing.m4 index 129de0a735..3d5c8f81b7 100644 --- a/c/src/aclocal/enable-multiprocessing.m4 +++ b/c/src/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/c/src/aclocal/enable-networking.m4 b/c/src/aclocal/enable-networking.m4 index 47801fff7c..03dedfd4f0 100644 --- a/c/src/aclocal/enable-networking.m4 +++ b/c/src/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/c/src/aclocal/enable-posix.m4 b/c/src/aclocal/enable-posix.m4 index 13be1417dd..63d5e4db93 100644 --- a/c/src/aclocal/enable-posix.m4 +++ b/c/src/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/c/src/aclocal/enable-rdbg.m4 b/c/src/aclocal/enable-rdbg.m4 index 8fa0cc8532..a636ba4850 100644 --- a/c/src/aclocal/enable-rdbg.m4 +++ b/c/src/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/c/src/aclocal/enable-rtemsbsp.m4 b/c/src/aclocal/enable-rtemsbsp.m4 index 10ffcf6827..2bf0310ade 100644 --- a/c/src/aclocal/enable-rtemsbsp.m4 +++ b/c/src/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/c/src/aclocal/env-rtemsbsp.m4 b/c/src/aclocal/env-rtemsbsp.m4 index 705df4d4dc..6f188f813d 100644 --- a/c/src/aclocal/env-rtemsbsp.m4 +++ b/c/src/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/c/src/aclocal/gcc-isystem.m4 b/c/src/aclocal/gcc-isystem.m4 index c230508208..94098cf33c 100644 --- a/c/src/aclocal/gcc-isystem.m4 +++ b/c/src/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/c/src/aclocal/gcc-pipe.m4 b/c/src/aclocal/gcc-pipe.m4 index 093ea2edf4..2a04629bb2 100644 --- a/c/src/aclocal/gcc-pipe.m4 +++ b/c/src/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/c/src/aclocal/gcc-specs.m4 b/c/src/aclocal/gcc-specs.m4 index ca0271424f..dd49bb95d4 100644 --- a/c/src/aclocal/gcc-specs.m4 +++ b/c/src/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/c/src/aclocal/i386-gas-code16.m4 b/c/src/aclocal/i386-gas-code16.m4 index 9bb0030d94..7b9ce2f91c 100644 --- a/c/src/aclocal/i386-gas-code16.m4 +++ b/c/src/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/c/src/aclocal/multilib.m4 b/c/src/aclocal/multilib.m4 index 66896f9ce5..d76c71d26f 100644 --- a/c/src/aclocal/multilib.m4 +++ b/c/src/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/c/src/aclocal/path-ksh.m4 b/c/src/aclocal/path-ksh.m4 index 881dd0c9ec..306c4ca2e7 100644 --- a/c/src/aclocal/path-ksh.m4 +++ b/c/src/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/c/src/aclocal/prog-cc.m4 b/c/src/aclocal/prog-cc.m4 index 24a9d842a1..7b4335ca17 100644 --- a/c/src/aclocal/prog-cc.m4 +++ b/c/src/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/c/src/aclocal/prog-cxx.m4 b/c/src/aclocal/prog-cxx.m4 index 8db69bf804..8991489814 100644 --- a/c/src/aclocal/prog-cxx.m4 +++ b/c/src/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/c/src/aclocal/project-root.m4 b/c/src/aclocal/project-root.m4 index b520b94b5a..2f27bfe55b 100644 --- a/c/src/aclocal/project-root.m4 +++ b/c/src/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/c/src/aclocal/rtems-top.m4 b/c/src/aclocal/rtems-top.m4 index 7c9b7ccadc..1cd739f8f7 100644 --- a/c/src/aclocal/rtems-top.m4 +++ b/c/src/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/c/src/aclocal/target.m4 b/c/src/aclocal/target.m4 index d6c2de9fd2..5783146f87 100644 --- a/c/src/aclocal/target.m4 +++ b/c/src/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/c/src/aclocal/tool-paths.m4 b/c/src/aclocal/tool-paths.m4 index cb61747afd..ff6e5f830e 100644 --- a/c/src/aclocal/tool-paths.m4 +++ b/c/src/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 |