Revved to 0.10.1; made dependency on g-module-no-export a soft one.

Restores compatibility with gtk+.2.4.X.

diff --git a/ChangeLog b/ChangeLog
index f2786e0..a6c5f29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-04-28  Bill Haneman <billh@gnome.org>
+
+       * configure.in: Patch from Michael Meeks to
+       make atk 1.9's dependency on gtk+ 2.6 soft, i.e. 
+       don't require gmodule-no-export-2.0.
+       Restores compatibility of atk 1.9 series with gtK 2.4.X.
+
+       Revved to 1.10.1.
+
 2005-04-22  Tor Lillqvist  <tml@novell.com>
 
        * atk/atkobject.c: Initialize gettext before use. Calling

diff --git a/NEWS b/NEWS
index 60473aa..4578b55 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Changes in version 1.10.1
+=========================
+
+* added ATK_STATE_REQUIRED; see bug #172663.
+
+* New locale, 'rw'
+
 Changes in version 1.9.1
 ========================
 

diff --git a/configure.in b/configure.in
index 94a626e..2c8111b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ dnl set ATK_BINARY_AGE _and_ ATK_INTERFACE_AGE to 0.
 dnl The triplet 
 m4_define([atk_major_version], [1])
 m4_define([atk_minor_version], [10])
-m4_define([atk_micro_version], [0])
+m4_define([atk_micro_version], [1])
 m4_define([atk_version],
           [atk_major_version.atk_minor_version.atk_micro_version])
 
@@ -28,10 +28,10 @@ dnl Number of releases since we've added interfaces
 m4_define([atk_interface_age], [0])
 
 m4_define([atk_binary_age],
-          [m4_eval(100 * atk_minor_version + atk_micro_version)])
+          [m4_eval(100 * atk_minor_version + 10 + atk_micro_version)])
 
 m4_define([lt_current],
-          [m4_eval(100 * atk_minor_version + atk_micro_version - atk_interface_age)])`
+          [m4_eval(100 * atk_minor_version + 10 + atk_micro_version - atk_interface_age)])`
 m4_define([lt_revision], [atk_interface_age])
 m4_define([lt_age], [m4_eval(atk_binary_age - atk_interface_age)])
 m4_define([lt_version_info], [lt_current:lt_revision:lt_age])
@@ -53,10 +53,6 @@ dnl it too, or it will never make it into the spec file!
 dnl
 dnl ==========================================================================
 
-GLIB_REQUIRED_VERSION=2.5.7
-AC_SUBST(GLIB_REQUIRED_VERSION)
-
-
 ATK_MAJOR_VERSION=atk_major_version
 ATK_MINOR_VERSION=atk_minor_version
 ATK_MICRO_VERSION=atk_micro_version
@@ -140,8 +136,17 @@ if test "x$GCC" = "xyes"; then
 fi
 changequote([,])dnl
 
-GLIB_PACKAGES="gobject-2.0 gmodule-no-export-2.0"
+AM_PATH_GLIB_2_0(2.5.7,have_no_export=true,have_no_export=false)
+if test "x$have_no_export" = "xtrue"; then
+   GLIB_REQUIRED_VERSION=2.5.7
+   glib_no_export_package="gmodule-no-export-2.0"
+else
+   GLIB_REQUIRED_VERSION=2.0.0
+   glib_no_export_package=
+fi
+GLIB_PACKAGES="gobject-2.0 $glib_no_export_package"
 AC_SUBST(GLIB_PACKAGES)
+AC_SUBST(GLIB_REQUIRED_VERSION)
 
 dnl This PATH_GLIB is somewhat redundant, but does a sanity compile and 
 dnl importantly defines the GLIB_GENMARSHAL variable for subst into the