summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2012-10-15 11:47:59 +0100
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2012-10-15 11:47:59 +0100
commitc4937db350faa4451db618531f5a2027c2b7cfcc (patch)
tree606fd56926f233160809fda1b1b77e1de108f778
parenta1e2fbeff01860fc2c7ad5c8a0a6982e5ca14b95 (diff)
downloadclasspath-c4937db350faa4451db618531f5a2027c2b7cfcc.tar.gz
PR54931: Allow Classpath to build docs with the GJDoc included within
2012-10-15 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/54931 * m4/acinclude.m4: (CLASSPATH_WITH_GJDOC): Allow GJDoc versions included with GNU Classpath to be used to build (0.98 on). Signed-off-by: Andrew John Hughes <gnu_andrew@member.fsf.org>
-rw-r--r--ChangeLog8
-rw-r--r--m4/acinclude.m42
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 384918be8..d4b297466 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-10-15 Andrew John Hughes <gnu_andrew@member.fsf.org>
+
+ PR classpath/54931
+ * m4/acinclude.m4:
+ (CLASSPATH_WITH_GJDOC): Allow GJDoc versions
+ included with GNU Classpath to be used to
+ build (0.98 on).
+
2012-03-15 Pekka Enberg <penberg@kernel.org>
* java/lang/String.java:
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
index 172f54a58..e0d46ccff 100644
--- a/m4/acinclude.m4
+++ b/m4/acinclude.m4
@@ -190,6 +190,8 @@ AC_DEFUN([CLASSPATH_WITH_GJDOC],
case ${gjdoc_version} in
0.7.9) ;;
0.8*) ;;
+ 0.9*) ;;
+ 1*) ;;
*) AC_MSG_ERROR([Building documentation requires GJDoc >= 0.7.9, ${gjdoc_version} found.]) ;;
esac
fi