diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-08-21 00:44:53 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-08-21 00:44:53 +0000 |
| commit | 54f838b9d3d7e6e85bab6ccebf5c7e78be2b6383 (patch) | |
| tree | 1f7b22ee491b463920a0d4d5017db6b704c934ac | |
| parent | 033cfc394d678d8750332c6d54328a39a8b18293 (diff) | |
| download | classpath-54f838b9d3d7e6e85bab6ccebf5c7e78be2b6383.tar.gz | |
Ensure we are using GJDoc 0.7.9 for building docs.
2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/32028:
* m4/acinclude.m4:
(CLASSPATH_WITH_GJDOC): Ensure version 0.7.9 is
being used.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | m4/acinclude.m4 | 10 |
2 files changed, 16 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org> + + PR classpath/32028: + * m4/acinclude.m4: + (CLASSPATH_WITH_GJDOC): Ensure version 0.7.9 is + being used. + 2008-08-20 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/Makefile.am: diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index 18af91c51..0602c52a2 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -182,8 +182,16 @@ AC_DEFUN([CLASSPATH_WITH_GJDOC], AC_MSG_ERROR("Cannot use ${withval} as gjdoc executable since it doesn't exist")) fi], [WITH_GJDOC=no]) - AM_CONDITIONAL(CREATE_API_DOCS, test "x${WITH_GJDOC}" = xyes) + if test "x${WITH_GJDOC}" = xyes; then + AC_MSG_CHECKING([version of GJDoc]) + gjdoc_version=$(${GJDOC} --version|cut -d ' ' -f2) + AC_MSG_RESULT(${gjdoc_version}) + case ${gjdoc_version} in + 0.7.9) ;; + *) AC_MSG_ERROR([Building documentation requires GJDoc 0.7.9, ${gjdoc_version} found.]) ;; + esac + fi ]) dnl ----------------------------------------------------------- |