This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
Re: aclocal doesn't always find the right libtool.m4
- To: binutils at sources dot redhat dot com
- Subject: Re: aclocal doesn't always find the right libtool.m4
- From: Alexandre Oliva <aoliva at redhat dot com>
- Date: 01 Aug 2000 07:18:55 -0300
- Organization: GCC Team, Red Hat
- References: <orhf9dkw21.fsf@guarana.lsd.ic.unicamp.br>
On Jul 26, 2000, Alexandre Oliva <aoliva@redhat.com> wrote:
> 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?
Here's a revised version, with some fixes to ensure it works even if
libtool.m4 is in aclocal's path. Ok to install?
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 and gettext macros from the
top level.
* aclocal.m4, configure: Rebuilt.
Index: binutils/ChangeLog
from Alexandre Oliva <aoliva@redhat.com>
* acinclude.m4: Include libtool and gettext macros from the
top level.
* aclocal.m4, configure: Rebuilt.
Index: gas/ChangeLog
from Alexandre Oliva <aoliva@redhat.com>
* acinclude.m4: Include libtool and gettext macros from the
top level.
* aclocal.m4, configure: Rebuilt.
Index: gprof/ChangeLog
from Alexandre Oliva <aoliva@redhat.com>
* acinclude.m4: Include libtool and gettext macros from the
top level.
* aclocal.m4, configure: Rebuilt.
Index: ld/ChangeLog
from Alexandre Oliva <aoliva@redhat.com>
* acinclude.m4: Include libtool and gettext macros from the
top level.
* aclocal.m4, configure: Rebuilt.
Index: opcodes/ChangeLog
from Alexandre Oliva <aoliva@redhat.com>
* acinclude.m4: Include libtool and gettext macros from the
top level.
* 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/08/01 08:21:25
@@ -104,4 +104,18 @@
AC_MSG_RESULT($bfd_cv_have_sys_procfs_type_member_$1_$2)
])
+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([AM_DISABLE_SHARED],)
+AC_SUBST(LIBTOOL)
+])
+sinclude(../gettext.m4)
+ifelse(yes,no,[
+AC_DEFUN([CY_WITH_NLS],)
+AC_SUBST(INTLLIBS)
+])
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/08/01 08:21:25
@@ -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)
+])
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/08/01 08:21:25
@@ -54,3 +54,19 @@
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)
+])
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 Tue Aug 1 01:21:25 2000
@@ -0,0 +1,14 @@
+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_SUBST(LIBTOOL)
+])
+
+sinclude(../gettext.m4)
+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/08/01 08:21:25
@@ -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)
+])
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/08/01 08:21:26
@@ -1 +1,17 @@
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)
+])
--
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