summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-02-28 08:25:40 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-02-28 08:25:40 +0000
commit490a605f289142b83f0f9c238be031eadd9b6b47 (patch)
tree779d44bbbaa09ff55378980e29a0c780a1b16cbc
parent83eda9b994bfc70c8a1b1cf835d3729db1150335 (diff)
downloadrtems-490a605f289142b83f0f9c238be031eadd9b6b47.tar.bz2
Merger from rtems-4-6-branch.
-rw-r--r--cpukit/ChangeLog27
-rw-r--r--cpukit/configure.ac2
2 files changed, 28 insertions, 1 deletions
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 <corsepiu@faw.uni-ulm.de>
+
+ * configure.ac: Remove AC_SUBST(RTEMS_VERSION).
+ AC_DEFINE(RTEMS_VERSION) to propagate it through cpuopts.h.
+
+2003-02-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.ac: AC_SUBST(RTEMS_VERSION,_RTEMS_VERSION).
+
+2003-02-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * 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 <corsepiu@faw.uni-ulm.de>
+
+ * 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 <corsepiu@faw.uni-ulm.de>
* 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")