Current Classpath CVS documentation can only be built with the latest GJDoc (0.7.9). This adds a check to configure to ensure this version is being used.
ChangeLog: 2008-08-21 Andrew John Hughes <[EMAIL PROTECTED]> PR classpath/32028: * m4/acinclude.m4: (CLASSPATH_WITH_GJDOC): Ensure version 0.7.9 is being used. -- Andrew :) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
Index: m4/acinclude.m4 =================================================================== RCS file: /sources/classpath/classpath/m4/acinclude.m4,v retrieving revision 1.38 diff -u -u -r1.38 acinclude.m4 --- m4/acinclude.m4 15 Jul 2008 15:33:51 -0000 1.38 +++ m4/acinclude.m4 21 Aug 2008 00:33:26 -0000 @@ -182,8 +182,16 @@ 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 -----------------------------------------------------------