summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-01-16 16:18:26 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-01-16 16:18:26 +0000
commit86a843735c53fe4e6e757ff1fc95ec7dc0d29f79 (patch)
treee980c18b09382cf3acf8a868a0693898bf352840
parent23c6a9586c950f7fa32cee7c3e26892c1513446d (diff)
downloadrtems-86a843735c53fe4e6e757ff1fc95ec7dc0d29f79.tar.bz2
2004-01-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Require automake >= 1.8.2. * aclocal/check-bsps.m4: Also test for make/custom/*.cfg.
-rw-r--r--ChangeLog5
-rw-r--r--aclocal/check-bsps.m434
-rw-r--r--configure.ac2
3 files changed, 25 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index ca157fb7d9..3fe36aa982 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.ac: Require automake >= 1.8.2.
+ * aclocal/check-bsps.m4: Also test for make/custom/*.cfg.
+
2004-01-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Requires automake >= 1.8.1.
diff --git a/aclocal/check-bsps.m4 b/aclocal/check-bsps.m4
index 3ca0bfac5d..ab5368f1d5 100644
--- a/aclocal/check-bsps.m4
+++ b/aclocal/check-bsps.m4
@@ -10,23 +10,27 @@ AC_REQUIRE([RTEMS_CHECK_CPU])dnl sets RTEMS_CPU, target
AC_REQUIRE([RTEMS_TOP])dnl sets RTEMS_TOPdir
AC_MSG_CHECKING([for bsps])
files=`ls $srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU`
- for file in $files; do
- if test -r $srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU/$file/bsp_specs; then
- case $file in
+ for bsp_family in $files; do
+ if test -r $srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU/$bsp_family/bsp_specs; then
+ case $bsp_family in
# Now account for BSPs with build variants
- c4xsim) $1="[$]$1 c4xsim c3xsim";;
- gen68360) $1="[$]$1 gen68360 gen68360_040";;
- p4000) $1="[$]$1 p4600 p4650";;
- mvme162) $1="[$]$1 mvme162 mvme162lx";;
- mbx8xx) $1="[$]$1 mbx821_001 mbx860_002 mbx860_005b";;
- motorola_powerpc) $1="[$]$1 mvme2307 mcp750 mtx603e";;
- pc386) $1="[$]$1 pc386 pc386dx pc486 pc586 pc686 pck6";;
- erc32) $1="[$]$1 erc32 erc32nfp";;
- leon) $1="[$]$1 leon1 leon2";;
- sim68000) $1="[$]$1 sim68000 simcpu32";;
- shsim) $1="[$]$1 simsh7032 simsh7045";;
- *) $1="[$]$1 $file";;
+ c4xsim) bsps="c4xsim c3xsim";;
+ gen68360) bsps="gen68360 gen68360_040";;
+ p4000) bsps="p4600 p4650";;
+ mvme162) bsps="mvme162 mvme162lx";;
+ mbx8xx) bsps="mbx821_001 mbx860_002 mbx860_005b";;
+ motorola_powerpc) bsps="mvme2307 mcp750 mtx603e";;
+ pc386) bsps="pc386 pc386dx pc486 pc586 pc686 pck6";;
+ erc32) bsps="erc32 erc32nfp";;
+ leon) bsps="leon1 leon2";;
+ sim68000) bsps="sim68000 simcpu32";;
+ shsim) bsps="simsh7032 simsh7045";;
+ *) bsps="$bsp_family";;
esac;
+ for bsp in $bsps; do
+ AS_IF([test -r $srcdir/$RTEMS_TOPdir/make/custom/$bsp.cfg],
+ [$1="[$]$1 $bsp"])
+ done
fi
done
AC_MSG_RESULT([[$]$1 .. done])
diff --git a/configure.ac b/configure.ac
index a351e69597..bb0a27dac7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ AS_IF([test -f aclocal/version.m4],[
])
AC_CANONICAL_TARGET([])
-AM_INIT_AUTOMAKE([no-define foreign 1.8.1])
+AM_INIT_AUTOMAKE([no-define foreign 1.8.2])
AM_MAINTAINER_MODE
## These option are only in here to let --help report all supported