* acinclude.m4: Include libtool and gettext macros from the

[deliverable/binutils-gdb.git] / gas / acinclude.m4

diff --git a/gas/acinclude.m4 b/gas/acinclude.m4
index 31a2c1632f1782cef0b31da6df4cc80cec31e6da..f16eefc10fc1f5e036af8dd61f5a10f48e8e164b 100644 (file)
--- a/gas/acinclude.m4
+++ b/gas/acinclude.m4
@@ -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)
+])