* config/tc-mips.c (RELAX_ENCODE): Remove WARN argument.

[binutils.git] / gas / acinclude.m4

diff --git a/gas/acinclude.m4 b/gas/acinclude.m4
index 31a2c1632f1782cef0b31da6df4cc80cec31e6da..4a3ccf358bdd6ffff0e72db95983f1bfa9bcfe32 100644 (file)
--- a/gas/acinclude.m4
+++ b/gas/acinclude.m4
@@ -1,5 +1,5 @@
 dnl GAS_CHECK_DECL_NEEDED(name, typedefname, typedef, headers)
-AC_DEFUN(GAS_CHECK_DECL_NEEDED,[
+AC_DEFUN([GAS_CHECK_DECL_NEEDED],[
 AC_MSG_CHECKING(whether declaration is required for $1)
 AC_CACHE_VAL(gas_cv_decl_needed_$1,
 AC_TRY_LINK([$4],
@@ -19,7 +19,7 @@ dnl Some non-ANSI preprocessors botch requoting inside strings.  That's bad
 dnl enough, but on some of those systems, the assert macro relies on requoting
 dnl working properly!
 dnl GAS_WORKING_ASSERT
-AC_DEFUN(GAS_WORKING_ASSERT,
+AC_DEFUN([GAS_WORKING_ASSERT],
 [AC_MSG_CHECKING([for working assert macro])
 AC_CACHE_VAL(gas_cv_assert_ok,
 AC_TRY_LINK([#include <assert.h>
@@ -39,7 +39,7 @@ dnl
 dnl Since many Bourne shell implementations lack subroutines, use this
 dnl hack to simplify the code in configure.in.
 dnl GAS_UNIQ(listvar)
-AC_DEFUN(GAS_UNIQ,
+AC_DEFUN([GAS_UNIQ],
 [_gas_uniq_list="[$]$1"
 _gas_uniq_newlist=""
 dnl Protect against empty input list.
@@ -54,3 +54,19 @@ for _gas_uniq_i in _gas_uniq_dummy [$]_gas_uniq_list ; do
 done
 $1=[$]_gas_uniq_newlist
 ])dnl
+
+sinclude(../libtool.m4)
+dnl The lines below arrange for aclocal not to bring libtool.m4
+dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake
+dnl to add a definition of LIBTOOL to Makefile.in.
+ifelse(yes,no,[
+AC_DEFUN([AM_PROG_LIBTOOL],)
+AC_DEFUN([AC_CHECK_LIBM],)
+AC_SUBST(LIBTOOL)
+])
+
+sinclude(../gettext.m4)
+ifelse(yes,no,[
+AC_DEFUN([CY_WITH_NLS],)
+AC_SUBST(INTLLIBS)
+])