[Gnash-commit] [SCM] Gnash branch, master, updated. 3b784c5782413624299ba5711e975ebbc814e492

[Markus Gothe]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  3b784c5782413624299ba5711e975ebbc814e492 (commit)
      from  8128020e8d4aae132930680d910907bebd1e6fea (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=3b784c5782413624299ba5711e975ebbc814e492


commit 3b784c5782413624299ba5711e975ebbc814e492
Author: Markus Gothe <address@hidden>
Date:   Fri Jan 7 18:31:48 2011 +0100

    clean-up

diff --git a/configure.ac b/configure.ac
index 85e19da..2183bba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl  
-dnl  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software 
Foundation, Inc.
+dnl  Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software 
Foundation, Inc.
 dnl  
 dnl  This program is free software; you can redistribute it and/or modify
 dnl  it under the terms of the GNU General Public License as published by
diff --git a/gui/gtk/gtk_canvas.h b/gui/gtk/gtk_canvas.h
index 5c1a2f2..7f17df4 100644
--- a/gui/gtk/gtk_canvas.h
+++ b/gui/gtk/gtk_canvas.h
@@ -1,6 +1,6 @@
 // gnash-canvas.h: Gtk canvas widget for gnash
 // 
-//   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+//   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/gui/gtk/gtk_glue_gtkglext.h b/gui/gtk/gtk_glue_gtkglext.h
index 1bdaa1f..c6b721d 100644
--- a/gui/gtk/gtk_glue_gtkglext.h
+++ b/gui/gtk/gtk_glue_gtkglext.h
@@ -23,6 +23,10 @@
 #include "gnashconfig.h"
 #endif
 
+#include <gtk/gtk.h>
+#include <gdk/gdk.h>
+#include <boost/scoped_array.hpp>
+
 #include <gtk/gtkgl.h>
 
 #include "Renderer_ogl.h"
diff --git a/macros/x11.m4 b/macros/x11.m4
index 1da0126..06b68ef 100644
--- a/macros/x11.m4
+++ b/macros/x11.m4
@@ -55,11 +55,13 @@ AC_DEFUN([GNASH_PATH_X11],
   AC_MSG_CHECKING([for X11 headers])
   if test x"${ac_cv_path_x11_incl}" != x ; then
     dnl Don't pass -I/usr/include
-    dnl if test x"${ac_cv_path_x11_incl}" != "x-I/usr/include"; then
+    if test x"${ac_cv_path_x11_incl}" != "x-I/usr/include"; then
        X11_CFLAGS="${ac_cv_path_x11_incl}"
-    dnl fi
+    fi
+    x11_incl=yes
     AC_MSG_RESULT(${ac_cv_path_x11_incl})
   else
+    x11_incl=""
     X11_CFLAGS=""
     AC_MSG_RESULT(none)
   fi
@@ -131,7 +133,7 @@ AC_DEFUN([GNASH_PATH_X11],
     AC_MSG_RESULT(none)
   fi
 
-  if test -n "$X11_LIBS" -a -n "$X11_CFLAGS"; then
+  if test -n "$X11_LIBS" -a -n "$x11_incl"; then
     x11=yes
   fi
 

-----------------------------------------------------------------------

Summary of changes:
 configure.ac                |    2 +-
 gui/gtk/gtk_canvas.h        |    2 +-
 gui/gtk/gtk_glue_gtkglext.h |    4 ++++
 macros/x11.m4               |    8 +++++---
 4 files changed, 11 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Gnash