This is the mail archive of the
java-patches@sources.redhat.com
mailing list for the Java project.
Adding libtool.m4 to the source tree and using it
- To: java-patches at sources dot redhat dot com
- Subject: Adding libtool.m4 to the source tree and using it
- From: Alexandre Oliva <aoliva at redhat dot com>
- Date: 26 Jul 2000 08:36:34 -0300
- Organization: GCC Team, Red Hat
Before moving to the multi-language libtool, as I had suggested
before, let's first make sure all sub-packages are using the same,
coherent version of libtool, regardless of which version of libtool
whoever happens to run aclocal has installed.
I haven't included generated files, nor any potential minor libtool
updates in this patch (or libtool.m4 itself). I've also omitted the
patches for removing libffi aux files (so that the ones from the top
level are used) and the one that replaces libjava/libltdl/acinclude.m4
with a file almost identical to the new libffi/acinclude.m4 (except
that the path to libtool.m4 is `../../').
Ok to install? Would you prefer me to not update libtool to, say,
1.3.5 or 1.3.5a-CVS along with this patch?
Index: ChangeLog
from Alexandre Oliva <aoliva@redhat.com>
* libtool.m4: Copied from libtool ???
* ltconfig, ltmain.sh: Updated from libtool ???
Index: boehm-gc/ChangeLog
from Alexandre Oliva <aoliva@redhat.com>
* acinclude.m4: Include libtool macros from the source tree.
* aclocal.m4, configure: Rebuilt.
Index: libffi/ChangeLog
from Alexandre Oliva <aoliva@redhat.com>
* acinclude.m4: Include libtool macros from the source tree.
* aclocal.m4, configure: Rebuilt.
* config.guess, config.sub, install-sh: Removed.
* ltconfig, ltmain.sh, missing, mkinstalldirs: Likewise.
Index: libjava/ChangeLog
from Alexandre Oliva <aoliva@redhat.com>
* acinclude.m4: Include libtool macros from the source tree.
* libltdl/acinclude.m4: Likewise.
* aclocal.m4, configure: Rebuilt.
* libltdl/aclocal.m4, libltdl/configure: Likewise.
Index: zlib/ChangeLog
from Alexandre Oliva <aoliva@redhat.com>
* acinclude.m4: Include libtool macros from the source tree.
* aclocal.m4, configure: Rebuilt.
Index: boehm-gc/acinclude.m4
===================================================================
RCS file: /cvs/java/libgcj/boehm-gc/acinclude.m4,v
retrieving revision 1.9
diff -u -r1.9 acinclude.m4
--- boehm-gc/acinclude.m4 2000/06/20 01:04:58 1.9
+++ boehm-gc/acinclude.m4 2000/07/26 11:25:12
@@ -155,3 +155,9 @@
]))
))))
+
+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)])])
Index: libffi/acinclude.m4
===================================================================
RCS file: acinclude.m4
diff -N acinclude.m4
--- libffi/acinclude.m4 Tue May 5 13:32:27 1998
+++ libffi/acinclude.m4 Wed Jul 26 04:25:12 2000
@@ -0,0 +1,5 @@
+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)])])
Index: libjava/acinclude.m4
===================================================================
RCS file: /cvs/java/libgcj/libjava/acinclude.m4,v
retrieving revision 1.4
diff -u -r1.4 acinclude.m4
--- libjava/acinclude.m4 1999/09/28 20:14:11 1.4
+++ libjava/acinclude.m4 2000/07/26 11:25:13
@@ -160,3 +160,9 @@
AC_SUBST(LIBGCJ_CXXFLAGS)
AC_SUBST(LIBGCJ_JAVAFLAGS)
])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)])])
Index: zlib/acinclude.m4
===================================================================
RCS file: /cvs/java/libgcj/zlib/acinclude.m4,v
retrieving revision 1.2
diff -u -r1.2 acinclude.m4
--- zlib/acinclude.m4 1999/09/28 20:37:20 1.2
+++ zlib/acinclude.m4 2000/07/26 11:25:13
@@ -37,3 +37,9 @@
test "${CFLAGS+set}" = set || CFLAGS="-g"
fi
])
+
+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)])])
--
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