[openvrml-commit] openvrml ChangeLog, 1.1310.2.108, 1.1310.2.109 configure.ac, 1.92.2.15, 1.92.2.16

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

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

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog configure.ac 
Log Message:
Require GLib >= 2.6 since openvrml-gtkplug and openvrml-player use GOption.

Index: configure.ac
===================================================================
RCS file: /cvsroot/openvrml/openvrml/configure.ac,v
retrieving revision 1.92.2.15
retrieving revision 1.92.2.16
diff -C2 -d -r1.92.2.15 -r1.92.2.16
*** configure.ac	24 Jan 2007 01:10:54 -0000	1.92.2.15
--- configure.ac	3 Feb 2007 07:41:07 -0000	1.92.2.16
***************
*** 112,116 ****
                                       [mozilla_js_pkg=$REQUIRE_MOZILLA_JS],
                                       [have_js=no])])
! PKG_CHECK_MODULES([GTK], [gtk+-2.0 gthread-2.0], , [have_gtk=no])
  PKG_CHECK_MODULES([GLADE], [libglade-2.0], , [have_libglade=no])
  PKG_CHECK_MODULES([GNOMEUI], [libgnomeui-2.0], , [have_gnomeui=no])
--- 112,121 ----
                                       [mozilla_js_pkg=$REQUIRE_MOZILLA_JS],
                                       [have_js=no])])
! #
! # openvrml-gtkplug and openvrml-player both use GOption, which was
! # introduced in GLib 2.6.
! #
! PKG_CHECK_MODULES([GTK], [gtk+-2.0 gthread-2.0 glib-2.0 >= 2.6], ,
!                   [have_gtk=no])
  PKG_CHECK_MODULES([GLADE], [libglade-2.0], , [have_libglade=no])
  PKG_CHECK_MODULES([GNOMEUI], [libgnomeui-2.0], , [have_gnomeui=no])

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.108
retrieving revision 1.1310.2.109
diff -C2 -d -r1.1310.2.108 -r1.1310.2.109
*** ChangeLog	24 Jan 2007 01:10:54 -0000	1.1310.2.108
--- ChangeLog	3 Feb 2007 07:41:07 -0000	1.1310.2.109
***************
*** 1,7 ****
  2007-01-23 Braden McDaniel  <br...@en...>
  
! 	* configure.ac: Fail if pkg-config doesn't fine libglade-2.0,
! 	libgnomeui-2.0, or libcurl openvrml-player is configured to be
! 	built.
  
  2007-01-23 Braden McDaniel  <br...@en...>
--- 1,12 ----
+ 2007-02-03 Braden McDaniel  <br...@en...>
+ 
+ 	* configure.ac: Require GLib >= 2.6 since openvrml-gtkplug and
+ 	openvrml-player use GOption.
+ 
  2007-01-23 Braden McDaniel  <br...@en...>
  
! 	* configure.ac: Fail if pkg-config doesn't find libglade-2.0,
! 	libgnomeui-2.0, or libcurl when openvrml-player is configured to
! 	be built.
  
  2007-01-23 Braden McDaniel  <br...@en...>