Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.21
diff -p -u -r1.21 Makefile.am
--- Makefile.am	24 Apr 2006 23:05:55 -0000	1.21
+++ Makefile.am	4 May 2006 00:27:13 -0000
@@ -37,7 +37,7 @@
 AUTOMAKE_OPTIONS = dejagnu
 ACLOCAL_AMFLAGS = -I macros
 
-STD_DIRS = libbase libgeometry server backend utilities plugin # gui
+STD_DIRS = libbase libgeometry server backend utilities gui plugin
 if DOCBOOK
 DOC_DIRS = doc
 endif
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.62
diff -p -u -r1.62 configure.ac
--- configure.ac	2 May 2006 20:51:59 -0000	1.62
+++ configure.ac	4 May 2006 00:27:14 -0000
@@ -364,6 +364,7 @@ testsuite/Makefile
 testsuite/actionscript.all/Makefile
 plugin/Makefile
 plugin/klash/Makefile
+gui/Makefile
 )
 dnl config.mk
 dnl plugin/test/Makefile
@@ -563,7 +564,6 @@ if test x"$glext" = x"yes"; then
   fi
 fi
 
-if test x"$plugin" = x"yes" -a x"$glext" = x"yes"; then
   if test x"$GTK2_LIBS" != x; then
     if test x"$GTK2_CFLAGS" != x; then
       echo "        Gtk2 flags are: $GTK2_CFLAGS"
@@ -578,9 +578,7 @@ if test x"$plugin" = x"yes" -a x"$glext"
  (using apt-get) or gtk2-devel (using yum)."
 dnl    nogo=true
   fi
-fi
 
-if test x"$glext" = x"yes"; then
   if test x"$PANGO_LIBS" != x; then
     if test x"$PANGO_CFLAGS" != x; then
       echo "        Pango flags are: $PANGO_CFLAGS"
@@ -595,9 +593,7 @@ if test x"$glext" = x"yes"; then
  (using apt-get) or pango-devel (using yum)."
 dnl    nogo=true
   fi
-fi
 
-if test x"$glext" = x"yes"; then
   if test x"$GLIB_LIBS" != x; then
     if test x"$GLIB_CFLAGS" != x; then
       echo "        Glib flags are: $GLIB_CFLAGS"
@@ -612,9 +608,7 @@ if test x"$glext" = x"yes"; then
  (using apt-get) or glib2-devel (using yum)."
 dnl    nogo=true
   fi
-fi
 
-if test x"$glext" = x"yes"; then
   if test x"$CAIRO_LIBS" != x; then
     if test x"$CAIRO_CFLAGS" != x; then
       echo "        Cairo flags are: $CAIRO_CFLAGS"
@@ -629,9 +623,7 @@ if test x"$glext" = x"yes"; then
  (using apt-get) or cairo-devel (using yum)."
 dnl    nogo=true
   fi
-fi
 
-if test x"$glext" = x"yes"; then
   if test x"$ATK_LIBS" != x; then
     if test x"$ATK_CFLAGS" != x; then
       echo "        Atk flags are: $ATK_CFLAGS"
@@ -646,7 +638,6 @@ if test x"$glext" = x"yes"; then
  (using apt-get) or atk-devel (using yum)."
 dnl    nogo=true
   fi
-fi
 
 if test x"$fltk" = x"yes"; then
   if test x"$FLTK_LIBS" != x; then
Index: backend/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/backend/Makefile.am,v
retrieving revision 1.21
diff -p -u -r1.21 Makefile.am
--- backend/Makefile.am	2 May 2006 20:51:59 -0000	1.21
+++ backend/Makefile.am	4 May 2006 00:27:14 -0000
@@ -70,7 +70,7 @@ INCLUDES = -I.. \
 	$(MP3_CFLAGS)		\
 	$(OGG_CFLAGS)
 
-bin_PROGRAMS = gnash
+bin_PROGRAMS = # gnash
 
 #noinst_LTLIBRARIES = libgbackend.la
 lib_LTLIBRARIES = libgnashbackend.la
Index: backend/render_handler_cairo.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_cairo.cpp,v
retrieving revision 1.1
diff -p -u -r1.1 render_handler_cairo.cpp
--- backend/render_handler_cairo.cpp	2 May 2006 20:51:59 -0000	1.1
+++ backend/render_handler_cairo.cpp	4 May 2006 00:27:14 -0000
@@ -364,6 +364,7 @@ struct render_handler_cairo : public gna
 	{
 //	    GNASH_REPORT_FUNCTION;
 	    // Setup output window
+#if 0
 	    if (!g_cr_win)
 	    {
 		Display* xdisp = XOpenDisplay(0);
@@ -381,7 +382,7 @@ struct render_handler_cairo : public gna
 		    xdisp, xwin, visual, m_view_width, m_view_height);
 		g_cr_win = cairo_create(surface);
 	    }
-
+#endif
 	    // Blit offscreen image onto output window 
 	    cairo_surface_t* offscreen = cairo_get_target(m_cr_offscreen);
 	    cairo_set_source_surface(g_cr_win, offscreen, 0, 0);
@@ -716,11 +717,12 @@ bitmap_info_cairo::bitmap_info_cairo(ima
     m_pattern = cairo_pattern_create_for_surface(m_image);
 }
 
-gnash::render_handler*	gnash::create_render_handler_cairo()
+gnash::render_handler*	gnash::create_render_handler_cairo(void* cairohandle)
 // Factory.
 {
 	//    GNASH_REPORT_FUNCTION;
-	return new render_handler_cairo;
+	g_cr_win = (cairo_t*) cairohandle;
+	return new render_handler_cairo();
 }
 
 
Index: libbase/tu_opengl_includes.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_opengl_includes.h,v
retrieving revision 1.1
diff -p -u -r1.1 tu_opengl_includes.h
--- libbase/tu_opengl_includes.h	20 Dec 2005 20:57:00 -0000	1.1
+++ libbase/tu_opengl_includes.h	4 May 2006 00:27:14 -0000
@@ -54,6 +54,7 @@
 #if !defined(WIN32) && !defined(__MACH__)
 #	include <GL/gl.h>
 #	include <GL/glu.h>
+#	include <GL/glx.h>
 #ifndef APIENTRY
 #	define APIENTRY
 #endif
Index: server/gnash.h
===================================================================
RCS file: /sources/gnash/gnash/server/gnash.h,v
retrieving revision 1.17
diff -p -u -r1.17 gnash.h
--- server/gnash.h	2 May 2006 20:51:59 -0000	1.17
+++ server/gnash.h	4 May 2006 00:27:15 -0000
@@ -164,7 +164,8 @@ float	get_curve_max_pixel_error();
 // version of the library, depending on platform etc.
 render_handler*	create_render_handler_xbox();
 render_handler*	create_render_handler_ogl();
-render_handler*	create_render_handler_cairo();
+render_handler*	create_render_handler_cairo(void* cairohandle);
+
 sound_handler*	create_sound_handler_sdl();