This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
aclocal doesn't always find the right libtool.m4
- To: binutils at sources dot redhat dot com
- Subject: aclocal doesn't always find the right libtool.m4
- From: Alexandre Oliva <aoliva at redhat dot com>
- Date: 26 Jul 2000 07:47:18 -0300
- Organization: GCC Team, Red Hat
Sometimes, it happens that aclocal installs in aclocal.m4 a version of
libtool.m4 that doesn't match ltconfig and ltmain.sh, resulting in
major lossage. This patch installs libtool.m4 and gettext.m4 in the
source tree, and arranges for aclocal and autoconf to use them instead
of whatever libtool and gettext the user happens to have installed, if
they have them at all (it no longer matters). This makes our build
system far more robust. Ok to install?
(Note that I don't include the actual libtool.m4 and gettext.m4 files
nor any potential libtool upgrades for the rest of the top-level; I'm
not even sure we want to upgrade it at this point.)
Index: ChangeLog
from Alexandre Oliva <aoliva@redhat.com>
* libtool.m4: Copied from libtool ???
* ltconfig, ltmain.sh: Updated from libtool ???
* gettext.m4: Copied from gettext ???
Index: bfd/ChangeLog
from Alexandre Oliva <aoliva@redhat.com>
* acinclude.m4: Include libtool macros from the source tree.
* aclocal.m4, configure: Rebuilt.
Index: binutils/ChangeLog
from Alexandre Oliva <aoliva@redhat.com>
* acinclude.m4: Include libtool and gettext macros from the
source tree.
* aclocal.m4, configure: Rebuilt.
Index: gas/ChangeLog
from Alexandre Oliva <aoliva@redhat.com>
* acinclude.m4: Include libtool and gettext macros from the
source tree.
* aclocal.m4, configure: Rebuilt.
Index: gprof/ChangeLog
from Alexandre Oliva <aoliva@redhat.com>
* acinclude.m4: Include libtool and gettext macros from the
source tree.
* aclocal.m4, configure: Rebuilt.
Index: ld/ChangeLog
from Alexandre Oliva <aoliva@redhat.com>
* acinclude.m4: Include libtool and gettext macros from the
source tree.
* aclocal.m4, configure: Rebuilt.
Index: opcodes/ChangeLog
from Alexandre Oliva <aoliva@redhat.com>
* acinclude.m4: Include libtool and gettext macros from the
source tree.
* aclocal.m4, configure: Rebuilt.
Index: bfd/acinclude.m4
===================================================================
RCS file: /cvs/src/src/bfd/acinclude.m4,v
retrieving revision 1.3
diff -u -r1.3 acinclude.m4
--- bfd/acinclude.m4 1999/08/08 16:01:13 1.3
+++ bfd/acinclude.m4 2000/07/26 10:37:19
@@ -104,4 +104,9 @@
AC_MSG_RESULT($bfd_cv_have_sys_procfs_type_member_$1_$2)
])
-
+sinclude(../libtool.m4)
+dnl The line below arranges for aclocal not to bring a definition of
+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)])
+AC_DEFUN([AM_DISABLE_SHARED],)])
Index: binutils/acinclude.m4
===================================================================
RCS file: /cvs/src/src/binutils/acinclude.m4,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 acinclude.m4
--- binutils/acinclude.m4 1999/05/03 07:29:09 1.1.1.1
+++ binutils/acinclude.m4 2000/07/26 10:37:19
@@ -1 +1,13 @@
sinclude(../bfd/acinclude.m4)
+
+dnl sinclude(../libtool.m4) dnl already included above
+dnl The line below arranges for aclocal not to bring a definition of
+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)])])
+
+sinclude(../gettext.m4)
+dnl The line below arranges for aclocal not to bring a definition of
+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([CY_WITH_NLS],[AC_SUBST(INTLLIBS)])])
Index: gas/acinclude.m4
===================================================================
RCS file: /cvs/src/src/gas/acinclude.m4,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 acinclude.m4
--- gas/acinclude.m4 1999/05/03 07:28:40 1.1.1.1
+++ gas/acinclude.m4 2000/07/26 10:37:19
@@ -54,3 +54,15 @@
done
$1=[$]_gas_uniq_newlist
])dnl
+
+sinclude(../libtool.m4)
+dnl The line below arranges for aclocal not to bring a definition of
+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)])])
+
+sinclude(../gettext.m4)
+dnl The line below arranges for aclocal not to bring a definition of
+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([CY_WITH_NLS],[AC_SUBST(INTLLIBS)])])
Index: gprof/acinclude.m4
===================================================================
RCS file: acinclude.m4
diff -N acinclude.m4
--- gprof/acinclude.m4 Tue May 5 13:32:27 1998
+++ gprof/acinclude.m4 Wed Jul 26 03:37:19 2000
@@ -0,0 +1,11 @@
+sinclude(../libtool.m4)
+dnl The line below arranges for aclocal not to bring a definition of
+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)])])
+
+sinclude(../gettext.m4)
+dnl The line below arranges for aclocal not to bring a definition of
+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([CY_WITH_NLS],[AC_SUBST(INTLLIBS)])])
Index: ld/acinclude.m4
===================================================================
RCS file: /cvs/src/src/ld/acinclude.m4,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 acinclude.m4
--- ld/acinclude.m4 1999/05/03 07:29:06 1.1.1.1
+++ ld/acinclude.m4 2000/07/26 10:37:19
@@ -1 +1,13 @@
sinclude(../bfd/acinclude.m4)
+
+dnl sinclude(../libtool.m4) dnl already included above
+dnl The line below arranges for aclocal not to bring a definition of
+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)])])
+
+sinclude(../gettext.m4)
+dnl The line below arranges for aclocal not to bring a definition of
+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([CY_WITH_NLS],[AC_SUBST(INTLLIBS)])])
Index: opcodes/acinclude.m4
===================================================================
RCS file: /cvs/src/src/opcodes/acinclude.m4,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 acinclude.m4
--- opcodes/acinclude.m4 1999/05/03 07:28:59 1.1.1.1
+++ opcodes/acinclude.m4 2000/07/26 10:37:19
@@ -1 +1,14 @@
sinclude(../bfd/acinclude.m4)
+
+dnl sinclude(../libtool.m4) dnl already included above
+dnl The line below arranges for aclocal not to bring a definition of
+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)])
+AC_DEFUN([AM_DISABLE_SHARED],[])])
+
+sinclude(../gettext.m4)
+dnl The line below arranges for aclocal not to bring a definition of
+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([CY_WITH_NLS],[AC_SUBST(INTLLIBS)])])
--
Alexandre Oliva Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/
Red Hat GCC Developer aoliva@{cygnus.com, redhat.com}
CS PhD student at IC-Unicamp oliva@{lsd.ic.unicamp.br, gnu.org}
Free Software Evangelist *Please* write to mailing lists, not to me