summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-03-28 13:53:19 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-03-28 13:53:19 +0000
commit76d527ec18676ddd8f0a8ea922b0aaab3824c6ba (patch)
treea1a7e5a8030e55b345f3059817501097eedd06c5
parent9fff6bfac6f5133f45f72deaa0ba28a79702cbaa (diff)
downloadrtems-76d527ec18676ddd8f0a8ea922b0aaab3824c6ba.tar.bz2
2002-03-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* 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.
-rw-r--r--aclocal/rtems-top.m417
-rwxr-xr-xbootstrap4
-rw-r--r--configure.ac2
3 files changed, 8 insertions, 15 deletions
diff --git a/aclocal/rtems-top.m4 b/aclocal/rtems-top.m4
index 1ec8aa204a..82da20edd5 100644
--- a/aclocal/rtems-top.m4
+++ b/aclocal/rtems-top.m4
@@ -7,6 +7,7 @@ dnl $1 .. relative path from this configure.in to the toplevel configure.in
dnl
AC_DEFUN(RTEMS_TOP,
[dnl
+AC_REQUIRE([RTEMS_VERSIONING])
AC_CHECK_PROGS(MAKE, gmake make)
AC_BEFORE([$0], [AC_CONFIG_AUX_DIR])dnl
AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl
@@ -43,17 +44,9 @@ PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)"
fi
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
diff --git a/bootstrap b/bootstrap
index 50a7dbcad4..4af89886af 100755
--- a/bootstrap
+++ b/bootstrap
@@ -33,9 +33,9 @@ usage()
exit 1;
}
-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
diff --git a/configure.ac b/configure.ac
index 344491a7fe..d6cfca26c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ AC_CONFIG_SRCDIR([c])
RTEMS_TOP([.])
# 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([***]
[Attempt to build inside of the source tree]