--- a/host/infra/aclocal.m4
+++ b/host/infra/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4
+dnl aclocal.m4 generated automatically by aclocal 1.4-p5
 
-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -19,10 +19,10 @@ dnl
 dnl     Host side implementation of the eCos infrastructure.
 dnl
 dnl ====================================================================
-dnl####COPYRIGHTBEGIN####
-dnl                                                                         
+dnl ####ECOSHOSTGPLCOPYRIGHTBEGIN####
 dnl ----------------------------------------------------------------------------
-dnl Copyright (C) 1998, 1999, 2000 Red Hat, Inc.
+dnl Copyright (C) 2002 Bart Veer
+dnl Copyright (C) 1998, 1999, 2000, 2001 Red Hat, Inc.
 dnl
 dnl This file is part of the eCos host tools.
 dnl
@@ -41,8 +41,7 @@ dnl this program; if not, write to the F
 dnl 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 dnl
 dnl ----------------------------------------------------------------------------
-dnl                                                                          
-dnl####COPYRIGHTEND####
+dnl ####ECOSHOSTGPLCOPYRIGHTEND####
 dnl ====================================================================
 dnl#####DESCRIPTIONBEGIN####
 dnl
@@ -57,99 +56,11 @@ dnl ====================================
 dnl Access shared macros.
 dnl AM_CONDITIONAL needs to be mentioned here or else aclocal does not
 dnl incorporate the macro into aclocal.m4
-sinclude(../acinclude.m4)
-
-
-dnl ====================================================================
-dnl Look for a 64 bit data type. It is necessary to check both C and C++
-dnl compilers.
-dnl
-dnl A better implementation would check whether or not AC_PROG_CC and
-dnl AC_PROG_CXX have been invoked and only test the appropriate
-dnl compiler.
-dnl
-dnl When cross-compiling, default to long long on the assumption that
-dnl gcc/g++ must be used and long long is likely to be the 64 bit data
-dnl type. This is not guaranteed, but sufficiently likely to meet
-dnl the requirements for the time being. The CHECK_SIZEOF() macro
-dnl might be another way to get the desired information.
-
-AC_DEFUN(CYG_AC_TYPE_64bit, [
-    AC_REQUIRE([AC_PROG_CC])
-    AC_REQUIRE([AC_PROG_CXX])
-
-    AC_CACHE_CHECK("for a 64 bit data type",cyg_ac_cv_type_64bit,[
-        for type in "long" "long long" "__int64"; do
-            AC_LANG_SAVE
-	    AC_LANG_C
-            AC_TRY_RUN([
-                main() {
-                    return 8 != sizeof($type);
-                }
-	    ],ctype_64bit=$type,ctype_64bit="unknown",ctype_64bit="long long")
-	    AC_LANG_CPLUSPLUS
-            AC_TRY_RUN([
-                int main(int argc, char ** argv) {
-                    return 8 != sizeof($type);
-                }
-	    ],cxxtype_64bit=$type,cxxtype_64bit="unknown",cxxtype_64bit="long long")
-	    AC_LANG_RESTORE
-            if test "${ctype_64bit}" = "${type}" -a "${cxxtype_64bit}" = "${type}"; then
-                cyg_ac_cv_type_64bit="${type}"
-                break
-            fi
-        done
-    ])
-    if test "${cyg_ac_cv_type_64bit}" = ""; then
-        AC_MSG_ERROR(Unable to figure out how to do 64 bit arithmetic)
-    else
-        if test "${cyg_ac_cv_type_64bit}" != "long long"; then
-            AC_DEFINE_UNQUOTED(cyg_halint64,${cyg_ac_cv_type_64bit})
-            AC_DEFINE_UNQUOTED(cyg_halcount64,${cyg_ac_cv_type_64bit})
-        fi
-    fi
-])
-
-dnl ====================================================================
-dnl Check that both the C and C++ compilers support __PRETTY_FUNCTION__
-
-AC_DEFUN(CYG_AC_C_PRETTY_FUNCTION,[
-    AC_REQUIRE([AC_PROG_CC])
-    AC_REQUIRE([AC_PROG_CXX])
-
-    AC_CACHE_CHECK("for __PRETTY_FUNCTION__ support",cyg_ac_cv_c_pretty_function,[
-        AC_LANG_SAVE
-        AC_LANG_C
-        AC_TRY_LINK(
-            [#include <stdio.h>],
-            [puts(__PRETTY_FUNCTION__);],
-            c_ok="yes",
-            c_ok="no"
-        )
-        AC_LANG_CPLUSPLUS
-        AC_TRY_LINK(
-            [#include <cstdio>],
-            [puts(__PRETTY_FUNCTION__);],
-            cxx_ok="yes",
-            cxx_ok="no"
-        )
-        AC_LANG_RESTORE
-        if test "${c_ok}" = "yes" -a "${cxx_ok}" = "yes"; then
-            cyg_ac_cv_c_pretty_function="yes"
-        fi
-    ])
-    if test "${cyg_ac_cv_c_pretty_function}" = "yes"; then
-        AC_DEFINE(CYGDBG_INFRA_DEBUG_FUNCTION_PSEUDOMACRO)
-    fi
-])
-
-
-
-
+sinclude(../../acsupport/acinclude.m4)
 
 # Define a conditional.
 
-AC_DEFUN(AM_CONDITIONAL,
+AC_DEFUN([AM_CONDITIONAL],
 [AC_SUBST($1_TRUE)
 AC_SUBST($1_FALSE)
 if $2; then
@@ -169,7 +80,7 @@ fi])
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN(AM_INIT_AUTOMAKE,
+AC_DEFUN([AM_INIT_AUTOMAKE],
 [AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
@@ -197,7 +108,7 @@ AC_REQUIRE([AC_PROG_MAKE_SET])])
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN(AM_SANITY_CHECK,
+AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -238,7 +149,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN(AM_MISSING_PROG,
+AC_DEFUN([AM_MISSING_PROG],
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -257,7 +168,7 @@ AC_SUBST($1)])
 
 # serial 1
 
-AC_DEFUN(AM_MAINTAINER_MODE,
+AC_DEFUN([AM_MAINTAINER_MODE],
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -274,7 +185,7 @@ AC_DEFUN(AM_MAINTAINER_MODE,
 
 # Like AC_CONFIG_HEADER, but automatically create stamp file.
 
-AC_DEFUN(AM_CONFIG_HEADER,
+AC_DEFUN([AM_CONFIG_HEADER],
 [AC_PREREQ([2.12])
 AC_CONFIG_HEADER([$1])
 dnl When config.status generates a header, we must update the stamp-h file.