Merger from rtems-4-6-branch.

15 files changed, 42 insertions, 9 deletions

diff --git a/c/src/ada/ChangeLog b/c/src/ada/ChangeLog
index be33f23137..775f98a4c9 100644
--- a/c/src/ada/ChangeLog
+++ b/c/src/ada/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Remove AC_CONFIG_AUX_DIR.
+
 2003-02-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: AM_INIT_AUTOMAKE([1.7.2]).
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 951ec34e77..aa9fd6e603 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,16 @@
+2003-03-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Remove AC_CONFIG_AUX_DIR.
+	* aclocal/rtems-top.m4: Add AC_CONFIG_AUX_DIR.
+
+2003-03-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: AC_PREREQ(2.57).
+
+2003-03-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Remove sptables.h.in.
+
 2003-02-28	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Remove AC_SUBST(RTEMS_VERSION).
diff --git a/cpukit/ada/ChangeLog b/cpukit/ada/ChangeLog
index be33f23137..775f98a4c9 100644
--- a/cpukit/ada/ChangeLog
+++ b/cpukit/ada/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Remove AC_CONFIG_AUX_DIR.
+
 2003-02-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: AM_INIT_AUTOMAKE([1.7.2]).
diff --git a/cpukit/ada/configure.ac b/cpukit/ada/configure.ac
index 8cbc647726..9318ede351 100644
--- a/cpukit/ada/configure.ac
+++ b/cpukit/ada/configure.ac
@@ -6,7 +6,6 @@ AC_PREREQ(2.57)
 AC_INIT([rtems-cpukit],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([rtems.adb])
 RTEMS_TOP(../..)
-AC_CONFIG_AUX_DIR(../..)
 
 RTEMS_CANONICAL_TARGET_CPU
 RTEMS_CANONICAL_HOST
diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index 5417c98ef0..34da6bf121 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -2,11 +2,10 @@
 ## 
 ## $Id$
 
-AC_PREREQ(2.54)
+AC_PREREQ(2.57)
 AC_INIT([rtems-cpukit],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([score])
 RTEMS_TOP(..)
-AC_CONFIG_AUX_DIR(..)
 
 RTEMS_CANONICAL_TARGET_CPU
 
@@ -150,7 +149,6 @@ AC_CONFIG_FILES([Makefile
 include/Makefile
 rtems/Makefile
 sapi/Makefile
-sapi/include/rtems/sptables.h
 score/Makefile
 score/cpu/Makefile
 wrapup/Makefile
diff --git a/cpukit/itron/ChangeLog b/cpukit/itron/ChangeLog
index f512abcd3d..e2b02f7bc0 100644
--- a/cpukit/itron/ChangeLog
+++ b/cpukit/itron/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Remove AC_CONFIG_AUX_DIR.
+
 2003-02-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: AM_INIT_AUTOMAKE([1.7.2]).
diff --git a/cpukit/itron/configure.ac b/cpukit/itron/configure.ac
index c39820b3e8..1c400f4f66 100644
--- a/cpukit/itron/configure.ac
+++ b/cpukit/itron/configure.ac
@@ -6,7 +6,6 @@ AC_PREREQ(2.57)
 AC_INIT([rtems-cpukit-itron],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([include/itronsys])
 RTEMS_TOP(../..)
-AC_CONFIG_AUX_DIR(../..)
 
 RTEMS_CANONICAL_TARGET_CPU
 
diff --git a/cpukit/libblock/ChangeLog b/cpukit/libblock/ChangeLog
index 1a295a1da7..44a1d0c170 100644
--- a/cpukit/libblock/ChangeLog
+++ b/cpukit/libblock/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Remove AC_CONFIG_AUX_DIR.
+
 2003-02-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: AM_INIT_AUTOMAKE([1.7.2]).
diff --git a/cpukit/libblock/configure.ac b/cpukit/libblock/configure.ac
index 639cad269d..e9ed18bedc 100644
--- a/cpukit/libblock/configure.ac
+++ b/cpukit/libblock/configure.ac
@@ -6,7 +6,6 @@ AC_PREREQ(2.57)
 AC_INIT([rtems-cpukit-libblock],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([src/bdbuf.c])
 RTEMS_TOP(../..)
-AC_CONFIG_AUX_DIR(../..)
 
 RTEMS_CANONICAL_TARGET_CPU
 RTEMS_CANONICAL_HOST
diff --git a/cpukit/libcsupport/ChangeLog b/cpukit/libcsupport/ChangeLog
index 56d65631db..1a53f96b91 100644
--- a/cpukit/libcsupport/ChangeLog
+++ b/cpukit/libcsupport/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Remove AC_CONFIG_AUX_DIR.
+
 2003-02-20	Wolfram Wadepohl <W.Wadepohl@indumat.de>
 
 	PR 357/rtems_misc
diff --git a/cpukit/libcsupport/configure.ac b/cpukit/libcsupport/configure.ac
index 1218a3a0d1..d54cc2a39c 100644
--- a/cpukit/libcsupport/configure.ac
+++ b/cpukit/libcsupport/configure.ac
@@ -6,7 +6,6 @@ AC_PREREQ(2.57)
 AC_INIT([rtems-cpukit-lib],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([src])
 RTEMS_TOP(../..)
-AC_CONFIG_AUX_DIR(../..)
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2])
diff --git a/cpukit/libfs/ChangeLog b/cpukit/libfs/ChangeLog
index 689ff7798a..075e1f175c 100644
--- a/cpukit/libfs/ChangeLog
+++ b/cpukit/libfs/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Remove AC_CONFIG_AUX_DIR.
+
 2003-02-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: AM_INIT_AUTOMAKE([1.7.2]).
diff --git a/cpukit/libfs/configure.ac b/cpukit/libfs/configure.ac
index c9e52c6169..c7c08cd54b 100644
--- a/cpukit/libfs/configure.ac
+++ b/cpukit/libfs/configure.ac
@@ -7,7 +7,6 @@ AC_INIT([rtems-cpukit-libfs],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([src/imfs/imfs.h])
 
 RTEMS_TOP(../..)
-AC_CONFIG_AUX_DIR(../..)
 
 RTEMS_CANONICAL_TARGET_CPU
 
diff --git a/cpukit/libmisc/ChangeLog b/cpukit/libmisc/ChangeLog
index 3b3a726f2d..09fd81794a 100644
--- a/cpukit/libmisc/ChangeLog
+++ b/cpukit/libmisc/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Remove AC_CONFIG_AUX_DIR.
+
 2003-02-18	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	capture/capture-cli.c: Add proper definition to avoid compiler
diff --git a/cpukit/libmisc/configure.ac b/cpukit/libmisc/configure.ac
index e188971ce7..ad14dc9645 100644
--- a/cpukit/libmisc/configure.ac
+++ b/cpukit/libmisc/configure.ac
@@ -6,7 +6,6 @@ AC_PREREQ(2.57)
 AC_INIT([rtems-cpukit-libmisc],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([dumpbuf])
 RTEMS_TOP(../..)
-AC_CONFIG_AUX_DIR(../..)
 
 RTEMS_CANONICAL_TARGET_CPU