From 490a605f289142b83f0f9c238be031eadd9b6b47 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 28 Feb 2003 08:25:40 +0000 Subject: Merger from rtems-4-6-branch. --- cpukit/ChangeLog | 27 +++++++++++++++++++++++++++ cpukit/configure.ac | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index f3add6266f..951ec34e77 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,30 @@ +2003-02-28 Ralf Corsepius + + * configure.ac: Remove AC_SUBST(RTEMS_VERSION). + AC_DEFINE(RTEMS_VERSION) to propagate it through cpuopts.h. + +2003-02-26 Ralf Corsepius + + * configure.ac: AC_SUBST(RTEMS_VERSION,_RTEMS_VERSION). + +2003-02-18 Ralf Corsepius + + * aclocal/gcc-isystem.m4: New. + * aclocal/gcc-specs.m4: Remove. + * aclocal/prog-cc.m4: Remove RTEMS_GCC_SPECS. + Add RTEMS_GCC_ISYSTEM. + Reformat setting up RTEMS_CPPFLAGS. + +2003-02-18 Ralf Corsepius + + * automake/local.am: Introduce depend-gcc. + Remove ${ARCH}. + * automake/compile.am: Remove GCCSPECS, GCC_SPECS, CONFIG.CC, CC, + CPP. Add ${ARCH}. depend-gcc. + * aclocal/prog-cc.m4: Set up RTEMS_CPPFLAGS. + * aclocal/env-rtemscpu.m4: Remove GCC_SPECS. + * aclocal/env-rtemsbsp.m4: Remove GCC_SPECS. + 2003-02-12 Ralf Corsepius * aclocal/canonical-target-name.m4: Transform tic4x -> RTEMS_CPU=c4x. diff --git a/cpukit/configure.ac b/cpukit/configure.ac index bae53a0d00..5417c98ef0 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -47,7 +47,7 @@ AM_CONDITIONAL(INLINE,test x"$INLINEdir" = x"inline" ) AM_CONDITIONAL(MACROS,test x"$INLINEdir" = x"macros" ) AM_CONDITIONAL(HAS_MP,test x"$HAS_MP" = x"yes" ) -AC_SUBST(RTEMS_VERSION) +AC_DEFINE(RTEMS_VERSION,["rtems-][_RTEMS_VERSION]["],[RTEMS version string]) AM_CONDITIONAL(HAS_POSIX,test x"$HAS_POSIX_API" = x"yes") AM_CONDITIONAL(HAS_ITRON,test x"$HAS_ITRON_API" = x"yes") -- cgit v1.2.3