2004-02-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* configure.ac: AC_CONFIG_SRCDIR([PROBLEMS]).
	* aclocal/check-custom-bsp.m4: Sync with c/src/aclocal.
	* aclocal/project-root.m4: Remove obsolete comments.
	* aclocal/env-rtemsbsp.m4: Remove RTEMS_ROOT.
	* aclocal/rtems-top.m4: Rework.

6 files changed, 36 insertions, 32 deletions

diff --git a/testsuites/ChangeLog b/testsuites/ChangeLog
index 025d06c8c2..cae2aaae1e 100644
--- a/testsuites/ChangeLog
+++ b/testsuites/ChangeLog
@@ -1,3 +1,11 @@
+2004-02-18	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: AC_CONFIG_SRCDIR([PROBLEMS]).
+	* aclocal/check-custom-bsp.m4: Sync with c/src/aclocal.
+	* aclocal/project-root.m4: Remove obsolete comments.
+	* aclocal/env-rtemsbsp.m4: Remove RTEMS_ROOT.
+	* aclocal/rtems-top.m4: Rework.
+
 2004-02-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Remove subdir tools.
diff --git a/testsuites/aclocal/check-custom-bsp.m4 b/testsuites/aclocal/check-custom-bsp.m4
index 8128906111..402656f3a0 100644
--- a/testsuites/aclocal/check-custom-bsp.m4
+++ b/testsuites/aclocal/check-custom-bsp.m4
@@ -1,10 +1,24 @@
 dnl $Id$
 
-AC_DEFUN([RTEMS_CHECK_CUSTOM_BSP],[
-AC_REQUIRE([RTEMS_TOP])
+AC_DEFUN([_RTEMS_CHECK_CUSTOM_BSP],[
+  for i in ${srcdir}/${RTEMS_TOPdir}/bspkit/${RTEMS_CPU}/*/$1 \
+    ${srcdir}/${RTEMS_TOPdir}/make/custom/$1;
+  do
+    AC_MSG_CHECKING([for $i])
+    AS_IF([test -r $i],[
+      $2="$i"
+      AC_MSG_RESULT([yes])
+      break;
+    ],[
+      AC_MSG_RESULT([no])
+    ])
+  done
+])
 
-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])
+  AS_IF([test -z "$BSP_FOUND"],[
+    AC_MSG_ERROR([missing [$]$1.cfg])
+  ])
 ])
diff --git a/testsuites/aclocal/env-rtemsbsp.m4 b/testsuites/aclocal/env-rtemsbsp.m4
index 3fe9195ddd..d8fdd07210 100644
--- a/testsuites/aclocal/env-rtemsbsp.m4
+++ b/testsuites/aclocal/env-rtemsbsp.m4
@@ -33,9 +33,6 @@ AC_SUBST(RTEMS_BSP_SPECS)
 GCC_SPECS="-B\$(PROJECT_ROOT)/lib/ -B\$(PROJECT_ROOT)/$RTEMS_BSP/lib/"
 AC_SUBST(GCC_SPECS)
 
-RTEMS_ROOT="\$(PROJECT_ROOT)/c/$RTEMS_BSP"
-AC_SUBST(RTEMS_ROOT)
-
 RTEMS_ENABLE_BARE
 AC_SUBST(BARE_CPU_MODEL)
 AC_SUBST(BARE_CPU_CFLAGS)
diff --git a/testsuites/aclocal/project-root.m4 b/testsuites/aclocal/project-root.m4
index 2f27bfe55b..f3be25dc2f 100644
--- a/testsuites/aclocal/project-root.m4
+++ b/testsuites/aclocal/project-root.m4
@@ -2,16 +2,6 @@ dnl
 dnl $Id$
 dnl 
 
-dnl
-dnl PROJECT_TOPdir     .. relative path to the top of the build-tree
-dnl PROJECT_ROOT       .. relative path to the top of the temporary
-dnl                       installation directory inside the build-tree
-dnl RTEMS_TOPdir       .. relative path of a subpackage's configure.in to the
-dnl                       toplevel configure.in of the source-tree
-dnl RTEMS_ROOT         .. path to the top of a bsp's build directory
-dnl                       [Applied by custom/*.cfg, depredicated otherwise]
-dnl
-
 AC_DEFUN([RTEMS_PROJECT_ROOT],
 [dnl
 AC_REQUIRE([RTEMS_TOP])
diff --git a/testsuites/aclocal/rtems-top.m4 b/testsuites/aclocal/rtems-top.m4
index 86720143a1..8e8052896e 100644
--- a/testsuites/aclocal/rtems-top.m4
+++ b/testsuites/aclocal/rtems-top.m4
@@ -25,20 +25,15 @@ RTEMS_TOPdir="$1";
 AC_SUBST(RTEMS_TOPdir)
 
 ## with_target_subdirs is handled implicitly by autoconf
-test -n "$with_target_subdir" || with_target_subdir="."
-
-if test "$with_target_subdir" = "." ; then
-# Native
-PROJECT_TOPdir="${with_project_root}${RTEMS_TOPdir}/\$(top_builddir)"
-else
-# Cross
 dots=`echo $with_target_subdir|\
-sed -e 's%^\./%%' -e 's%[[^/]]$%&/%' -e 's%[[^/]]*/%../%g'`
-PROJECT_TOPdir="${dots}${with_project_root}${RTEMS_TOPdir}/\$(top_builddir)"
-fi
-AC_SUBST(PROJECT_TOPdir)
+sed -e 's,^\.$,,' -e 's%^\./%%' -e 's%[[^/]]$%&/%' -e 's%[[^/]]*/%../%g'`
+PROJECT_TOPdir=${dots}${RTEMS_TOPdir}/'$(top_builddir)'
+AC_SUBST([PROJECT_TOPdir])
+
+RTEMS_ROOT=$with_rtems_root`echo "$1/" | sed 's,^../,,'`'$(top_builddir)'
+AC_SUBST(RTEMS_ROOT)
 
-PROJECT_ROOT="${with_project_root}${RTEMS_TOPdir}/\$(top_builddir)"
+PROJECT_ROOT=$with_project_root`echo "$1/" | sed 's,^../,,'`'$(top_builddir)'
 AC_SUBST(PROJECT_ROOT)
 
 AC_SUBST([dirstamp],[\${am__leading_dot}dirstamp])
diff --git a/testsuites/configure.ac b/testsuites/configure.ac
index 4f49bcf7b3..0dfee9dd48 100644
--- a/testsuites/configure.ac
+++ b/testsuites/configure.ac
@@ -4,7 +4,7 @@
 
 AC_PREREQ(2.59)
 AC_INIT([rtems-c-src-tests],[_RTEMS_VERSION],[rtems-bugs@rtems.com])
-AC_CONFIG_SRCDIR([samples])
+AC_CONFIG_SRCDIR([PROBLEMS])
 RTEMS_TOP(..)
 
 RTEMS_CANONICAL_TARGET_CPU