From a8340dc12c2a7dc55abfee06bfa56d44994f0bf1 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Thu, 19 Oct 2006 14:08:08 +0000
Subject: [PATCH] Adaptations to automake-1.10.

---
 c/src/aclocal/prog-ccas.m4 | 4 ++--
 c/src/aclocal/prog-cxx.m4  | 2 +-
 c/src/aclocal/rtems-top.m4 | 2 --
 c/src/aclocal/version.m4   | 4 +++-
 c/src/automake/compile.am  | 8 ++++----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/c/src/aclocal/prog-ccas.m4 b/c/src/aclocal/prog-ccas.m4
index c5b64f561f..2efa2d89f8 100644
--- a/c/src/aclocal/prog-ccas.m4
+++ b/c/src/aclocal/prog-ccas.m4
@@ -3,6 +3,6 @@
 AC_DEFUN([RTEMS_PROG_CCAS],
 [
 AC_REQUIRE([RTEMS_PROG_CC])
-AC_SUBST(CCAS,["$CC"])
-AC_SUBST(CCASFLAGS,["-DASM \$(CFLAGS) \$(INCLUDES)"])
+AM_PROG_AS
+AC_SUBST(RTEMS_CCASFLAGS,["-DASM"])
 ])
diff --git a/c/src/aclocal/prog-cxx.m4 b/c/src/aclocal/prog-cxx.m4
index f1c6694da8..20175ee27c 100644
--- a/c/src/aclocal/prog-cxx.m4
+++ b/c/src/aclocal/prog-cxx.m4
@@ -18,6 +18,7 @@ dnl NOTE: This might be too restrictive
 test -z "$CXX" \
   && AC_MSG_ERROR([no acceptable c++ found in \$PATH])
 AC_PROG_CXX
+AC_PROG_CXXCPP
 
   if test "$ac_cv_prog_cc_cross" != "$ac_cv_prog_cxx_cross"; then
     AC_MSG_ERROR([***]
@@ -26,7 +27,6 @@ AC_PROG_CXX
      [must both either be cross compilers or native compilers]
      [Hint: If building a posix bsp: LD_LIBRARY_PATH?] )
   fi
-
 else
 ## Work-around to a bug in automake
 AM_CONDITIONAL([am__fastdepCXX],[false])
diff --git a/c/src/aclocal/rtems-top.m4 b/c/src/aclocal/rtems-top.m4
index d7329d7d95..9149971cb8 100644
--- a/c/src/aclocal/rtems-top.m4
+++ b/c/src/aclocal/rtems-top.m4
@@ -1,7 +1,5 @@
 dnl $Id$
 
-m4_define([RTEMS_API],[4.7])
-
 dnl
 dnl RTEMS_TOP($1)
 dnl 
diff --git a/c/src/aclocal/version.m4 b/c/src/aclocal/version.m4
index 0b6bfb1823..615263bb20 100644
--- a/c/src/aclocal/version.m4
+++ b/c/src/aclocal/version.m4
@@ -1,2 +1,4 @@
 AC_DEFUN([RTEMS_VERSIONING],
-m4_define([_RTEMS_VERSION],[4.6.99.3]))
+m4_define([_RTEMS_VERSION],[4.6.99.4]))
+
+m4_define([RTEMS_API],[4.7])
diff --git a/c/src/automake/compile.am b/c/src/automake/compile.am
index 8ac24ffc70..6ba8636096 100644
--- a/c/src/automake/compile.am
+++ b/c/src/automake/compile.am
@@ -10,7 +10,7 @@ CPP = @CPP@ $(GCCSPECS)
 CCAS = @CCAS@ $(GCCSPECS)
 
 ##
-AM_CPPFLAGS = $(RTEMS_CPPFLAGS)
-AM_CFLAGS = $(RTEMS_CFLAGS)
-AM_CXXFLAGS = $(RTEMS_CFLAGS)
-AM_CCASFLAGS = $(RTEMS_CPPFLAGS) $(RTEMS_CCASFLAGS)
+AM_CPPFLAGS = @RTEMS_CPPFLAGS@
+AM_CFLAGS = @RTEMS_CFLAGS@
+AM_CXXFLAGS = @RTEMS_CFLAGS@
+AM_CCASFLAGS = @RTEMS_CCASFLAGS@