Hard-code GTK_BINARY_VERSION=2.2.0 for now; should stay the same until we

[~andy/gtk] / configure.in

diff --git a/configure.in b/configure.in
index eb8fa84a8976b120ad71fbfa953ddd5310ddde23..98abc61031af05f11ccce321d8eaedf2ac35d5b0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -32,9 +32,9 @@ GLIB_AC_DIVERT_BEFORE_HELP([
 #
 GTK_MAJOR_VERSION=2
 GTK_MINOR_VERSION=1
-GTK_MICRO_VERSION=3
-GTK_INTERFACE_AGE=0
-GTK_BINARY_AGE=103
+GTK_MICRO_VERSION=4
+GTK_INTERFACE_AGE=1
+GTK_BINARY_AGE=104
 GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
 dnl This is the X.Y used in -lgtk-FOO-X.Y
 GTK_API_VERSION=2.0
@@ -71,7 +71,7 @@ AC_SUBST(LT_CURRENT_MINUS_AGE)
 # locations. (Should this be backwards-compat instead?)
 #
 #GTK_BINARY_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$LT_CURRENT
-GTK_BINARY_VERSION=$GTK_MAJOR_VERSION.0.$LT_CURRENT
+GTK_BINARY_VERSION=2.2.0
 AC_SUBST(GTK_BINARY_VERSION)
 
 #
@@ -88,7 +88,7 @@ AC_SUBST(GDK_PIXBUF_MICRO)
 AC_SUBST(GDK_PIXBUF_VERSION)
 
 ## Versions of dependencies
-GLIB_REQUIRED_VERSION=2.1.3
+GLIB_REQUIRED_VERSION=2.1.4
 PANGO_REQUIRED_VERSION=1.0.1
 ATK_REQUIRED_VERSION=1.0.1
 
@@ -389,14 +389,11 @@ AC_SUBST(STRIP_BEGIN)
 AC_SUBST(STRIP_END)
 
 # i18n stuff
-ALL_LINGUAS="az be bg ca cs cy da de el en_GB en@IPA es et eu fa fi fr ga gl he hi hr hu ia it ja ko lt ms nl nn no pl pt pt_BR ro ru sk sl sp sr sv tr uk vi wa zh_TW zh_CN"
+ALL_LINGUAS="az be bg ca cs cy da de el en_GB en@IPA es et eu fa fi fr ga gl he hi hr hu ia it ja ko lt lv ms nl nn no pl pt pt_BR ro ru sk sl sp sr sv tr uk vi wa zh_TW zh_CN"
 AM_GLIB_GNU_GETTEXT
 LIBS="$LIBS $INTLLIBS"
 
-# AM_GLIB_GNU_GETTEXT above substs $DATADIRNAME
-# this is the directory where the *.{mo,gmo} files are installed
-gtklocaledir='${prefix}/${DATADIRNAME}/locale'
-AC_SUBST(gtklocaledir)
+AM_GLIB_DEFINE_LOCALEDIR(GTK_LOCALEDIR)
 
 dnl The DU4 header files don't provide library prototypes unless 
 dnl -std1 is given to the native cc.