From 67bb1733a5f5a329000fbfc5c6ca182564b8c094 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Wed, 21 Oct 2009 10:10:45 +0000
Subject: [PATCH] =?UTF-8?q?2009-10-21=09Ralf=20Cors=C3=A9pius=20<ralf.cors?=
 =?UTF-8?q?epius@rtems.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	* aclocal/bsp-alias.m4: New.
	* configure.ac: Apply RTEMS_BSP_ALIAS for RTEMS_BSP_FAMILY.
---
 c/src/ChangeLog            |  5 +++++
 c/src/aclocal/bsp-alias.m4 | 22 ++++++++++++++++++++++
 c/src/configure.ac         |  2 +-
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 c/src/aclocal/bsp-alias.m4

diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index ca1e710172..d9443504d5 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-21	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* aclocal/bsp-alias.m4: New.
+	* configure.ac: Apply RTEMS_BSP_ALIAS for RTEMS_BSP_FAMILY.
+
 2009-10-21	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* aclocal/env-rtemsbsp.m4: Remove AM_CONDITIONAL MULTILIB.
diff --git a/c/src/aclocal/bsp-alias.m4 b/c/src/aclocal/bsp-alias.m4
new file mode 100644
index 0000000000..bfee2cb7cf
--- /dev/null
+++ b/c/src/aclocal/bsp-alias.m4
@@ -0,0 +1,22 @@
+dnl
+dnl  $Id$
+dnl 
+
+dnl _RTEMS_BSP_ALIAS(BSP_ALIAS,RTEMS_BSP_FAMILY)
+dnl Internal subroutine to RTEMS_BSP_ALIAS
+AC_DEFUN([_RTEMS_BSP_ALIAS],
+[# account for "aliased" bsps which share source code
+      for bsp_cfgs in `ls "$srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU/"*"/make/custom/$1.cfg" 2>/dev/null`; do
+        $2=`echo "$bsp_cfgs" | sed \
+          -e "s,^$srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU/,," \
+          -e "s,/make/custom/.*\.cfg$,,"`
+        break
+      done
+])
+
+dnl RTEMS_BSP_ALIAS(BSP_ALIAS,RTEMS_BSP_FAMILY)
+dnl convert a bsp alias $1 into its bsp directory RTEMS_BSP_FAMILY
+AC_DEFUN([RTEMS_BSP_ALIAS],
+[_RTEMS_BSP_ALIAS(m4_if([$1],,[$RTEMS_BSP],[$1]),
+  m4_if([$2],,[RTEMS_BSP_FAMILY],[$2]))]
+)
diff --git a/c/src/configure.ac b/c/src/configure.ac
index 7207cb2189..9e6052e9b7 100644
--- a/c/src/configure.ac
+++ b/c/src/configure.ac
@@ -77,7 +77,7 @@ test -n "${RTEMS_CPU_MODEL}" && \
   ac_configure_args="$ac_configure_args 'RTEMS_CPU_MODEL=${RTEMS_CPU_MODEL}'"
 
 AC_CACHE_CHECK([for RTEMS_BSP_FAMILY],[ac_cv_env_RTEMS_BSP_FAMILY],
-[. ./make/${RTEMS_BSP}.cache])
+[RTEMS_BSP_ALIAS([${RTEMS_BSP}],[ac_cv_env_RTEMS_BSP_FAMILY])])
 RTEMS_BSP_FAMILY=$ac_cv_env_RTEMS_BSP_FAMILY
 AC_SUBST(RTEMS_BSP_FAMILY)
 test -n "${RTEMS_BSP_FAMILY}" && \