Add gtk-2.24 autotools support

6 files changed, 33 insertions, 0 deletions

diff --git a/configure.ac b/configure.ac
index a6a5c59f..6a5d7683 100644
--- a/configure.ac
+++ b/configure.ac
@@ -368,6 +368,23 @@ if test "x$have_pycairo" = "xtrue"; then
   AC_SUBST(HAVE_GTK_2_22)
   AC_DEFINE([HAVE_GTK_2_22], [$have_gtk_222], [If Gtk 2.22 was found])
 
+  dnl check for gtk 2.24
+  PKG_CHECK_MODULES(GTK224, gtk+-2.0 >= 2.24.0,
+	  HAVE_GTK_224="yes", HAVE_GTK_224="no")
+
+  if test "x$HAVE_GTK_224" = "xyes"; then
+     gtk_version="2.24"
+     have_gtk_224=true
+     PYGTK_CODEGEN_DEFINES="$PYGTK_CODEGEN_DEFINES -DHAVE_GTK_2_24"
+  else
+     AC_MSG_RESULT(no)
+     have_gtk_224=false
+  fi
+
+  AM_CONDITIONAL(HAVE_GTK_2_24, $have_gtk_224)
+  AC_SUBST(HAVE_GTK_2_24)
+  AC_DEFINE([HAVE_GTK_2_24], [$have_gtk_224], [If Gtk 2.24 was found])
+
   dnl libglade
   PKG_CHECK_MODULES(LIBGLADE, [libglade-2.0 >= libglade_required_version],
 	  have_libglade=true, have_libglade=false)
@@ -400,6 +417,7 @@ else
   AM_CONDITIONAL(HAVE_GTK_2_18, false)
   AM_CONDITIONAL(HAVE_GTK_2_20, false)
   AM_CONDITIONAL(HAVE_GTK_2_22, false)
+  AM_CONDITIONAL(HAVE_GTK_2_24, false)
   AM_CONDITIONAL(BUILD_LIBGLADE, false)
   AM_CONDITIONAL(BUILD_GTKUNIXPRINT, false)
   have_pangocairo=false
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 3806f540..7bb5d0c8 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -83,6 +83,11 @@ GTK_2_22_DEFS =
 	gtk-2.22.defs		\
 	gtk-2.22-types.defs
 
+GTK_2_24_DEFS =
+	gdk-2.24.defs		\
+	gtk-2.24.defs		\
+	gtk-2.24-types.defs
+
 if HAVE_GTK_2_10
 GDK_DEFS += gdk-2.10.defs 
 GTK_DEFS += gtk-2.10.defs 
@@ -128,6 +133,12 @@ GTK_DEFS += gtk-2.22.defs
 GTK_TYPES_DEFS += gtk-2.22-types.defs
 endif
 
+if HAVE_GTK_2_24
+GDK_DEFS += gdk-2.24.defs
+GTK_DEFS += gtk-2.24.defs
+GTK_TYPES_DEFS += gtk-2.24-types.defs
+endif
+
 CREATEDEFS = $(PYTHON) $(CODEGENDIR)/createdefs.py
 
 GDK_OVERRIDES = \
@@ -181,6 +192,7 @@ EXTRA_DIST += 			\
 	$(GTK_2_18_DEFS)	\
 	$(GTK_2_20_DEFS)	\
 	$(GTK_2_22_DEFS)	\
+	$(GTK_2_24_DEFS)	\
 	$(GTK_OVERRIDES)
 
 
diff --git a/gtk/gdk-2.24.defs b/gtk/gdk-2.24.defs
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/gtk/gdk-2.24.defs
diff --git a/gtk/gtk-2.24-types.defs b/gtk/gtk-2.24-types.defs
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/gtk/gtk-2.24-types.defs
diff --git a/gtk/gtk-2.24.defs b/gtk/gtk-2.24.defs
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/gtk/gtk-2.24.defs
diff --git a/setup.py b/setup.py
index 8b8c3843..42c556c8 100755
--- a/setup.py
+++ b/setup.py
@@ -143,6 +143,7 @@ PyGtkBuild.user_options.append(('enable-threading', None,
 # FOR A NEW RELEASE, YOU USUALLY ONLY NEED TO CHANGE THE FOLLOWING
 # These defs are registered with many modules...
 gdk_defs = [
+    'gtk/gdk-2.24.defs',
     'gtk/gdk-2.22.defs',
     'gtk/gdk-2.20.defs',
     'gtk/gdk-2.18.defs',
@@ -152,6 +153,7 @@ gdk_defs = [
     'gtk/gdk-2.10.defs',
     'gtk/gdk-base.defs']
 gtk_defs = [
+    'gtk/gtk-2.24.defs',
     'gtk/gtk-2.22.defs',
     'gtk/gtk-2.20.defs',
     'gtk/gtk-2.18.defs',
@@ -161,6 +163,7 @@ gtk_defs = [
     'gtk/gtk-2.10.defs',
     'gtk/gtk-base.defs']
 gtk_types_defs = [
+    'gtk/gtk-2.24-types.defs',
     'gtk/gtk-2.22-types.defs',
     'gtk/gtk-2.20-types.defs',
     'gtk/gtk-2.18-types.defs',