Revved to 1.20.0 for GNOME 2.20.0.

[platform/upstream/atk.git] / configure.in

diff --git a/configure.in b/configure.in
index a93ce37..74584a0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -16,8 +16,8 @@ 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], [5])
-m4_define([atk_micro_version], [5])
+m4_define([atk_minor_version], [20])
+m4_define([atk_micro_version], [0])
 m4_define([atk_version],
           [atk_major_version.atk_minor_version.atk_micro_version])
 
@@ -25,13 +25,13 @@ dnl The X.Y in -latk-X.Y line. This is expected to stay 1.0 until Atk 2.
 m4_define([atk_api_version], [1.0])
 
 dnl Number of releases since we've added interfaces
-m4_define([atk_interface_age], [4])
+m4_define([atk_interface_age], [1])
 
 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.0.0
-AC_SUBST(GLIB_REQUIRED_VERSION)
-
-
 ATK_MAJOR_VERSION=atk_major_version
 ATK_MINOR_VERSION=atk_minor_version
 ATK_MICRO_VERSION=atk_micro_version
@@ -91,7 +87,19 @@ AM_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 
-AC_MSG_CHECKING([for Win32])
+AC_MSG_CHECKING([for some Win32 platform])
+case "$host" in
+  *-*-mingw*|*-*-cygwin*)
+    platform_win32=yes
+    ;;
+  *)
+    platform_win32=no
+    ;;
+esac
+AC_MSG_RESULT([$platform_win32])
+AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
+
+AC_MSG_CHECKING([for native Win32 platform])
 case "$host" in
   *-*-mingw*)
     atk_native_win32=yes
@@ -104,7 +112,12 @@ AC_MSG_RESULT([$atk_native_win32])
 AM_CONDITIONAL(OS_WIN32, test "$atk_native_win32" = "yes")
 
 if test "$atk_native_win32" = "yes"; then
+  AC_CHECK_TOOL(WINDRES, windres, no)
+  if test "$WINDRES" = no; then
+    AC_MSG_ERROR([*** Could not find an implementation of windres in your PATH.])
+  fi
   AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
+
 fi
 AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)
 
@@ -128,8 +141,17 @@ if test "x$GCC" = "xyes"; then
 fi
 changequote([,])dnl
 
-GLIB_PACKAGES="gobject-2.0 gmodule-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
@@ -140,7 +162,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([
@@ -151,11 +173,9 @@ PKG_CHECK_MODULES(DEP, glib-2.0 >= $GLIB_REQUIRED_VERSION $GLIB_PACKAGES, ,
 # Rerun PKG_CONFIG to add gthread-2.0 cflags, but not libs
 DEP_CFLAGS=`$PKG_CONFIG --cflags $GLIB_PACKAGES gthread-2.0`
 
-ALL_LINGUAS="af am az be bg bn ca cs cy da de en_CA en_GB el eo es fa fi fr ga he hi hr hu kn ko id is it ja li lv lt ml mk mn ms ne nl nn no pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi yi zh_CN zh_TW"
+ALL_LINGUAS="af am ar as az be be@latin bg bn bn_IN bs ca cs cy da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kn ko ku li lt lv mk ml mn mr ms nb ne nl nn oc or pa pl pt pt_BR ro ru rw si sk sl sq sr sr@Latn sr@ije sv ta te th tk tr tt ug uk vi wa xh yi zh_CN zh_HK zh_TW"
 AM_GLIB_GNU_GETTEXT
 
-AM_GLIB_DEFINE_LOCALEDIR(ATK_LOCALEDIR)
-
 AC_CHECK_FUNCS(bind_textdomain_codeset)
 
 GTK_DOC_CHECK([1.0])