From 5ba8f3067bd0455d3afcf3916221a5fd68bc3ac0 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 11 Mar 2003 12:12:22 +0000 Subject: Merger from rtems-4-6-branch. --- tools/build/ChangeLog | 13 +++++++++++++ tools/build/configure.ac | 4 ++-- tools/cpu/ChangeLog | 4 ++++ tools/cpu/configure.ac | 1 - tools/cpu/generic/ChangeLog | 4 ++++ tools/cpu/generic/configure.ac | 1 - tools/cpu/hppa1.1/ChangeLog | 4 ++++ tools/cpu/hppa1.1/configure.ac | 1 - tools/cpu/sh/ChangeLog | 4 ++++ tools/cpu/sh/configure.ac | 1 - tools/update/ChangeLog | 4 ++++ tools/update/configure.ac | 1 - 12 files changed, 35 insertions(+), 7 deletions(-) diff --git a/tools/build/ChangeLog b/tools/build/ChangeLog index 75a6efac11..5c536ae85f 100644 --- a/tools/build/ChangeLog +++ b/tools/build/ChangeLog @@ -1,3 +1,16 @@ +2003-03-07 Ralf Corsepius + + * configure.ac: Add AC_CHECK_HEADERS(getopt.h) to work around a bug + in autoconf-2.57. + +2003-03-06 Ralf Corsepius + + * configure.ac: Remove AC_CONFIG_AUX_DIR. + +2003-03-02 Ralf Corsepius + + * configure.ac: Add AC_CHECK_HEADERS. + 2003-02-11 Ralf Corsepius * configure.ac: AM_INIT_AUTOMAKE([1.7.2]). diff --git a/tools/build/configure.ac b/tools/build/configure.ac index a677c998b8..8f3e0345b4 100644 --- a/tools/build/configure.ac +++ b/tools/build/configure.ac @@ -6,7 +6,6 @@ AC_PREREQ(2.57) AC_INIT([rtems-tools-build],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([install-if-change.in]) RTEMS_TOP(../..) -AC_CONFIG_AUX_DIR(../..) AC_CANONICAL_HOST @@ -14,11 +13,12 @@ AM_INIT_AUTOMAKE([no-define foreign 1.7.2]) AM_MAINTAINER_MODE AC_PROG_CC +AC_CHECK_HEADERS([getopt.h]) AC_CHECK_FUNCS(strerror strtol) RTEMS_PATH_KSH -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS([config.h]) # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile diff --git a/tools/cpu/ChangeLog b/tools/cpu/ChangeLog index 2de55fa3d1..8a55289cf2 100644 --- a/tools/cpu/ChangeLog +++ b/tools/cpu/ChangeLog @@ -1,3 +1,7 @@ +2003-03-06 Ralf Corsepius + + * configure.ac: Remove AC_CONFIG_AUX_DIR. + 2003-02-11 Ralf Corsepius * configure.ac: AM_INIT_AUTOMAKE([1.7.2]). diff --git a/tools/cpu/configure.ac b/tools/cpu/configure.ac index d5e6830baa..69deb552fc 100644 --- a/tools/cpu/configure.ac +++ b/tools/cpu/configure.ac @@ -6,7 +6,6 @@ AC_PREREQ(2.57) AC_INIT([rtems-tools-cpu],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([generic]) RTEMS_TOP(../..) -AC_CONFIG_AUX_DIR(../..) RTEMS_CANONICAL_TARGET_CPU diff --git a/tools/cpu/generic/ChangeLog b/tools/cpu/generic/ChangeLog index 61a415c1de..35ebb2c3a6 100644 --- a/tools/cpu/generic/ChangeLog +++ b/tools/cpu/generic/ChangeLog @@ -1,3 +1,7 @@ +2003-03-06 Ralf Corsepius + + * configure.ac: Remove AC_CONFIG_AUX_DIR. + 2003-02-11 Ralf Corsepius * configure.ac: AM_INIT_AUTOMAKE([1.7.2]). diff --git a/tools/cpu/generic/configure.ac b/tools/cpu/generic/configure.ac index 917eb461da..ea7f4844f2 100644 --- a/tools/cpu/generic/configure.ac +++ b/tools/cpu/generic/configure.ac @@ -6,7 +6,6 @@ AC_PREREQ(2.57) AC_INIT([rtems-tools-cpu-generic],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([size_rtems.in]) RTEMS_TOP(../../..) -AC_CONFIG_AUX_DIR(../../..) RTEMS_CANONICAL_TARGET_CPU diff --git a/tools/cpu/hppa1.1/ChangeLog b/tools/cpu/hppa1.1/ChangeLog index f4aff76bc3..65425223d9 100644 --- a/tools/cpu/hppa1.1/ChangeLog +++ b/tools/cpu/hppa1.1/ChangeLog @@ -1,3 +1,7 @@ +2003-03-06 Ralf Corsepius + + * configure.ac: Remove AC_CONFIG_AUX_DIR. + 2003-02-11 Ralf Corsepius * configure.ac: AM_INIT_AUTOMAKE([1.7.2]). diff --git a/tools/cpu/hppa1.1/configure.ac b/tools/cpu/hppa1.1/configure.ac index 47cc15804d..f079b29569 100644 --- a/tools/cpu/hppa1.1/configure.ac +++ b/tools/cpu/hppa1.1/configure.ac @@ -6,7 +6,6 @@ AC_PREREQ(2.57) AC_INIT([rtems-tools-cpu-hppa1.1],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([genoffsets.c]) RTEMS_TOP(../../..) -AC_CONFIG_AUX_DIR(../../..) RTEMS_CANONICAL_TARGET_CPU diff --git a/tools/cpu/sh/ChangeLog b/tools/cpu/sh/ChangeLog index 37d8c9be8f..0d02d77644 100644 --- a/tools/cpu/sh/ChangeLog +++ b/tools/cpu/sh/ChangeLog @@ -1,3 +1,7 @@ +2003-03-06 Ralf Corsepius + + * configure.ac: Remove AC_CONFIG_AUX_DIR. + 2003-02-11 Ralf Corsepius * configure.ac: AM_INIT_AUTOMAKE([1.7.2]). diff --git a/tools/cpu/sh/configure.ac b/tools/cpu/sh/configure.ac index f6c90f0cbc..8b1e1f170e 100644 --- a/tools/cpu/sh/configure.ac +++ b/tools/cpu/sh/configure.ac @@ -6,7 +6,6 @@ AC_PREREQ(2.57) AC_INIT([rtems-tools-cpu-sh],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([shgen.c]) RTEMS_TOP(../../..) -AC_CONFIG_AUX_DIR(../../..) RTEMS_CANONICAL_TARGET_CPU diff --git a/tools/update/ChangeLog b/tools/update/ChangeLog index eddeb2df49..54e8bd9862 100644 --- a/tools/update/ChangeLog +++ b/tools/update/ChangeLog @@ -1,3 +1,7 @@ +2003-03-06 Ralf Corsepius + + * configure.ac: Remove AC_CONFIG_AUX_DIR. + 2003-02-11 Ralf Corsepius * configure.ac: AM_INIT_AUTOMAKE([1.7.2]). diff --git a/tools/update/configure.ac b/tools/update/configure.ac index e42af640c0..17812eb85b 100644 --- a/tools/update/configure.ac +++ b/tools/update/configure.ac @@ -6,7 +6,6 @@ AC_PREREQ(2.57) AC_INIT([rtems-tools-update],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([rtems-polish.sh]) RTEMS_TOP(../..) -AC_CONFIG_AUX_DIR(../..) AC_CANONICAL_HOST -- cgit v1.2.3