From ff1a5ef5e80d655134f219af0fb8c0dcb0f48999 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sun, 24 Aug 2008 03:13:05 +0000 Subject: [PATCH] Update a number of obsolete autoconf macros. --- bfd/ChangeLog | 5 +++++ bfd/aclocal.m4 | 12 ------------ bfd/configure.in | 8 ++++---- opcodes/ChangeLog | 5 +++++ opcodes/aclocal.m4 | 12 ------------ opcodes/configure.in | 8 ++++---- 6 files changed, 18 insertions(+), 32 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 5319857f32..bf9d580228 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2008-08-24 Alan Modra + + * configure.in: Update a number of obsolete autoconf macros. + * aclocal.m4: Regenerate. + 2008-08-23 Andreas Schwab * opncls.c (find_separate_debug_file): Use the canonical diff --git a/bfd/aclocal.m4 b/bfd/aclocal.m4 index 70546524bf..fa32dcb9ab 100644 --- 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 diff --git a/bfd/configure.in b/bfd/configure.in index cd31706767..d098988d16 100644 --- a/bfd/configure.in +++ b/bfd/configure.in @@ -10,20 +10,20 @@ AC_ISC_POSIX AM_INIT_AUTOMAKE(bfd, 2.18.50) -dnl These must be called before AM_PROG_LIBTOOL, because it may want +dnl These must be called before LT_INIT, because it may want dnl to call AC_CHECK_PROG. AC_CHECK_TOOL(AR, ar) AC_CHECK_TOOL(RANLIB, ranlib, :) dnl Default to a non shared library. This may be overridden by the dnl configure option --enable-shared. -AM_DISABLE_SHARED +AC_DISABLE_SHARED AC_PROG_CC AC_GNU_SOURCE AC_USE_SYSTEM_EXTENSIONS -AC_PROG_LIBTOOL +LT_INIT AC_ARG_ENABLE(64-bit-bfd, [ --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)], @@ -102,7 +102,7 @@ ACX_BUGURL([http://www.sourceware.org/bugzilla/]) AM_BINUTILS_WARNINGS -AM_CONFIG_HEADER(config.h:config.in) +AC_CONFIG_HEADERS(config.h:config.in) if test -z "$target" ; then AC_MSG_ERROR(Unrecognized target system type; please check config.sub.) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 3230d52a74..2e0d49e89b 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2008-08-24 Alan Modra + + * configure.in: Update a number of obsolete autoconf macros. + * aclocal.m4: Regenerate. + 2008-08-20 H.J. Lu AVX Programming Reference (August, 2008) diff --git a/opcodes/aclocal.m4 b/opcodes/aclocal.m4 index 6fac0c74e2..50e7e23231 100644 --- a/opcodes/aclocal.m4 +++ b/opcodes/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 diff --git a/opcodes/configure.in b/opcodes/configure.in index ce66f7f59e..2800eed750 100644 --- a/opcodes/configure.in +++ b/opcodes/configure.in @@ -21,16 +21,16 @@ AC_PROG_CC AC_GNU_SOURCE AC_USE_SYSTEM_EXTENSIONS -dnl These must be called before AM_PROG_LIBTOOL, because it may want +dnl These must be called before LT_INIT, because it may want dnl to call AC_CHECK_PROG. AC_CHECK_TOOL(AR, ar) AC_CHECK_TOOL(RANLIB, ranlib, :) dnl Default to a non shared library. This may be overridden by the dnl configure option --enable-shared. -AM_DISABLE_SHARED +AC_DISABLE_SHARED -AM_PROG_LIBTOOL +LT_INIT AC_ARG_ENABLE(targets, [ --enable-targets alternative target configurations], @@ -50,7 +50,7 @@ esac])dnl AM_BINUTILS_WARNINGS -AM_CONFIG_HEADER(config.h:config.in) +AC_CONFIG_HEADERS(config.h:config.in) if test -z "$target" ; then AC_MSG_ERROR(Unrecognized target system type; please check config.sub.) -- 2.11.0