openvrml-commit

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

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

Modified Files:
	ChangeLog README configure.ac 
Log Message:
Changed the name of openvrml-gtkplug to openvrml-xembed.

Index: README
===================================================================
RCS file: /cvsroot/openvrml/openvrml/README,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** README	30 Dec 2006 23:37:43 -0000	1.75
--- README	5 Feb 2007 05:36:10 -0000	1.76
***************
*** 92,96 ****
       /libopenvrml       :  Runtime library sources.
       /libopenvrml-gl    :  OpenGL renderer library sources.
!      /openvrml-gtkplug  :  GtkPlug component application sources.
     /test                :  Test programs.
  
--- 92,96 ----
       /libopenvrml       :  Runtime library sources.
       /libopenvrml-gl    :  OpenGL renderer library sources.
!      /openvrml-xembed   :  XEmbed control application sources.
     /test                :  Test programs.
  
***************
*** 185,198 ****
       OpenGL/Mesa.
  
!  --disable-gtkplug
!      Do not build the GtkPlug application.  This is an out-of-process
!      component that provides a VRML/X3D browser that can be used in a
!      GTK+ application.  This depends on GTK+.  It also requires that the
!      GL renderer be built.
  
   --disable-mozilla-plugin
       Do not build the Mozilla plug-in.  The Mozilla plug-in depends on
!      GTK+ and, of course, Mozilla.  It also requires that the GtkPlug
!      application be built.
  
   --disable-examples
--- 185,198 ----
       OpenGL/Mesa.
  
!  --disable-xembed
!      Do not build the XEmbed control.  This is an out-of-process
!      component that provides a VRML/X3D browser that can be used in an
!      XEmbed container.  This depends on GTK+.  It also requires that
!      the GL renderer be built.
  
   --disable-mozilla-plugin
       Do not build the Mozilla plug-in.  The Mozilla plug-in depends on
!      GTK+ and, of course, a Mozilla-based browser.  It also requires
!      that the XEmbed control be built.
  
   --disable-examples
***************
*** 270,275 ****
  plug-in from the build directories.  A symbolic link to the plug-in
  module "openvrml.so" must be made in the Mozilla plug-in directory and
! the environment variable "OPENVRML_GTKPLUG" must be set to the full
! path name of the "openvrml-gtkplug" executable.
  
  
--- 270,275 ----
  plug-in from the build directories.  A symbolic link to the plug-in
  module "openvrml.so" must be made in the Mozilla plug-in directory and
! the environment variable "OPENVRML_XEMBED" must be set to the full
! path name of the "openvrml-xembed" executable.
  
  

Index: configure.ac
===================================================================
RCS file: /cvsroot/openvrml/openvrml/configure.ac,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** configure.ac	4 Feb 2007 07:55:43 -0000	1.109
--- configure.ac	5 Feb 2007 05:36:10 -0000	1.110
***************
*** 20,24 ****
                  [src/libopenvrml-gl/Makefile]
                  [src/libopenvrml-gl/openvrml-gl-config.h]
!                 [src/openvrml-gtkplug/Makefile]
                  [src/openvrml-player/Makefile]
                  [examples/Makefile]
--- 20,24 ----
                  [src/libopenvrml-gl/Makefile]
                  [src/libopenvrml-gl/openvrml-gl-config.h]
!                 [src/openvrml-xembed/Makefile]
                  [src/openvrml-player/Makefile]
                  [examples/Makefile]
***************
*** 114,118 ****
                                       [have_js=no])])
  #
! # openvrml-gtkplug and openvrml-player both use GOption, which was
  # introduced in GLib 2.6.
  #
--- 114,118 ----
                                       [have_js=no])])
  #
! # openvrml-xembed and openvrml-player both use GOption, which was
  # introduced in GLib 2.6.
  #
***************
*** 277,295 ****
  
  #
! # build the GtkPlug
  #
! AC_ARG_ENABLE([gtkplug],
!               [AC_HELP_STRING([--disable-gtkplug],
!                               [do not build the GtkPlug application])])
! if test X$enable_gtkplug != Xno; then
!   if test X$have_gtk = Xno; then
!     AC_MSG_FAILURE([GTK+ is required to build the GtkPlug])
!   fi
!   if test X$enable_gl_renderer = Xno; then
!     AC_MSG_FAILURE([the Mozilla plug-in cannot be built without the GL renderer])
!   fi
! fi
! AM_CONDITIONAL([ENABLE_GTKPLUG],
!                [test X$enable_gtkplug != Xno -a X$have_gtk != Xno])
  
  #
--- 277,291 ----
  
  #
! # build the XEmbed control
  #
! AC_ARG_ENABLE([xembed],
!               [AC_HELP_STRING([--disable-xembed],
!                               [do not build the XEmbed control])])
! AS_IF([test X$enable_xembed != Xno],
!       [AS_IF([test X$have_gtk = Xno],
!              [AC_MSG_FAILURE([GTK+ is required to build the XEmbed control])])
!        AS_IF([test X$enable_gl_renderer = Xno],
!              [AC_MSG_FAILURE([the XEmbed control cannot be built without the GL renderer])])])
! AM_CONDITIONAL([ENABLE_XEMBED], [test X$enable_xembed != Xno])
  
  #
***************
*** 300,305 ****
                                [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])])
         AS_IF([test X$have_libglade = Xno],
               [AC_MSG_FAILURE([libglade is required to build OpenVRML Player])])
--- 296,301 ----
                                [do not build OpenVRML Player])])
  AS_IF([test X$enable_player != Xno],
!       [AS_IF([test X$enable_xembed = Xno],
!              [AC_MSG_FAILURE([OpenVRML Player cannot be built without the XEmbed control])])
         AS_IF([test X$have_libglade = Xno],
               [AC_MSG_FAILURE([libglade is required to build OpenVRML Player])])
***************
*** 317,325 ****
                [AC_HELP_STRING([--disable-mozilla-plugin],
                                [do not build the Mozilla plug-in])])
! if test X$enable_mozilla_plugin != Xno; then
!   if test X$enable_gtkplug = Xno; then
!     AC_MSG_FAILURE([the Mozilla plug-in cannot be built without the GtkPlug application])
!   fi
! fi
  
  #
--- 313,319 ----
                [AC_HELP_STRING([--disable-mozilla-plugin],
                                [do not build the Mozilla plug-in])])
! AS_IF([test X$enable_mozilla_plugin != Xno],
!       [AS_IF([test X$enable_xembed = Xno],
!              [AC_MSG_FAILURE([the Mozilla plug-in cannot be built without the XEmbed control])])])
  
  #
***************
*** 354,358 ****
  AC_SUBST([OPENVRML_RPATH])
  
! if test X$enable_gtkplug != Xno; then
    gtkglext_subdir=gtkglext
  fi
--- 348,352 ----
  AC_SUBST([OPENVRML_RPATH])
  
! if test X$enable_xembed != Xno; then
    gtkglext_subdir=gtkglext
  fi

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1439
retrieving revision 1.1440
diff -C2 -d -r1.1439 -r1.1440
*** ChangeLog	4 Feb 2007 09:57:06 -0000	1.1439
--- ChangeLog	5 Feb 2007 05:36:10 -0000	1.1440
***************
*** 1,4 ****
--- 1,41 ----
  2007-02-04 Braden McDaniel  <br...@en...>
  
+ 	Changed the name of openvrml-gtkplug to openvrml-xembed.
+ 
+ 	* README: Changed references to openvrml-gtkplug to
+ 	openvrml-xembed.
+ 	* configure.ac: Changed references to openvrml-gtkplug to
+ 	openvrml-xembed.
+ 	* doc/Makefile.am: Refer to openvrml-xembed.texi instead of
+ 	openvrml-gtkplug.texi.
+ 	* doc/openvrml-gtkplug.texi: Removed file.
+ 	* doc/openvrml-xembed.texi: Added file.
+ 	* mozilla-plugin/src/openvrml.cpp: Changed references to
+ 	openvrml-gtkplug to openvrml-xembed.
+ 	* src/Makefile.am (SUBDIRS): Added openvrml-xembed; removed
+ 	openvrml-gtkplug.
+ 	* src/openvrml-gtkplug/Makefile.am: Removed file.
+ 	* src/openvrml-gtkplug/bounded_buffer.h: Removed file.
+ 	* src/openvrml-gtkplug/command_istream.cpp: Removed file.
+ 	* src/openvrml-gtkplug/command_istream.h: Removed file.
+ 	* src/openvrml-gtkplug/gtkvrmlbrowser.cpp: Removed file.
+ 	* src/openvrml-gtkplug/gtkvrmlbrowser.h: Removed file.
+ 	* src/openvrml-gtkplug/main.cpp: Removed file.
+ 	* src/openvrml-gtkplug/plugin_streambuf.cpp: Removed file.
+ 	* src/openvrml-gtkplug/plugin_streambuf.h: Removed file.
+ 	* src/openvrml-player/player.cpp: Changed references to
+ 	openvrml-gtkplug to openvrml-xembed.
+ 	* src/openvrml-xembed/Makefile.am: Added file.
+ 	* src/openvrml-xembed/bounded_buffer.h: Added file.
+ 	* src/openvrml-xembed/command_istream.cpp: Added file.
+ 	* src/openvrml-xembed/command_istream.h: Added file.
+ 	* src/openvrml-xembed/gtkvrmlbrowser.cpp: Added file.
+ 	* src/openvrml-xembed/gtkvrmlbrowser.h: Added file.
+ 	* src/openvrml-xembed/main.cpp: Added file.
+ 	* src/openvrml-xembed/plugin_streambuf.cpp: Added file.
+ 	* src/openvrml-xembed/plugin_streambuf.h: Added file.
+ 
+ 2007-02-04 Braden McDaniel  <br...@en...>
+ 
  	* src/openvrml-gtkplug/gtkvrmlbrowser.cpp
  	(gtk_vrml_browser_init(GtkVrmlBrowser *)): Use g_object_connect to