X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Facinclude.m4;h=403aa0e2860b871a5821127a0722bcb535487b87;hb=9ab433aae8243622dbc5756a7f7c82cf0fd5cb1c;hp=71b09b9f6ac7f706c16b6b420f6c4354c284bbde;hpb=d0352a18a504a4e7b761f6b3264cf11347d8d056;p=deliverable%2Fbinutils-gdb.git

diff --git a/ld/acinclude.m4 b/ld/acinclude.m4
index 71b09b9f6a..403aa0e286 100644
--- a/ld/acinclude.m4
+++ b/ld/acinclude.m4
@@ -1 +1,16 @@
 sinclude(../bfd/acinclude.m4)
+
+dnl sinclude(../libtool.m4) already included in bfd/acinclude.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_SUBST(LIBTOOL)
+])
+
+dnl sinclude(../gettext.m4) already included in bfd/acinclude.m4
+ifelse(yes,no,[
+AC_DEFUN([CY_WITH_NLS],)
+AC_SUBST(INTLLIBS)
+])