bad libjava/libltdl/Makefile.in; automake version?

[Andreas Tobler]

Per Bothner wrote:

> The version of libjava/libltdl/Makefile.in in the CVS repository
> does not have the @MAINTAINER_MODE_TRUE@ guard to disable the
> dependencies when --disable-maintainer-mode (the default) is
> configured.  So it tries to run automake, which fails because
> it doesn't find the right version of automake.
> 
> This looks like a serious bug in automake version 1.7.9.
> (libjava/Makefile.in was generated using automake 1.4, which
> seems awfully old.  This is strange, because both were checked
> in by Micahel Koch, though not on the same day.)

Would this one be ok?


Index: libltdl/acinclude.m4
===================================================================
RCS file: /cvs/gcc/gcc/libjava/libltdl/acinclude.m4,v
retrieving revision 1.4
diff -u -r1.4 acinclude.m4
--- libltdl/acinclude.m4        16 Dec 2003 21:48:24 -0000      1.4
+++ libltdl/acinclude.m4        18 Dec 2003 15:37:42 -0000
@@ -163,6 +163,8 @@
  AC_CHECK_TOOL(RANLIB, ranlib, :)
  AC_CHECK_TOOL(STRIP, strip, :)

+AM_MAINTAINER_MODE
+
  old_CC="$CC"
  old_CFLAGS="$CFLAGS"


Regenration of the files can be done with automake >= 1.6.3 and autoconf 
  >= 2.57.


I tested it here localy, but I'm on automake 1.8. It would be great if 
anyone with an older non infected system could test this one :)

I'm willing to regenerate the files with automake 1.6.3 and 
autoconf-2.57 if the above patchlet cures the situation.

(Including Changelog etc. )


Andreas