diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-03-28 13:53:19 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-03-28 13:53:19 +0000 |
| commit | 76d527ec18676ddd8f0a8ea922b0aaab3824c6ba (patch) | |
| tree | a1a7e5a8030e55b345f3059817501097eedd06c5 /aclocal/rtems-top.m4 | |
| parent | 2002-03-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-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.
Diffstat (limited to 'aclocal/rtems-top.m4')
| -rw-r--r-- | aclocal/rtems-top.m4 | 17 |
1 files changed, 5 insertions, 12 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 |