daily update

[deliverable/binutils-gdb.git] / bfd / aclocal.m4

diff --git a/bfd/aclocal.m4 b/bfd/aclocal.m4
index 70546524bf0834b3a14a49cc293acc5869e13111..3d0a0e70e9d9b2c953dcf10614f97f1e636b7138 100644 (file)
--- a/bfd/aclocal.m4
+++ b/bfd/aclocal.m4
@@ -340,18 +340,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
@@ -875,14 +863,16 @@ m4_include([../config/gettext-sister.m4])
 m4_include([../config/lead-dot.m4])
 m4_include([../config/nls.m4])
 m4_include([../config/override.m4])
+m4_include([../config/plugins.m4])
 m4_include([../config/po.m4])
 m4_include([../config/proginstall.m4])
 m4_include([../config/progtest.m4])
 m4_include([../config/stdint.m4])
+m4_include([../bfd/bfd.m4])
+m4_include([../bfd/warning.m4])
 m4_include([../libtool.m4])
 m4_include([../ltoptions.m4])
 m4_include([../ltsugar.m4])
 m4_include([../ltversion.m4])
-m4_include([bfd.m4])
-m4_include([warning.m4])
+m4_include([../lt~obsolete.m4])
 m4_include([acinclude.m4])