Change 32-bit-branch expansion for --pic.

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

diff --git a/opcodes/acinclude.m4 b/opcodes/acinclude.m4
index 71b09b9f6ac7f706c16b6b420f6c4354c284bbde..3a47b1b67c48cf26a276f5636e95d98b6a35d6e1 100644 (file)
--- a/opcodes/acinclude.m4
+++ b/opcodes/acinclude.m4
@@ -1 +1,24 @@
 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_DEFUN([AM_DISABLE_SHARED],)
+AC_SUBST(LIBTOOL)
+])
+
+dnl sinclude(../gettext.m4) already included in bfd/acinclude.m4
+ifelse(yes,no,[
+AC_DEFUN([CY_WITH_NLS],)
+AC_SUBST(INTLLIBS)
+])
+
+dnl AM_INSTALL_LIBBFD already included in bfd/acinclude.m4
+ifelse(yes,no,[
+AC_DEFUN([AM_INSTALL_LIBBFD],)
+AC_SUBST(bfdlibdir)
+AC_SUBST(bfdincludedir)
+])