Changeset 76d527ec in rtems

Timestamp:

Mar 28, 2002, 1:53:19 PM (20 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

321f5ff

Parents:

9fff6bf

Message:

2002-03-27 Ralf Corsepius <corsepiu@…>

• aclocal/version.m4: New file.
• aclocal/rtems-top.m4: Add RTEMS_VERSIONING, replace VERSION w/ aclocal/version.m4.
• bootstrap: Use aclocal/version.m4 instead of VERSION.
• configure.ac: Use aclocal/version.m4 instead of VERSION.

Files:

• aclocal/rtems-top.m4 (modified) (2 diffs)
• bootstrap (modified) (1 diff)
• configure.ac (modified) (1 diff)

aclocal/rtems-top.m4

@@ -8 +8 @@
 AC_DEFUN(RTEMS_TOP,
 [dnl
+AC_REQUIRE([RTEMS_VERSIONING])
 AC_CHECK_PROGS(MAKE, gmake make)
 AC_BEFORE([$0], [AC_CONFIG_AUX_DIR])dnl
@@ -44 +45 @@
 AC_SUBST(PROJECT_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
-RTEMS_VERSION=`grep 'RTEMS Version' ${srcdir}/${RTEMS_TOPdir}/VERSION | \
-sed -e 's%RTEMS[[       ]]*Version[[    ]]*\(.*\)[[     ]]*%\1%g'`
-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)
+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

bootstrap

@@ -34 +34 @@
 }
 
-if test ! -f $top_srcdir/VERSION; then
+if test ! -f $top_srcdir/aclocal/version.m4; then
   echo "${progname}:"
-  echo "        Installation problem: Can't find file VERSION"
+  echo "        Installation problem: Can't find file aclocal/version.m4"
   exit 1;
 fi

configure.ac

@@ -9 +9 @@
 
 # Abort if trying to build inside of the source tree.
-if test -f VERSION; then
+if test -f aclocal/version.m4; then
   rm -f config.cache config.log confdefs.h
   AC_MSG_ERROR([***]