[openvrml-commit] openvrml ChangeLog,1.1230,1.1231 configure.ac,1.84,1.85

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25598

Modified Files:
	ChangeLog configure.ac 
Log Message:
Ensure the version of antlr that gets used to generate code is the same as the version of libantlr that is included with OpenVRML.

Index: configure.ac
===================================================================
RCS file: /cvsroot/openvrml/openvrml/configure.ac,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** configure.ac	17 Feb 2006 03:40:08 -0000	1.84
--- configure.ac	27 Apr 2006 04:51:24 -0000	1.85
***************
*** 48,52 ****
  OV_PROG_JAVAH
  OV_PROG_JAR
! OV_PROG_ANTLR
  
  AC_ARG_VAR([DOXYGEN], [Doxygen documentation generator])
--- 48,56 ----
  OV_PROG_JAVAH
  OV_PROG_JAR
! OV_PROG_ANTLR([2.7.4])
! AS_IF([test -z "$ANTLR"]
!       [AS_IF([test ! -f $top_srcdir/src/libopenvrml/Vrml97Parser.cpp],
!              [AC_MSG_FAILURE([antlr 2.7.4 not found])],
!              [AC_MSG_WARN([antlr 2.7.4 not found; but generated files already exist])])])
  
  AC_ARG_VAR([DOXYGEN], [Doxygen documentation generator])

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1230
retrieving revision 1.1231
diff -C2 -d -r1.1230 -r1.1231
*** ChangeLog	27 Apr 2006 04:45:56 -0000	1.1230
--- ChangeLog	27 Apr 2006 04:51:24 -0000	1.1231
***************
*** 1,4 ****
--- 1,13 ----
  2006-04-27 Braden McDaniel  <br...@en...>
  
+ 	Ensure the version of antlr that gets used to generate code is the
+ 	same as the version of libantlr that is included with OpenVRML.
+ 
+ 	* configure.ac: Check for antlr 2.7.4.
+ 	* m4/antlr.m4 (OV_PROG_ANTLR): Allow specification of a particular
+ 	version of antlr.
+ 
+ 2006-04-27 Braden McDaniel  <br...@en...>
+ 
  	* m4/jdk.m4 (OV_PROG_JAVA): Added AC_ARG_VAR JAVAFLAGS.