From 080afecb64218725773fe76353cab709412c9ce0 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Wed, 17 Oct 2001 13:15:11 +0000
Subject: 2001-10-16	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* aclocal/rtems-cpu-subdirs.m4: Add PREFIX arg to RTEMS_CPU_SUBDIRS,
	add 2nd arg to _RTEMS_CPU_SUBDIR.
	* aclocal/target.m4: Replace ac_configure_args with
	rtems_configure_args, add rtems_configure_args to INIT-CMDS.
	* Makefile.am: Require automake-1.5.
---
 aclocal/rtems-cpu-subdirs.m4 | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

(limited to 'aclocal/rtems-cpu-subdirs.m4')

diff --git a/aclocal/rtems-cpu-subdirs.m4 b/aclocal/rtems-cpu-subdirs.m4
index 8fe74be50e..1ecdea4d2f 100644
--- a/aclocal/rtems-cpu-subdirs.m4
+++ b/aclocal/rtems-cpu-subdirs.m4
@@ -1,31 +1,32 @@
 AC_DEFUN([_RTEMS_CPU_SUBDIR],
 [
-$1 )	if test -d ${srcdir}/$1 ; then
-  AC_CONFIG_SUBDIRS([$1])
+$1 )	if test -d ${srcdir}/ifelse([$2],,[$1],[$2/$1]) ; then
+  AC_CONFIG_SUBDIRS(ifelse([$2],,[$1],[$2/$1]))
   fi
 ])
 
+## RTEMS_CPU_SUBDIRS([PREFIX])
 AC_DEFUN([RTEMS_CPU_SUBDIRS],
 [
 ## EDIT: If adding a new cpu to RTEMS, add it to the case block below.
 case $RTEMS_CPU in
-_RTEMS_CPU_SUBDIR([a29k]);;
-_RTEMS_CPU_SUBDIR([arm]);;
-_RTEMS_CPU_SUBDIR([c4x]);;
-_RTEMS_CPU_SUBDIR([h8300]);;
-_RTEMS_CPU_SUBDIR([hppa1.1]);;
-_RTEMS_CPU_SUBDIR([i386]);;
-_RTEMS_CPU_SUBDIR([i960]);;
-_RTEMS_CPU_SUBDIR([m68k]);;
-_RTEMS_CPU_SUBDIR([mips]);;
-_RTEMS_CPU_SUBDIR([mips64orion]);;
-_RTEMS_CPU_SUBDIR([no_cpu]);;
-_RTEMS_CPU_SUBDIR([or16]);;
-_RTEMS_CPU_SUBDIR([or32]);;
-_RTEMS_CPU_SUBDIR([powerpc]);;
-_RTEMS_CPU_SUBDIR([sh]);;
-_RTEMS_CPU_SUBDIR([sparc]);;
-_RTEMS_CPU_SUBDIR([unix]);;
+_RTEMS_CPU_SUBDIR([a29k],[$1]);;
+_RTEMS_CPU_SUBDIR([arm],[$1]);;
+_RTEMS_CPU_SUBDIR([c4x],[$1]);;
+_RTEMS_CPU_SUBDIR([h8300],[$1]);;
+_RTEMS_CPU_SUBDIR([hppa1.1],[$1]);;
+_RTEMS_CPU_SUBDIR([i386],[$1]);;
+_RTEMS_CPU_SUBDIR([i960],[$1]);;
+_RTEMS_CPU_SUBDIR([m68k],[$1]);;
+_RTEMS_CPU_SUBDIR([mips],[$1]);;
+_RTEMS_CPU_SUBDIR([mips64orion],[$1]);;
+_RTEMS_CPU_SUBDIR([no_cpu],[$1]);;
+_RTEMS_CPU_SUBDIR([or16],[$1]);;
+_RTEMS_CPU_SUBDIR([or32],[$1]);;
+_RTEMS_CPU_SUBDIR([powerpc],[$1]);;
+_RTEMS_CPU_SUBDIR([sh],[$1]);;
+_RTEMS_CPU_SUBDIR([sparc],[$1]);;
+_RTEMS_CPU_SUBDIR([unix],[$1]);;
 *) AC_MSG_ERROR([Invalid RTEMS_CPU])
 esac
 ])
-- 
cgit v1.2.3