I have made some progress in updating libtool in the src (binutils) tree
and I have attached the various changes (but not the actual new libtool
files) to this email in case anyone wants to see what I am doing.
I am having more trouble with the GCC tree. I put the new libtool in
the toplevel directory, just like I did in the binutils src tree and
then I went to the boehm-gc (and libffi) directories to try and rerun
autoconf. If I just run autoconf I get errors because I am not
including the new ltoptions.m4, ltsugar.m4, and ltversion.m4 files. Now
in the binutils tree the acinclude.m4 files had explicit includes of
libtool.m4 and I added includes of ltoptions.m4, ltsugar.m4, and
ltversion.m4. But boehm-gc has no acinclude.m4 file and while libffi
has an acinclude.m4 file, it doesn't have an include of libtool.m4. So
my question is, how is the include of libtool.m4 getting into
aclocal.m4? Is it by running aclocal? I tried to run aclocal but I get
errors when I run it:
$ aclocal
autom4te: unknown language: Autoconf-without-aclocal-m4
aclocal: autom4te failed with exit status: 1
This is aclocal 1.9.6. Any idea on what I need to do here to fix this
error? Why do some acinclude.m4 files have explicit includes for
libtool files (libgfortran, libgomp, etc) but other's don't (libffi,
gcc).
Steve Ellcey
[EMAIL PROTECTED]
Here is what I have done so far in the src/binutils tree:
Top level src tree ChangeLog:
2007-03-09 Steve Ellcey <[EMAIL PROTECTED]>
* ltmain.sh: Update from libtool ToT.
* libtool.m4: Update from libtool ToT.
* ltsugar.m4: New. Update from libtool ToT.
* ltversion.m4: New. Update from libtool ToT.
* ltoptions.m4: New. Update from libtool ToT.
* ltconfig: Remove.
* ltcf-c.sh: Remove.
* ltcf-cxx.sh: Remove.
* ltcf-gcj.sh: Remove.
* src-release: Update with new libtool file list.
Index: src-release
===================================================================
RCS file: /cvs/src/src/src-release,v
retrieving revision 1.22
diff -u -r1.22 src-release
--- src-release 9 Feb 2007 15:15:38 -0000 1.22
+++ src-release 9 Mar 2007 23:37:34 -0000
@@ -49,8 +49,8 @@
DEVO_SUPPORT= README Makefile.in configure configure.ac \
config.guess config.sub config move-if-change \
COPYING COPYING.LIB install-sh config-ml.in symlink-tree \
- mkinstalldirs ltconfig ltmain.sh missing ylwrap \
- libtool.m4 ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh \
+ mkinstalldirs ltmain.sh missing ylwrap \
+ libtool.m4 ltsugar.m4, ltversion.m4, ltoptions.m4 \
Makefile.def Makefile.tpl src-release config.rpath
# Files in devo/etc used in any net release.
bfd/ChangeLog
2007-03-09 Steve Ellcey <[EMAIL PROTECTED]>
* acinclude.m4: Add new includes.
* configure.in: Change macro call order.
* configure: Regenerate.
Index: acinclude.m4
===================================================================
RCS file: /cvs/src/src/bfd/acinclude.m4,v
retrieving revision 1.16
diff -u -r1.16 acinclude.m4
--- acinclude.m4 31 May 2006 15:14:35 -0000 1.16
+++ acinclude.m4 9 Mar 2007 23:36:49 -0000
@@ -49,6 +49,9 @@
fi
AC_SUBST(EXEEXT_FOR_BUILD)])dnl
+sinclude(../ltsugar.m4)
+sinclude(../ltversion.m4)
+sinclude(../ltoptions.m4)
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
Index: configure.in
===================================================================
RCS file: /cvs/src/src/bfd/configure.in,v
retrieving revision 1.222
diff -u -r1.222 configure.in
--- configure.in 1 Mar 2007 15:48:36 -0000 1.222
+++ configure.in 9 Mar 2007 23:37:07 -0000
@@ -19,7 +19,10 @@
dnl configure option --enable-shared.
AM_DISABLE_SHARED
-AM_PROG_LIBTOOL
+AC_PROG_CC
+AC_GNU_SOURCE
+
+AC_PROG_LIBTOOL
AC_ARG_ENABLE(64-bit-bfd,
[ --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)],
@@ -95,9 +98,6 @@
# host stuff:
-AC_PROG_CC
-AC_GNU_SOURCE
-
ALL_LINGUAS="fr tr ja es sv da zh_CN ro rw vi"
ZW_GNU_GETTEXT_SISTER_DIR
AM_PO_SUBDIRS
binutils/ChangeLog
2007-03-09 Steve Ellcey <[EMAIL PROTECTED]>
* configure.in: Change macro call order.
* configure: Regenerate.
Index: configure.in
===================================================================
RCS file: /cvs/src/src/binutils/configure.in,v
retrieving revision 1.75
diff -u -r1.75 configure.in
--- configure.in 28 Feb 2007 01:29:32 -0000 1.75
+++ configure.in 9 Mar 2007 23:36:12 -0000
@@ -11,7 +11,9 @@
changequote([,])dnl
AM_INIT_AUTOMAKE(binutils, ${BFD_VERSION})
-AM_PROG_LIBTOOL
+AC_PROG_CC
+AC_GNU_SOURCE
+AC_PROG_LIBTOOL
AC_ARG_ENABLE(targets,
[ --enable-targets alternative target configurations],
@@ -53,9 +55,6 @@
AC_MSG_ERROR(Unrecognized host system type; please check config.sub.)
fi
-AC_PROG_CC
-AC_GNU_SOURCE
-
AC_PROG_YACC
AM_PROG_LEX
gas/ChangeLog
2007-03-09 Steve Ellcey <[EMAIL PROTECTED]>
* acinclude.m4: Add new includes.
* configure: Regenerate.
Index: acinclude.m4
===================================================================
RCS file: /cvs/src/src/gas/acinclude.m4,v
retrieving revision 1.6
diff -u -r1.6 acinclude.m4
--- acinclude.m4 2 Aug 2006 14:26:07 -0000 1.6
+++ acinclude.m4 9 Mar 2007 23:35:46 -0000
@@ -71,6 +71,9 @@
$1=[$]_gas_uniq_newlist
])dnl
+sinclude(../ltsugar.m4)
+sinclude(../ltversion.m4)
+sinclude(../ltoptions.m4)
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
gprof/ChangeLog
2007-03-09 Steve Ellcey <[EMAIL PROTECTED]>
* acinclude.m4: Add new includes.
* configure: Regenerate.
Index: acinclude.m4
===================================================================
RCS file: /cvs/src/src/gprof/acinclude.m4,v
retrieving revision 1.3
diff -u -r1.3 acinclude.m4
--- acinclude.m4 31 May 2006 15:14:37 -0000 1.3
+++ acinclude.m4 9 Mar 2007 23:35:04 -0000
@@ -4,6 +4,9 @@
sinclude(../config/po.m4)
sinclude(../config/progtest.m4)
+sinclude(../ltsugar.m4)
+sinclude(../ltversion.m4)
+sinclude(../ltoptions.m4)
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
rda/ChangeLog
2007-03-09 Steve Ellcey <[EMAIL PROTECTED]>
* acinclude.m4: Add new includes.
* configure: Regenerate.
Index: acinclude.m4
===================================================================
RCS file: /cvs/src/src/rda/acinclude.m4,v
retrieving revision 1.2
diff -u -r1.2 acinclude.m4
--- acinclude.m4 31 May 2006 15:14:39 -0000 1.2
+++ acinclude.m4 9 Mar 2007 23:34:41 -0000
@@ -1,3 +1,6 @@
+sinclude(../ltsugar.m4)
+sinclude(../ltversion.m4)
+sinclude(../ltoptions.m4)
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
ld/ChangeLog
2007-03-09 Steve Ellcey <[EMAIL PROTECTED]>
* configure: Regenerate.
opcodes/ChangeLog
2007-03-09 Steve Ellcey <[EMAIL PROTECTED]>
* configure: Regenerate.
