[gtkglext] [GB#603829] Use single GTK+ includes

[Mukund Sivaraman <muks src gnome org>]

commit 00f05b44359c3894f7f6a9b6c836489579cf749b
Author: Javier Jardón <jjardon gnome org>
Date:   Sat Dec 5 10:21:55 2009 +0530

    [GB#603829] Use single GTK+ includes
    
    This is a slightly modified patch from the one by Javier Jardón.

 configure.ac      |    7 ++++++-
 gdk/gdkglwindow.c |    2 +-
 gtk/gtkglwidget.c |    2 --
 gtk/gtkglwidget.h |    4 +---
 4 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index bc617c1..65fb73f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,10 @@ m4_define([gdk_required_version], [2.0.0])
 m4_define([gtk_pkg], [gtk+-2.0])
 m4_define([gtk_required_version], [2.4.0])
 
+# ATK
+m4_define([atk_pkg], [atk])
+m4_define([atk_required_version], [1.28.0])
+
 
 # Process this file with autoconf to produce a configure script.
 AC_INIT([gtkglext], [gtkglext_version],
@@ -312,6 +316,7 @@ gtk_pkg >= gtk_required_version \
 gdk_pkg >= gdk_required_version \
 pango_pkg >= pango_required_version \
 pangox_pkg >= pangox_required_version \
+atk_pkg >= atk_required_version \
 gmodule_pkg >= gmodule_required_version \
 ])
 
@@ -748,7 +753,7 @@ LIBS="$save_LIBS"
 # CFLAGS and LIBS
 ##################################################
 
-GDKGLEXT_PACKAGES="gdk_pkg pango_pkg pangox_pkg gmodule_pkg"
+GDKGLEXT_PACKAGES="gdk_pkg pango_pkg pangox_pkg atk_pkg gmodule_pkg"
 GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
 GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
 GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`"
diff --git a/gdk/gdkglwindow.c b/gdk/gdkglwindow.c
index 05eb44b..0c0fbcc 100644
--- a/gdk/gdkglwindow.c
+++ b/gdk/gdkglwindow.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
  */
 
-#include <gtk/gtkversion.h>
+#include <gtk/gtk.h>
 
 #include "gdkglprivate.h"
 #include "gdkglconfig.h"
diff --git a/gtk/gtkglwidget.c b/gtk/gtkglwidget.c
index ecb41ef..933e1a6 100644
--- a/gtk/gtkglwidget.c
+++ b/gtk/gtkglwidget.c
@@ -16,8 +16,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
  */
 
-#include <gtk/gtkmain.h>
-
 #include "gtkglprivate.h"
 #include "gtkglwidget.h"
 
diff --git a/gtk/gtkglwidget.h b/gtk/gtkglwidget.h
index fd6ad2a..13292f6 100644
--- a/gtk/gtkglwidget.h
+++ b/gtk/gtkglwidget.h
@@ -20,10 +20,8 @@
 #define __GTK_GL_WIDGET_H__
 
 #include <gdk/gdk.h>
-
 #include <gdk/gdkgl.h>
-
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS