diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-02-12 16:56:47 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-02-12 16:56:47 +0000 |
commit | 3025a4aae5a78dfa44343af946bab1e2c534df2c (patch) | |
tree | 77b0ba7ff1137142c20ef65698d933d321653d90 /c | |
parent | 2004-02-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-3025a4aae5a78dfa44343af946bab1e2c534df2c.tar.bz2 |
2004-02-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/bspopts.m4: Use AS_HELP_STRING.
* aclocal/bsp-configure.m4: Require autoconf-2.59.
Use AC_CONFIG_HEADERS.
* aclocal/check-custom-bsp.m4: Add bspkit-support.
* aclocal/enable-rtemsbsp.m4: Use AS_HELP_STRING.
Diffstat (limited to 'c')
-rw-r--r-- | c/src/ChangeLog | 8 | ||||
-rw-r--r-- | c/src/aclocal/bsp-configure.m4 | 4 | ||||
-rw-r--r-- | c/src/aclocal/bspopts.m4 | 2 | ||||
-rw-r--r-- | c/src/aclocal/check-custom-bsp.m4 | 26 | ||||
-rw-r--r-- | c/src/aclocal/enable-rtemsbsp.m4 | 3 |
5 files changed, 32 insertions, 11 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index a08555b614..58665d09ac 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,5 +1,13 @@ 2004-02-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * aclocal/bspopts.m4: Use AS_HELP_STRING. + * aclocal/bsp-configure.m4: Require autoconf-2.59. + Use AC_CONFIG_HEADERS. + * aclocal/check-custom-bsp.m4: Add bspkit-support. + * aclocal/enable-rtemsbsp.m4: Use AS_HELP_STRING. + +2004-02-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * Makefile.am: include local.am. 2004-02-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> diff --git a/c/src/aclocal/bsp-configure.m4 b/c/src/aclocal/bsp-configure.m4 index 792b9a5bbe..1a8e7bfb1d 100644 --- a/c/src/aclocal/bsp-configure.m4 +++ b/c/src/aclocal/bsp-configure.m4 @@ -4,13 +4,13 @@ dnl RTEMS_BSP_CONFIGURE dnl Common macro to be included by all bsp-configure.acs AC_DEFUN([RTEMS_BSP_CONFIGURE], [ - AC_PREREQ([2.57]) + AC_PREREQ(2.59) AM_MAINTAINER_MODE RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) - AM_CONFIG_HEADER([include/bspopts.tmp:include/bspopts.h.in],[ + AC_CONFIG_HEADERS([include/bspopts.tmp:include/bspopts.h.in],[ echo "/* BSP dependent options file */" >$tmp/config.h echo "/* automatically generated -- DO NOT EDIT!! */" >>$tmp/config.h echo >>$tmp/config.h diff --git a/c/src/aclocal/bspopts.m4 b/c/src/aclocal/bspopts.m4 index e7ba131ae5..b88419f678 100644 --- a/c/src/aclocal/bspopts.m4 +++ b/c/src/aclocal/bspopts.m4 @@ -61,6 +61,6 @@ dnl Stripped down version of autoconf-2.52's AC_ARG_VAR. AC_DEFUN([RTEMS_ARG_VAR], [ m4_expand_once([m4_divert_once([HELP_VAR], -[AC_HELP_STRING([$1], [$2], [ ])])], +[AS_HELP_STRING($1,$2, )])], [$0($1)])dnl ]) diff --git a/c/src/aclocal/check-custom-bsp.m4 b/c/src/aclocal/check-custom-bsp.m4 index 8128906111..402656f3a0 100644 --- a/c/src/aclocal/check-custom-bsp.m4 +++ b/c/src/aclocal/check-custom-bsp.m4 @@ -1,10 +1,24 @@ dnl $Id$ -AC_DEFUN([RTEMS_CHECK_CUSTOM_BSP],[ -AC_REQUIRE([RTEMS_TOP]) +AC_DEFUN([_RTEMS_CHECK_CUSTOM_BSP],[ + for i in ${srcdir}/${RTEMS_TOPdir}/bspkit/${RTEMS_CPU}/*/$1 \ + ${srcdir}/${RTEMS_TOPdir}/make/custom/$1; + do + AC_MSG_CHECKING([for $i]) + AS_IF([test -r $i],[ + $2="$i" + AC_MSG_RESULT([yes]) + break; + ],[ + AC_MSG_RESULT([no]) + ]) + done +]) -AC_MSG_CHECKING([for make/custom/[$]$1.cfg]) -AS_IF([test -r "$srcdir/$RTEMS_TOPdir/make/custom/[$]$1.cfg"], - [AC_MSG_RESULT([yes])], - [AC_MSG_ERROR([no])]) +AC_DEFUN([RTEMS_CHECK_CUSTOM_BSP],[ + AC_REQUIRE([RTEMS_TOP]) + _RTEMS_CHECK_CUSTOM_BSP([[$]$1.cfg],[BSP_FOUND]) + AS_IF([test -z "$BSP_FOUND"],[ + AC_MSG_ERROR([missing [$]$1.cfg]) + ]) ]) diff --git a/c/src/aclocal/enable-rtemsbsp.m4 b/c/src/aclocal/enable-rtemsbsp.m4 index 2bf0310ade..35d8b8bc89 100644 --- a/c/src/aclocal/enable-rtemsbsp.m4 +++ b/c/src/aclocal/enable-rtemsbsp.m4 @@ -7,8 +7,7 @@ AC_DEFUN([RTEMS_ENABLE_RTEMSBSP], [ AC_BEFORE([$0], [RTEMS_ENV_RTEMSBSP]) AC_ARG_ENABLE(rtemsbsp, -[AC_HELP_STRING([--enable-rtemsbsp="bsp1 bsp2 .."], -[BSPs to include in build])], +[AS_HELP_STRING(--enable-rtemsbsp="bsp1 bsp2 ..",BSPs to include in build)], [case "${enableval}" in yes|no) AC_MSG_ERROR([missing argument to --enable-rtemsbsp="bsp1 bsp2"]);; *) $1=$enableval;; |