From c3643e78de94e3f6450c507002b88f14790e66b7 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Thu, 23 Oct 2003 10:59:10 +0000
Subject: 2003-10-23	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* aclocal/rtems-top.m4: Add support for --with-project-root.
	Remove RTEMS Version message.
---
 c/src/tests/ChangeLog            |  5 +++++
 c/src/tests/aclocal/rtems-top.m4 | 12 +++---------
 testsuites/ChangeLog             |  5 +++++
 testsuites/aclocal/rtems-top.m4  | 12 +++---------
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/c/src/tests/ChangeLog b/c/src/tests/ChangeLog
index cdb5b425f1..7ea60e9900 100644
--- a/c/src/tests/ChangeLog
+++ b/c/src/tests/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-23	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* aclocal/rtems-top.m4: Add support for --with-project-root.
+	Remove RTEMS Version message.
+
 2003-10-22	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* aclocal/canonical-host.m4: Remove.
diff --git a/c/src/tests/aclocal/rtems-top.m4 b/c/src/tests/aclocal/rtems-top.m4
index 7c9b7ccadc..f00e640902 100644
--- a/c/src/tests/aclocal/rtems-top.m4
+++ b/c/src/tests/aclocal/rtems-top.m4
@@ -28,21 +28,15 @@ test -n "$with_target_subdir" || with_target_subdir="."
 
 if test "$with_target_subdir" = "." ; then
 # Native
-PROJECT_TOPdir=${RTEMS_TOPdir}/'$(top_builddir)'
+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}${RTEMS_TOPdir}/'$(top_builddir)'
+PROJECT_TOPdir="${dots}${with_project_root}${RTEMS_TOPdir}/\$(top_builddir)"
 fi
 AC_SUBST(PROJECT_TOPdir)
 
-PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)"
+PROJECT_ROOT="${with_project_root}${RTEMS_TOPdir}/\$(top_builddir)"
 AC_SUBST(PROJECT_ROOT)
-
-AC_MSG_CHECKING([for RTEMS Version])
-AS_IF([test -r "${srcdir}/${RTEMS_TOPdir}/aclocal/version.m4"],
-[],
-[AC_MSG_ERROR([Unable to find ${RTEMS_TOPdir}/aclocal/version.m4])])
-AC_MSG_RESULT([_RTEMS_VERSION])
 ])dnl
diff --git a/testsuites/ChangeLog b/testsuites/ChangeLog
index cdb5b425f1..7ea60e9900 100644
--- a/testsuites/ChangeLog
+++ b/testsuites/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-23	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* aclocal/rtems-top.m4: Add support for --with-project-root.
+	Remove RTEMS Version message.
+
 2003-10-22	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* aclocal/canonical-host.m4: Remove.
diff --git a/testsuites/aclocal/rtems-top.m4 b/testsuites/aclocal/rtems-top.m4
index 7c9b7ccadc..f00e640902 100644
--- a/testsuites/aclocal/rtems-top.m4
+++ b/testsuites/aclocal/rtems-top.m4
@@ -28,21 +28,15 @@ test -n "$with_target_subdir" || with_target_subdir="."
 
 if test "$with_target_subdir" = "." ; then
 # Native
-PROJECT_TOPdir=${RTEMS_TOPdir}/'$(top_builddir)'
+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}${RTEMS_TOPdir}/'$(top_builddir)'
+PROJECT_TOPdir="${dots}${with_project_root}${RTEMS_TOPdir}/\$(top_builddir)"
 fi
 AC_SUBST(PROJECT_TOPdir)
 
-PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)"
+PROJECT_ROOT="${with_project_root}${RTEMS_TOPdir}/\$(top_builddir)"
 AC_SUBST(PROJECT_ROOT)
-
-AC_MSG_CHECKING([for RTEMS Version])
-AS_IF([test -r "${srcdir}/${RTEMS_TOPdir}/aclocal/version.m4"],
-[],
-[AC_MSG_ERROR([Unable to find ${RTEMS_TOPdir}/aclocal/version.m4])])
-AC_MSG_RESULT([_RTEMS_VERSION])
 ])dnl
-- 
cgit v1.2.3