summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPadraig O'Briain <padraig.obriain@sun.com>2004-11-17 09:31:59 +0000
committerPadraig O'Briain <padraigo@src.gnome.org>2004-11-17 09:31:59 +0000
commit46270d7db51b3808ffc2aa0324272159bb6e792c (patch)
tree4fb62b29c1085b7abb5ca26f9dc54a80417fb093
parentfc1302b92621477e5e1cbd81f454635f89faf5c1 (diff)
downloadatk-46270d7db51b3808ffc2aa0324272159bb6e792c.tar.gz
Use gmodule-no-export.pc, requires glib 2.5.7. Patch from Matthias Clasen
2004-11-17 Padraig O'Briain <padraig.obriain@sun.com> * configure.in: Use gmodule-no-export.pc, requires glib 2.5.7. Patch from Matthias Clasen for bug #158531. Incremented version to 1.9.0. Branch for gnome-2-8 has been created.
-rw-r--r--ChangeLog9
-rw-r--r--configure.in8
2 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 4889c6f..dc10337 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-17 Padraig O'Briain <padraig.obriain@sun.com>
+
+ * configure.in: Use gmodule-no-export.pc, requires glib 2.5.7.
+ Patch from Matthias Clasen for bug #158531.
+ Incremented version to 1.9.0.
+ Branch for gnome-2-8 has been created.
+
2004-11-11 Christian Rose <menthos@menthos.com>
* configure.in: Added "as" to ALL_LINGUAS.
@@ -7,7 +14,7 @@
* docs/atk-docs.sgml: Add a more descriptive title in the docs.
Patch from Diego Gonzalez. (bug #156296)
- * atk/text.c (Clarify meaning of endd_offset for
+ * atk/text.c (Clarify meaning of end_offset for
atk_text_get_text_at_offset().
Patch from Bill Haneman. (bug #156574)
diff --git a/configure.in b/configure.in
index 0c437fe..b228e85 100644
--- a/configure.in
+++ b/configure.in
@@ -16,7 +16,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], [8])
+m4_define([atk_minor_version], [9])
m4_define([atk_micro_version], [0])
m4_define([atk_version],
[atk_major_version.atk_minor_version.atk_micro_version])
@@ -53,7 +53,7 @@ dnl it too, or it will never make it into the spec file!
dnl
dnl ==========================================================================
-GLIB_REQUIRED_VERSION=2.0.0
+GLIB_REQUIRED_VERSION=2.5.7
AC_SUBST(GLIB_REQUIRED_VERSION)
@@ -140,7 +140,7 @@ if test "x$GCC" = "xyes"; then
fi
changequote([,])dnl
-GLIB_PACKAGES="gobject-2.0 gmodule-2.0"
+GLIB_PACKAGES="gobject-2.0 gmodule-no-export-2.0"
AC_SUBST(GLIB_PACKAGES)
dnl This PATH_GLIB is somewhat redundant, but does a sanity compile and
@@ -152,7 +152,7 @@ AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION, :,
*** GLIB is always available from ftp://ftp.gtk.org/. If GLIB is installed
*** but not in the same location as pkg-config add the location of the file
*** glib-2.0.pc to the environment variable PKG_CONFIG_PATH.]),
- gobject gmodule)
+ gobject gmodule-no-export)
PKG_CHECK_MODULES(DEP, glib-2.0 >= $GLIB_REQUIRED_VERSION $GLIB_PACKAGES, ,
AC_MSG_ERROR([