2003-11-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* 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.
This commit is contained in:
Ralf Corsepius
2003-11-26 05:32:03 +00:00
parent de691e68f7
commit 3959276ec1
22 changed files with 45 additions and 35 deletions

View File

@@ -1,3 +1,18 @@
2003-11-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* 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.
2003-10-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* config-ml.in: Don't built multilib variant normal (-mn) for

View File

@@ -332,7 +332,7 @@ m4_divert_text([DEFAULTS],
m4_expand_once([_RTEMS_COMMANDS_POST_CONFIG_SUBDIRS])
])
AC_DEFUN(_RTEMS_BUILD_CONFIG_PREPARE,[
AC_DEFUN([_RTEMS_BUILD_CONFIG_PREPARE],[
## # Record the configure arguments in Makefile.
m4_ifdef([_RTEMS_BUILD_CONFIGDIRS_LIST],
[
@@ -358,7 +358,7 @@ m4_divert_text([DEFAULTS],
m4_expand_once([_RTEMS_COMMANDS_POST_CONFIG_SUBDIRS])
])
AC_DEFUN(_RTEMS_HOST_CONFIG_PREPARE,[
AC_DEFUN([_RTEMS_HOST_CONFIG_PREPARE],[
m4_ifdef([_RTEMS_HOST_CONFIGDIRS_LIST],
[
m4_expand_once([_RTEMS_TOOLS([host],[HOST])])
@@ -384,7 +384,7 @@ m4_expand_once([_RTEMS_COMMANDS_POST_CONFIG_SUBDIRS])
])
])
AC_DEFUN(_RTEMS_TARGET_CONFIG_PREPARE,[
AC_DEFUN([_RTEMS_TARGET_CONFIG_PREPARE],[
m4_ifdef([_RTEMS_TARGET_CONFIGDIRS_LIST],
[
m4_expand_once([_RTEMS_TOOLS([target],[TARGET])])

View File

@@ -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]))]
)

View File

@@ -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)

View File

@@ -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

View File

@@ -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])

View File

@@ -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],

View File

@@ -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],

View File

@@ -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])
])

View File

@@ -1,6 +1,6 @@
dnl $Id$
AC_DEFUN(RTEMS_ENABLE_ITRON,
AC_DEFUN([RTEMS_ENABLE_ITRON],
[
## AC_BEFORE([$0], [RTEMS_CHECK_ITRON_API])dnl

View File

@@ -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],

View File

@@ -1,6 +1,6 @@
dnl $Id$
AC_DEFUN(RTEMS_ENABLE_NETWORKING,
AC_DEFUN([RTEMS_ENABLE_NETWORKING],
[
## AC_BEFORE([$0], [RTEMS_CHECK_NETWORKING])dnl

View File

@@ -1,6 +1,6 @@
dnl $Id$
AC_DEFUN(RTEMS_ENABLE_POSIX,
AC_DEFUN([RTEMS_ENABLE_POSIX],
[
## AC_BEFORE([$0], [RTEMS_CHECK_POSIX_API])dnl

View File

@@ -1,6 +1,6 @@
dnl $Id$
AC_DEFUN(RTEMS_ENABLE_RDBG,
AC_DEFUN([RTEMS_ENABLE_RDBG],
[
AC_BEFORE([$0], [RTEMS_CHECK_RDBG])dnl

View File

@@ -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]),

View File

@@ -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,

View File

@@ -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)])],

View File

@@ -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],

View File

@@ -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)

View File

@@ -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])

View File

@@ -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])

View File

@@ -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