Add and define PYGTK_[MAJOR,MINOR,MACRO]_VERSION. Also add

2001-12-14  Johan Dahlin  <jdahlin@telia.com>

	* configure.in (PYGTK_MINOR_VERSION): Add and define
	PYGTK_[MAJOR,MINOR,MACRO]_VERSION. Also add *_REQUIRED_VERSION
	for dependencies.

	* gtk/gtkmodule.c (init_gtk): remove gtk_major_version,
	gtk_minor_version and gtk_macro_version and replace them with
	gtk_version,
	Add pygtk_version.

2 files changed, 44 insertions, 26 deletions

diff --git a/configure.in b/configure.in
index 10127ab4..44ead902 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,21 @@
 AC_INIT(pygtk, 1.99.5,
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-python&component=pygtk])
+	
+PYGTK_MAJOR_VERSION=1
+PYGTK_MINOR_VERSION=99
+PYGTK_MICRO_VERSION=5
+PYGTK_VERSION=$PYGTK_MAJOR_VERSION.$PYGTK_MINOR_VERSION.$PYGTK_MICRO_VERSION
+
+AC_DEFINE_UNQUOTED(PYGTK_MAJOR_VERSION, $PYGTK_MAJOR_VERSION, [PyGtk major version])
+AC_DEFINE_UNQUOTED(PYGTK_MINOR_VERSION, $PYGTK_MINOR_VERSION, [PyGtk minor version])
+AC_DEFINE_UNQUOTED(PYGTK_MICRO_VERSION, $PYGTK_MICRO_VERSION, [PyGtk macro version])
+
+GLIB_REQUIRED_VERSION=1.3.11
+ATK_REQUIRED_VERSION=0.7
+PANGO_REQUIRED_VERSION=0.22
+GTK_REQUIRED_VERSION=1.3.11
+LIBGLADE_REQUIRED_VERSION=1.99.1
+
 AC_CONFIG_SRCDIR([gtk/gtkmodule.c])
 AM_CONFIG_HEADER(config.h)
 
@@ -46,19 +62,25 @@ else
   AC_MSG_RESULT(no)
 fi
 
-AM_PATH_GLIB_2_0(1.3.11,,[AC_MSG_ERROR(maybe you want the gtk-gnome-1-2 branch?)],gobject)
-PKG_CHECK_MODULES(PANGO, pango >= 0.22,,[AC_MSG_ERROR(maybe you want the gtk-gnome-1-2 branch?)])
-AC_SUBST(PANGO_CFLAGS)
-AC_SUBST(PANGO_LIBS)
-AM_PATH_GTK_2_0(1.3.11,,[AC_MSG_ERROR(maybe you want the gtk-gnome-1-2 branch?)],$extra_mods)
+dnl glib
+AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION,,[AC_MSG_ERROR(maybe you want the gtk-gnome-1-2 branch?)],gobject)
 
-PKG_CHECK_MODULES(ATK, atk >= 0.7,,[AC_MSG_ERROR(maybe you want the gtk-gnome-1-2 branch?)])
+dnl atk
+PKG_CHECK_MODULES(ATK, atk >= $ATK_REQUIRED_VERSION,,[AC_MSG_ERROR(maybe you want the gtk-gnome-1-2 branch?)])
 AC_SUBST(ATK_CFLAGS)
 AC_SUBST(ATK_LIBS)
 
-dnl check for libglade ...
+dnl pango
+PKG_CHECK_MODULES(PANGO, pango >= $PANGO_REQUIRED_VERSION,,[AC_MSG_ERROR(maybe you want the gtk-gnome-1-2 branch?)])
+AC_SUBST(PANGO_CFLAGS)
+AC_SUBST(PANGO_LIBS)
+
+dnl gtk+
+AM_PATH_GTK_2_0($GTK_REQUIRED_VERSION,,[AC_MSG_ERROR(maybe you want the gtk-gnome-1-2 branch?)],$extra_mods)
+
+dnl libglade
 build_libglade=false
-PKG_CHECK_MODULES(LIBGLADE, [libglade-2.0 >= 1.99.1],
+PKG_CHECK_MODULES(LIBGLADE, [libglade-2.0 >= $LIBGLADE_REQUIRED_VERSION],
   build_libglade=true,
   build_libglade=false)
 AC_SUBST(LIBGLADE_CFLAGS)
diff --git a/gtk/gtkmodule.c b/gtk/gtkmodule.c
index 187483fb..6bca5caa 100644
--- a/gtk/gtkmodule.c
+++ b/gtk/gtkmodule.c
@@ -31,7 +31,7 @@ static struct _PyGtk_FunctionStruct functions = {
 DL_EXPORT(void)
 init_gtk(void)
 {
-    PyObject *m, *d, *v;
+    PyObject *m, *d, *v, *tuple;
     PyObject *av;
     int argc, i;
     char **argv;
@@ -77,26 +77,22 @@ init_gtk(void)
     m = Py_InitModule("gtk._gtk", pygtk_functions);
     d = PyModule_GetDict(m);
 
-    v = PyInt_FromLong(gtk_major_version);
-    if (v != NULL) {
-	PyDict_SetItemString(d, "major_version", v);
-	Py_DECREF(v);
-    }
-    v = PyInt_FromLong(gtk_minor_version);
-    if (v != NULL) {
-	PyDict_SetItemString(d, "minor_version", v);
-	Py_DECREF(v);
-    }
-    v = PyInt_FromLong(gtk_micro_version);
-    if (v != NULL) {
-	PyDict_SetItemString(d, "micro_version", v);
-	Py_DECREF(v);
-    }
-    
+    /* gtk+ version */
+    tuple = Py_BuildValue ("(iii)", gtk_major_version, gtk_minor_version,
+			   gtk_micro_version);
+    PyDict_SetItemString(d, "gtk_version", tuple);    
+    Py_DECREF(tuple);
+	
+    /* pygtk version */
+    tuple = Py_BuildValue ("(iii)", PYGTK_MAJOR_VERSION, PYGTK_MINOR_VERSION,
+			   PYGTK_MICRO_VERSION);
+    PyDict_SetItemString(d, "pygtk_version", tuple);
+    Py_DECREF(tuple);
+	
     _pygtk_register_boxed_types(d);
     pygtk_register_classes(d);
     pygtk_add_constants(m, "GTK_");
-
+    
     /* for addon libraries ... */
     PyDict_SetItemString(d, "_PyGtk_API",
 			 PyCObject_FromVoidPtr(&functions, NULL));