summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-02-02 18:30:42 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-02-02 18:30:42 +0000
commit21d7de3a3f110306f8c47bb475ff62afbe730d69 (patch)
tree094728ffaee84dd22bbc24c9e323530b3f7129d6
parentd32f65e69e33a1b7137e3a8aa828ef4ec34a60c8 (diff)
downloadrtems-21d7de3a3f110306f8c47bb475ff62afbe730d69.tar.bz2
2001-02-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configre.in: Fix AM_INIT_AUTOMAKE. * aclocal/bsp-arg-enable.m4: Extend comments. * aclocal/check-bsps.m4: Remove extraneous comments, add test -d in the default clause.
-rw-r--r--ChangeLog7
-rw-r--r--aclocal/bsp-arg-enable.m410
-rw-r--r--aclocal/check-bsps.m46
-rw-r--r--configure.in2
4 files changed, 16 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index a3030ae25a..989e701e9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-02-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configre.in: Fix AM_INIT_AUTOMAKE.
+ * aclocal/bsp-arg-enable.m4: Extend comments.
+ * aclocal/check-bsps.m4: Remove extraneous comments, add test -d in
+ the default clause.
+
2001-01-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/enable-rtemsbsp.m4: Split out RTEMS_ENV_RTEMSBSP,
diff --git a/aclocal/bsp-arg-enable.m4 b/aclocal/bsp-arg-enable.m4
index 53ea4845de..91972a5303 100644
--- a/aclocal/bsp-arg-enable.m4
+++ b/aclocal/bsp-arg-enable.m4
@@ -2,12 +2,12 @@ dnl $Id$
dnl
dnl RTEMS_BSP_ARG_ENABLE(FEATURE, HELP-STRING, ACTION-IF-TRUE [, ACTION-IF-FALSE])
dnl
-dnl Accept --enable-FEATURE=<RTEMS_BSP>:<value> and --enable-FEATURE=<value>
-dnl in BSP-configure scripts.
+dnl Accept --enable-FEATURE=<RTEMS_BSP>:<bsp-value> and
+dnl --enable-FEATURE=<value> in BSP-configure scripts.
dnl
-dnl Configure scripts will receive <value> if <RTEMS_BSP> matches the actual
-dnl value of the shell variable RTEMS_BSP (cf. RTEMS_ENV_RTEMSBSP), and
-dnl <RTEMS_BSP>:<value>.
+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_REQUIRE([RTEMS_ENV_RTEMSBSP])
diff --git a/aclocal/check-bsps.m4 b/aclocal/check-bsps.m4
index d52f14bc6f..43b11ef942 100644
--- a/aclocal/check-bsps.m4
+++ b/aclocal/check-bsps.m4
@@ -32,11 +32,11 @@ AC_MSG_CHECKING([for bsps])
leon) rtems_bsp="$rtems_bsp leon1 leon2";;
sim68000) rtems_bsp="$rtems_bsp sim68000 simcpu32";;
shsim) rtems_bsp="$rtems_bsp simsh7032 simsh7045";;
- *) $1="[$]$1 $file";;
+ *) if test -d $srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU/$file; then
+ $1="[$]$1 $file"
+ fi;;
esac;
done
-dnl ;;
-dnl esac
AC_MSG_RESULT([[$]$1 .. done])
])dnl
diff --git a/configure.in b/configure.in
index 8f30c9847a..f443467f92 100644
--- a/configure.in
+++ b/configure.in
@@ -15,7 +15,7 @@ if test -f VERSION; then
fi
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(cross,0,no)
+AM_INIT_AUTOMAKE(rtems,$RTEMS_VERSION,no)
AM_MAINTAINER_MODE
dnl These option are only in here to let --help report all supported