SF.net SVN: openvrml:[3839] trunk

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

Revision: 3839
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3839&view=rev
Author:   braden
Date:     2009-03-17 07:10:58 +0000 (Tue, 17 Mar 2009)

Log Message:
-----------
Rely on an installed GtkGLExt.

Modified Paths:
--------------
    trunk/Makefile.am
    trunk/configure.ac
    trunk/src/Makefile.am

Removed Paths:
-------------
    trunk/lib/

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2009-03-17 05:55:19 UTC (rev 3838)
+++ trunk/Makefile.am	2009-03-17 07:10:58 UTC (rev 3839)
@@ -1,4 +1,4 @@
-SUBDIRS = doc ide-projects models lib src mozilla-plugin data examples tests
+SUBDIRS = doc ide-projects models src mozilla-plugin data examples tests
 
 ACLOCAL_AMFLAGS = -I m4
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-03-17 05:55:19 UTC (rev 3838)
+++ trunk/configure.ac	2009-03-17 07:10:58 UTC (rev 3839)
@@ -8,7 +8,6 @@
                 [models/Makefile]
                 [models/audio/Makefile]
                 [models/textures/Makefile]
-                [lib/Makefile]
                 [src/Makefile]
                 [src/libopenvrml/openvrml-config.h]
                 [src/libopenvrml-gl/openvrml-gl-config.h]
@@ -172,7 +171,8 @@
 #
 # openvrml-player uses GtkBuilder, which was introduced in GTK+ 2.12.
 #
-PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0 >= 2.6], ,
+PKG_CHECK_MODULES([GTKGL],
+                  [gtkglext-1.0 gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0 >= 2.6], ,
                   [have_gtk=no])
 #
 # openvrml-player uses GNOME_PARAM_GOPTION_CONTEXT, which was
@@ -452,13 +452,8 @@
 ])
 AC_SUBST([OPENVRML_JAVASCRIPT_RPATH])
 
-if test X$enable_xembed != Xno; then
-  gtkglext_subdir=gtkglext
-fi
-AC_SUBST([gtkglext_subdir])
+AC_CONFIG_SUBDIRS([mozilla-plugin])
 
-AC_CONFIG_SUBDIRS([lib/gtkglext mozilla-plugin])
-
 AC_CONFIG_TESTDIR([tests])
 
 AC_OUTPUT

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2009-03-17 05:55:19 UTC (rev 3838)
+++ trunk/src/Makefile.am	2009-03-17 07:10:58 UTC (rev 3839)
@@ -731,9 +731,6 @@
 endif
 openvrml_xembed_openvrml_xembed_CPPFLAGS = \
         -I$(top_builddir)/src/openvrml-xembed \
-        -I$(top_srcdir)/lib/gtkglext \
-        -I$(top_builddir)/lib/gtkglext \
-        -I$(top_builddir)/lib/gtkglext/gdk \
         -I$(top_builddir)/src/libopenvrml \
         -I$(top_srcdir)/src/libopenvrml \
         -I$(top_builddir)/src/libopenvrml-gl \
@@ -743,8 +740,7 @@
 openvrml_xembed_openvrml_xembed_CXXFLAGS = \
         $(PTHREAD_CFLAGS) \
         $(DBUS_G_CFLAGS) \
-        $(GTK_CFLAGS) \
-        $(GL_CFLAGS)
+        $(GTKGL_CFLAGS)
 openvrml_xembed_openvrml_xembed_SOURCES = \
         openvrml-xembed/main.cpp \
         openvrml-xembed/browserfactory.cpp \
@@ -756,12 +752,9 @@
         openvrml-xembed/streamclient.h
 openvrml_xembed_openvrml_xembed_LDFLAGS = \
         $(DBUS_G_LIBS) \
-        $(GTK_LIBS) \
-        $(GL_LIBS)
+        $(GTKGL_LIBS)
 openvrml_xembed_openvrml_xembed_LDADD = \
-        libopenvrml-gl/libopenvrml-gl.la \
-        $(top_builddir)/lib/gtkglext/gtk/libgtkglext-x11-1.0.la \
-        $(top_builddir)/lib/gtkglext/gdk/libgdkglext-x11-1.0.la
+        libopenvrml-gl/libopenvrml-gl.la
 
 openvrml_xembed_datadir = $(datadir)/openvrml-xembed
 openvrml_xembed_dbusdir = $(openvrml_xembed_datadir)/dbus-1


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.