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.
This commit is contained in:
Ralf Corsepius
2004-02-12 16:56:47 +00:00
parent 717a34e944
commit 3025a4aae5
5 changed files with 33 additions and 12 deletions

View File

@@ -1,3 +1,11 @@
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> 2004-02-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: include local.am. * Makefile.am: include local.am.

View File

@@ -4,13 +4,13 @@ dnl RTEMS_BSP_CONFIGURE
dnl Common macro to be included by all bsp-configure.acs dnl Common macro to be included by all bsp-configure.acs
AC_DEFUN([RTEMS_BSP_CONFIGURE], AC_DEFUN([RTEMS_BSP_CONFIGURE],
[ [
AC_PREREQ([2.57]) AC_PREREQ(2.59)
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
RTEMS_ENV_RTEMSBSP RTEMS_ENV_RTEMSBSP
RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) 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 "/* BSP dependent options file */" >$tmp/config.h
echo "/* automatically generated -- DO NOT EDIT!! */" >>$tmp/config.h echo "/* automatically generated -- DO NOT EDIT!! */" >>$tmp/config.h
echo >>$tmp/config.h echo >>$tmp/config.h

View File

@@ -61,6 +61,6 @@ dnl Stripped down version of autoconf-2.52's AC_ARG_VAR.
AC_DEFUN([RTEMS_ARG_VAR], AC_DEFUN([RTEMS_ARG_VAR],
[ [
m4_expand_once([m4_divert_once([HELP_VAR], m4_expand_once([m4_divert_once([HELP_VAR],
[AC_HELP_STRING([$1], [$2], [ ])])], [AS_HELP_STRING($1,$2, )])],
[$0($1)])dnl [$0($1)])dnl
]) ])

View File

@@ -1,10 +1,24 @@
dnl $Id$ dnl $Id$
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_DEFUN([RTEMS_CHECK_CUSTOM_BSP],[ AC_DEFUN([RTEMS_CHECK_CUSTOM_BSP],[
AC_REQUIRE([RTEMS_TOP]) AC_REQUIRE([RTEMS_TOP])
_RTEMS_CHECK_CUSTOM_BSP([[$]$1.cfg],[BSP_FOUND])
AC_MSG_CHECKING([for make/custom/[$]$1.cfg]) AS_IF([test -z "$BSP_FOUND"],[
AS_IF([test -r "$srcdir/$RTEMS_TOPdir/make/custom/[$]$1.cfg"], AC_MSG_ERROR([missing [$]$1.cfg])
[AC_MSG_RESULT([yes])], ])
[AC_MSG_ERROR([no])])
]) ])

View File

@@ -7,8 +7,7 @@ AC_DEFUN([RTEMS_ENABLE_RTEMSBSP],
[ [
AC_BEFORE([$0], [RTEMS_ENV_RTEMSBSP]) AC_BEFORE([$0], [RTEMS_ENV_RTEMSBSP])
AC_ARG_ENABLE(rtemsbsp, AC_ARG_ENABLE(rtemsbsp,
[AC_HELP_STRING([--enable-rtemsbsp="bsp1 bsp2 .."], [AS_HELP_STRING(--enable-rtemsbsp="bsp1 bsp2 ..",BSPs to include in build)],
[BSPs to include in build])],
[case "${enableval}" in [case "${enableval}" in
yes|no) AC_MSG_ERROR([missing argument to --enable-rtemsbsp="bsp1 bsp2"]);; yes|no) AC_MSG_ERROR([missing argument to --enable-rtemsbsp="bsp1 bsp2"]);;
*) $1=$enableval;; *) $1=$enableval;;