Changeset 76d527e in rtems


Ignore:
Timestamp:
Mar 28, 2002, 1:53:19 PM (19 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:
3 edited

Legend:

Unmodified
Added
Removed
  • aclocal/rtems-top.m4

    r9fff6bf r76d527e  
    88AC_DEFUN(RTEMS_TOP,
    99[dnl
     10AC_REQUIRE([RTEMS_VERSIONING])
    1011AC_CHECK_PROGS(MAKE, gmake make)
    1112AC_BEFORE([$0], [AC_CONFIG_AUX_DIR])dnl
     
    4445AC_SUBST(PROJECT_ROOT)
    4546
    46 dnl Determine RTEMS Version string from the VERSION file
    47 dnl Hopefully, Joel never changes its format ;-
    4847AC_MSG_CHECKING([for RTEMS Version])
    49 if test -r "${srcdir}/${RTEMS_TOPdir}/VERSION"; then
    50 RTEMS_VERSION=`grep 'RTEMS Version' ${srcdir}/${RTEMS_TOPdir}/VERSION | \
    51 sed -e 's%RTEMS[[       ]]*Version[[    ]]*\(.*\)[[     ]]*%\1%g'`
    52 else
    53 AC_MSG_ERROR(Unable to find ${RTEMS_TOPdir}/VERSION)
    54 fi
    55 if test -z "$RTEMS_VERSION"; then
    56 AC_MSG_ERROR(Unable to determine version)
    57 fi
    58 AC_MSG_RESULT($RTEMS_VERSION)
     48AS_IF([test -r "${srcdir}/${RTEMS_TOPdir}/aclocal/version.m4"],
     49[],
     50[AC_MSG_ERROR([Unable to find ${RTEMS_TOPdir}/aclocal/version.m4])])
     51AC_MSG_RESULT([_RTEMS_VERSION])
    5952])dnl
  • bootstrap

    r9fff6bf r76d527e  
    3434}
    3535
    36 if test ! -f $top_srcdir/VERSION; then
     36if test ! -f $top_srcdir/aclocal/version.m4; then
    3737  echo "${progname}:"
    38   echo "        Installation problem: Can't find file VERSION"
     38  echo "        Installation problem: Can't find file aclocal/version.m4"
    3939  exit 1;
    4040fi
  • configure.ac

    r9fff6bf r76d527e  
    99
    1010# Abort if trying to build inside of the source tree.
    11 if test -f VERSION; then
     11if test -f aclocal/version.m4; then
    1212  rm -f config.cache config.log confdefs.h
    1313  AC_MSG_ERROR([***]
Note: See TracChangeset for help on using the changeset viewer.