From 9b8baa128b4e7d0696f9ad995927cf2e5162649f Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Tue, 23 Mar 1999 18:02:17 +0000
Subject: Automake II patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>. 
 Email description follows:

Description:

    * automake for *all* tool subdirectories (Makefile.am, configure.in etc.)
    * autogen now also considers CONFIG_HEADER (generates stamp-h.ins and
      config.h.ins)
    * c/src/tests/tools/generic/difftest and
      c/src/tests/tools/generic/sorttimes generated by configure scripts
    * c/update-tools/ampolish, beautifier for Makefile.ams, similar to
      acpolish
    * rtems-polish.sh added to c/update-tools/ + ampolish support
    * New subdirectory ./automake, contains automake -Makefile fragments to
      support RTEMS make "debug, debug_install, profile, profile_install" for
      native Makefile.ams (== ignore these make targets).
    * aclocal/rtems-top.m4's RTEMS_TOP now reads the automake makefile
      variable VERSION from RTEMS ./VERSION file.
    * ./configure.in uses the macros from aclocal + support for the tools'
      configure scripts

  Remarks:
    * To run rtems-polish.sh, "cd <rtems-source-tree>;
      ./c/update-tools/rtems-polish.sh"
    * AFAIS, now all native subdirectories are converted to automake (Please
      drop me a note, if I forgot something).
    * Unless you notice something fatal, IMO the time has come for a public
      try (== snapshot). I do not intend to send more automake related patches
      within, say 2 weeks, to give these patches time to settle and to give me
      some time to think on how to continue.
    * The patch assumes installation to the new main installation directory
      [$(prefix)].
---
 c/build-tools/aclocal.m4 | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

(limited to 'c/build-tools/aclocal.m4')

diff --git a/c/build-tools/aclocal.m4 b/c/build-tools/aclocal.m4
index 8b1d4618fe..40c08bdfa0 100644
--- a/c/build-tools/aclocal.m4
+++ b/c/build-tools/aclocal.m4
@@ -12,6 +12,11 @@ dnl PARTICULAR PURPOSE.
 
 dnl $Id$
 
+dnl
+dnl RTEMS_TOP($1)
+dnl 
+dnl $1 .. relative path from this configure.in to the toplevel configure.in
+dnl
 AC_DEFUN(RTEMS_TOP,
 [dnl
 RTEMS_TOPdir="$1";
@@ -20,8 +25,25 @@ AC_SUBST(RTEMS_TOPdir)
 PROJECT_ROOT=`pwd`/$RTEMS_TOPdir;
 AC_SUBST(PROJECT_ROOT)
 
-RTEMS_ROOT='$(top_srcdir)'/$RTEMS_TOPdir;
-AC_SUBST(RTEMS_ROOT)
+dnl Determine RTEMS Version string from the VERSION file
+dnl Hopefully, Joel never changes its format ;-
+AC_MSG_CHECKING([for RTEMS Version])
+if test -r "${srcdir}/${RTEMS_TOPdir}/VERSION"; then
+changequote(,)dnl
+RTEMS_VERSION=`grep Version ${srcdir}/${RTEMS_TOPdir}/VERSION | \
+sed -e 's%RTEMS[ 	]*Version[ 	]*\(.*\)[ 	]*%\1%g'`
+changequote([,])dnl
+else
+AC_MSG_ERROR(Unable to find ${RTEMS_TOPdir}/VERSION)
+fi
+if test -z "$RTEMS_VERSION"; then
+AC_MSG_ERROR(Unable to determine version)
+fi
+AC_MSG_RESULT($RTEMS_VERSION)
+
+dnl FIXME: This once gets activated in future or will be removed
+dnl RTEMS_ROOT='$(top_srcdir)'/$RTEMS_TOPdir;
+dnl AC_SUBST(RTEMS_ROOT)
 ])dnl
 
 # Do all the work for Automake.  This macro actually does too much --
-- 
cgit v1.2.3