On Jul 23, 2000, Nick Hudson <[EMAIL PROTECTED]> wrote:
> The ML branch doesn't seem to bootstrap with autoconf 2.13 and automake
> 1.4.
Oops, sorry, I screwed up again. And sorry about the delay, one of my mail
boxes (of course, the one in which your message got stored) wasn't
allowing me to download my messages, and it wouldn't even tell me
there were messages for me. I took me three days to figure it out :-(
Here's a patch that fixes this problem:
Index: ChangeLog
from Alexandre Oliva <[EMAIL PROTECTED]>
* configure.in (AM_PROG_GCJ): Moved definition...
* libtool.m4: ... here.
Index: configure.in
===================================================================
RCS file: /home/cvs/libtool/configure.in,v
retrieving revision 1.38.2.7
diff -u -r1.38.2.7 configure.in
--- configure.in 2000/07/10 05:28:31 1.38.2.7
+++ configure.in 2000/07/26 19:24:19
@@ -59,17 +59,7 @@
AM_CONDITIONAL(HAVE_CXX, [test "x$CXX" != xno])
pushdef([AC_MSG_ERROR], [GCJ=no])
-ifdef([AC_PROG_GCJ],[AC_PROG_GCJ],
- [ifdef([AM_PROG_GCJ],[],[
- # Stolen from automake
- AC_DEFUN([AM_PROG_GCJ],[
- AC_CHECK_PROGS(GCJ, gcj, gcj)
- if test "x${GCJFLAGS+set}" = xset; then
- GCJFLAGS="-g -O2"
- fi
- AC_SUBST(GCJFLAGS)
- ])])
- AM_PROG_GCJ])
+ifdef([AC_PROG_GCJ],[AC_PROG_GCJ],[AM_PROG_GCJ])
popdef([AC_MSG_ERROR])
AM_CONDITIONAL(HAVE_GCJ, [test "x$GCJ" != xno])
Index: libtool.m4
===================================================================
RCS file: /home/cvs/libtool/libtool.m4,v
retrieving revision 1.71.2.25
diff -u -r1.71.2.25 libtool.m4
--- libtool.m4 2000/07/10 09:42:10 1.71.2.25
+++ libtool.m4 2000/07/26 19:24:22
@@ -822,3 +822,14 @@
dnl This is just to silence aclocal about the macro not being used
ifelse([AC_DISABLE_FAST_INSTALL])dnl
+
+ifdef([AM_PROG_GCJ],,[
+# Stolen from automake
+AC_DEFUN([AM_PROG_GCJ],[
+ AC_CHECK_PROGS(GCJ, gcj, gcj)
+ dnl Automake uses ``='' in the test below, it seems wrong
+ if test "x${GCJFLAGS+set}" != xset; then
+ GCJFLAGS="-g -O2"
+ fi
+ AC_SUBST(GCJFLAGS)
+])])
\ No newline at end of file
--
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
