From 504112db99e82100cbbd53c4e181e3f15931b1bc Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Mon, 18 Oct 2004 09:38:02 +0000
Subject: 2004-10-18	Ralf Corsepius <ralf_corsepius@rtems.org>

	* aclocal/check-bsps.m4: Add bspkit support. Don't check for
	presence of *.cfg.
	* aclocal/check-custom-bsp.m4: Add bspkit support.
---
 aclocal/check-bsps.m4       | 32 ++++++++++++++++----------------
 aclocal/check-custom-bsp.m4 | 27 ++++++++++++++++++++-------
 2 files changed, 36 insertions(+), 23 deletions(-)

(limited to 'aclocal')

diff --git a/aclocal/check-bsps.m4 b/aclocal/check-bsps.m4
index ab5368f1d5..767b5c4a3d 100644
--- a/aclocal/check-bsps.m4
+++ b/aclocal/check-bsps.m4
@@ -1,18 +1,20 @@
 dnl $Id$
 
-dnl Report all available bsps for a target,
-dnl check if a bsp-subdirectory is present for all bsps found
+dnl Report all available bsps for a target within the source tree
 dnl
 dnl RTEMS_CHECK_BSPS(bsp_list)
 AC_DEFUN([RTEMS_CHECK_BSPS],
 [
-AC_REQUIRE([RTEMS_CHECK_CPU])dnl sets RTEMS_CPU, target
+AC_REQUIRE([RTEMS_CANONICAL_TARGET_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 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
+
+AC_MSG_CHECKING([for available BSPs])
+  $1=
+  for bsp_spec in "$srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU"/*/bsp_specs; do
+    bsp_family=`echo "$bsp_spec" | sed \
+        -e "s,^$srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU/,," \
+        -e "s,/bsp_specs$,,"`
+    case $bsp_family in
         # Now account for BSPs with build variants
           c4xsim)            bsps="c4xsim c3xsim";;
           gen68360)          bsps="gen68360 gen68360_040";;
@@ -26,12 +28,10 @@ AC_MSG_CHECKING([for bsps])
 	  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])
+    esac;
+    $1="[$]$1 $bsps"
+  done
+  AS_IF([test -z "[$]$1"],
+    [AC_MSG_RESULT([none])],
+    [AC_MSG_RESULT([$]$1)])
 ])dnl
diff --git a/aclocal/check-custom-bsp.m4 b/aclocal/check-custom-bsp.m4
index 101d3cf79f..dc87133a17 100644
--- a/aclocal/check-custom-bsp.m4
+++ b/aclocal/check-custom-bsp.m4
@@ -1,11 +1,24 @@
 dnl $Id$
 
-AC_DEFUN([RTEMS_CHECK_CUSTOM_BSP],
-[
-AC_REQUIRE([RTEMS_TOP])
+AC_DEFUN([_RTEMS_CHECK_CUSTOM_BSP],[
+AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl sets RTEMS_CPU, target
+AC_REQUIRE([RTEMS_TOP])dnl sets RTEMS_TOPdir
+  $2=
+  AC_MSG_CHECKING([for $1])
+  for i in "${srcdir}/${RTEMS_TOPdir}/bspkit/${RTEMS_CPU}"/*/"$1" \
+    "${srcdir}/${RTEMS_TOPdir}/make/custom/$1";
+  do
+    AS_IF([test -r $i],[
+      $2="$i"
+      break;
+    ])
+  done
+  AS_IF([test -n "[$]$2"],
+    [AC_MSG_RESULT([[$]$2])],
+    [AC_MSG_RESULT([no])])
+])
 
-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])
 ])
-- 
cgit v1.2.3