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.

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.

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]))]
+)

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}" && \