[cp-patches] [gjdoc] enable automake 1.10

Mark Wielaard mark at klomp.org
Sat Apr 21 22:22:08 UTC 2007


Hi,

While testing the gjdoc release that Andrew prepared (thanks!) I found a
small issue with automake 1.10. This patch makes gjdoc work with that
version also.

2007-04-21  Mark Wielaard  <mark at klomp.org>

        * autogen.sh: Recognize Automake 1.10.
        * Makefile.am (gjdoc_LINK): Add gjdoc_LDFLAGS.

Committed,

Mark

Index: Makefile.am
===================================================================
RCS file: /cvsroot/classpath/gjdoc/Makefile.am,v
retrieving revision 1.41
diff -u -r1.41 Makefile.am
--- Makefile.am 22 Oct 2005 12:38:50 -0000      1.41
+++ Makefile.am 21 Apr 2007 22:18:29 -0000
@@ -47,7 +47,7 @@
 endif
 
 gjdoc_SOURCES = 
-gjdoc_LINK = $(GCJLINK)
+gjdoc_LINK = $(GCJLINK) $(gjdoc_LDFLAGS)
 gjdoc_LDADD = -l-com-sun-javadoc -l-com-sun-tools-doclets-Taglet \
        -l-gnu-classpath-tools-gjdoc antlr.so \
        $(jni_linkflag)
Index: autogen.sh
===================================================================
RCS file: /cvsroot/classpath/gjdoc/autogen.sh,v
retrieving revision 1.4
diff -u -r1.4 autogen.sh
--- autogen.sh  14 Feb 2007 23:11:04 -0000      1.4
+++ autogen.sh  21 Apr 2007 22:18:29 -0000
@@ -60,6 +60,9 @@
            1.9*)
                have_automake=true
                ;;
+           1.10*)
+               have_automake=true
+               ;;
        esac
 fi
 if $have_automake ; then : ; else

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : http://developer.classpath.org/pipermail/classpath-patches/attachments/20070422/0f219c6b/attachment.pgp


More information about the Classpath-patches mailing list