[openvrml-commit] openvrml ChangeLog, 1.1310.2.105, 1.1310.2.106 configure.ac, 1.92.2.12, 1.92.2.13

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

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

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog configure.ac 
Log Message:
Added openvrml-player, a stand-alone container for openvrml-gtkplug; libcurl is used for resource fetching.

Index: configure.ac
===================================================================
RCS file: /cvsroot/openvrml/openvrml/configure.ac,v
retrieving revision 1.92.2.12
retrieving revision 1.92.2.13
diff -C2 -d -r1.92.2.12 -r1.92.2.13
*** configure.ac	23 Jan 2007 06:39:56 -0000	1.92.2.12
--- configure.ac	23 Jan 2007 09:54:57 -0000	1.92.2.13
***************
*** 21,24 ****
--- 21,25 ----
                  [src/libopenvrml-gl/openvrml-gl-config.h]
                  [src/openvrml-gtkplug/Makefile]
+                 [src/openvrml-player/Makefile]
                  [examples/Makefile]
                  [tests/Makefile]
***************
*** 112,115 ****
--- 113,119 ----
                                       [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([GNOME], [libgnome-2.0], , [have_gnome=no])
+ PKG_CHECK_MODULES([CURL], [libcurl], , [have_libcurl=no])
  AC_PATH_XTRA
  AX_CHECK_GLU
***************
*** 295,298 ****
--- 299,313 ----
  
  #
+ # build openvrml-player
+ #
+ AC_ARG_ENABLE([player],
+               [AC_HELP_STRING([--disable-player],
+                               [do not build OpenVRML Player])])
+ AS_IF([test X$enable_player != Xno],
+       [AS_IF([test X$enable_gtkplug = Xno],
+              [AC_MSG_FAILURE([OpenVRML Player cannot be built without the GtkPlug application])])])
+ AM_CONDITIONAL([ENABLE_PLAYER], [test X$enable_player != Xno])
+ 
+ #
  # build Mozilla plug-in
  #

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.105
retrieving revision 1.1310.2.106
diff -C2 -d -r1.1310.2.105 -r1.1310.2.106
*** ChangeLog	23 Jan 2007 06:39:55 -0000	1.1310.2.105
--- ChangeLog	23 Jan 2007 09:54:57 -0000	1.1310.2.106
***************
*** 1,4 ****
--- 1,18 ----
  2007-01-23 Braden McDaniel  <br...@en...>
  
+ 	Added openvrml-player, a stand-alone container for
+ 	openvrml-gtkplug; libcurl is used for resource fetching.
+ 
+ 	* configure.ac: Output src/openvrml-player/Makefile; check for
+ 	libglade, libgnome, and libcurl; allow building openvrml-player to
+ 	be disabled.
+ 	* src/Makefile.am (SUBDIRS): Added openvrml-player.
+ 	* src/openvrml-player/Makefile.am: Makefile for openvrml-player.
+ 	* src/openvrml-player/openvrml-player.glade: libglade XML input.
+ 	* src/openvrml-player/player.cpp: Stand-alone container for
+ 	openvrml-gtkplug; libcurl is used for resource fetching.
+ 
+ 2007-01-23 Braden McDaniel  <br...@en...>
+ 
  	* configure.ac: Removed redundant checks to see whether
  	openvrml-gtkplug should be built (apparent cruft).