From 94608578a2c5d90d87ca729bb5d45f945679254a Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 10 Jan 2000 13:56:35 +0000
Subject: Patch rtems-rc-20000104-2.diff from Ralf Corsepius
 <corsepiu@faw.uni-ulm.de> that converts nearly all of libbsp/sh to automake. 
 Comments follow:

    1. Almost full automake support for the libbsp/sh/ subdirectories
       (exception libbsp/sh/gensh*/wrapup/*)
    2. Fixes for libbsp/bare/*
    3. Updates to libbsp/* configuration which supports old (autoconf/deep
       configuration) and new (automake/flat/cascaded configuration) style
       configuration of libbsp/<cpu>/*
---
 c/src/lib/libbsp/configure.in | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

(limited to 'c/src/lib/libbsp/configure.in')

diff --git a/c/src/lib/libbsp/configure.in b/c/src/lib/libbsp/configure.in
index 3db27b9f9b..d237d7d990 100644
--- a/c/src/lib/libbsp/configure.in
+++ b/c/src/lib/libbsp/configure.in
@@ -58,25 +58,31 @@ esac
 if test "$RTEMS_BSP" = "bare" ; then
   RTEMS_LIBBSP_CPU_SUBDIR="bare"
 else
-  RTEMS_LIBBSP_CPU_SUBDIR='$(RTEMS_CPU)'
+  RTEMS_LIBBSP_CPU_SUBDIR=$RTEMS_CPU
 fi
 AC_SUBST(RTEMS_LIBBSP_CPU_SUBDIR)
 
+if test ! -f ${srcdir}/${RTEMS_LIBBSP_CPU_SUBDIR}/configure.in
+then
+
 # find all the Makefiles for the BSPs
-makefiles="$makefiles $RTEMS_CPU/Makefile"
+  makefiles="$makefiles $RTEMS_CPU/Makefile"
      
-if test -d "$srcdir/$bspcpudir$bspdir"; then
-  RTEMS_CHECK_MAKEFILE(${bspcpudir}$bspdir)
-  RTEMS_CHECK_MAKEFILE(${bspcpudir}shared)
-
-  # HACK: sed out bsp-tools from makefiles
-  t="$bspcpudir$bspdir/tools"
-  if test -d "$srcdir/$t"; then
-    bsptools_cfgdirs="$bsptools_cfgdirs $t"
-    makefiles=`echo "$makefiles" | sed -e "s%$t/.*Makefile%%g"`
+  if test -d "$srcdir/$bspcpudir$bspdir"; then
+    RTEMS_CHECK_MAKEFILE(${bspcpudir}$bspdir)
+    RTEMS_CHECK_MAKEFILE(${bspcpudir}shared)
+
+    # HACK: sed out bsp-tools from makefiles
+    t="$bspcpudir$bspdir/tools"
+    if test -d "$srcdir/$t"; then
+      bsptools_cfgdirs="$bsptools_cfgdirs $t"
+      makefiles=`echo "$makefiles" | sed -e "s%$t/.*Makefile%%g"`
+    fi
+  else
+    AC_MSG_ERROR([unable to find libbsp subdirectory ($bspdir) for  ${RTEMS_BSP}])
   fi
 else
-  AC_MSG_ERROR([unable to find libbsp subdirectory ($bspdir) for  ${RTEMS_BSP}])
+  cfg_subdirs="$RTEMS_LIBBSP_CPU_SUBDIR"
 fi
 
 if test "$HAS_MP" = "yes"; then
@@ -86,13 +92,11 @@ else
   t="$bspcpudir$bspdir/shmsupp"
   makefiles=`echo "$makefiles" | sed -e "s%$t/.*Makefile%%g"`
 fi
+
 AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
 
 AC_CONFIG_SUBDIRS($bsptools_cfgdirs)
 
-if test "$RTEMS_BSP" = "bare"; then
-cfg_subdirs="bare"
-fi
 AC_CONFIG_SUBDIRS($cfg_subdirs)
 
 # try to explicitly list a Makefile here 
-- 
cgit v1.2.3