Updated Polish translation

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

diff --git a/configure.in b/configure.in
index 82ecc89..61fde31 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.54)
+AC_PREREQ(2.62)
 
 dnl ==========================================================================
 dnl                              Versioning              
@@ -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], [4])
-m4_define([atk_micro_version], [1])
+m4_define([atk_minor_version], [29])
+m4_define([atk_micro_version], [4])
 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], [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])
@@ -42,9 +42,11 @@ AC_INIT(atk, [atk_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=atk])
 AC_CONFIG_SRCDIR([ChangeLog])
 
+AC_CONFIG_MACRO_DIR([m4])
+
 AM_CONFIG_HEADER(config.h)
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([-Wno-portability])
 
 dnl ==========================================================================
 dnl
@@ -53,10 +55,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
@@ -86,22 +84,35 @@ AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"],
   [Define the gettext package to be used])
 
-ALL_LINGUAS="am az be bg bn ca cs cy da de en_GB el eo es fa fi fr ga he hi 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"
-AM_GLIB_GNU_GETTEXT
-
-GLIB_DEFINE_LOCALEDIR(atklocaledir)
-
-AC_CHECK_FUNCS(bind_textdomain_codeset)
-
 AC_PROG_CC
 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
+    case "$host" in
+      x86_64-*-*)
+       LIB_EXE_MACHINE_FLAG=X64
+       ;;
+      *)
+       LIB_EXE_MACHINE_FLAG=X86
+       ;;
+    esac
     ;;
   *)
     atk_native_win32=no
@@ -110,8 +121,15 @@ esac
 AC_MSG_RESULT([$atk_native_win32])
 AM_CONDITIONAL(OS_WIN32, test "$atk_native_win32" = "yes")
 
+AC_SUBST(LIB_EXE_MACHINE_FLAG)
+
 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)
 
@@ -126,6 +144,8 @@ AC_ARG_ENABLE(rebuilds,
                               [disable all source autogeneration rules])],,
               [enable_rebuilds=yes])
 
+CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DATK_DISABLE_SINGLE_INCLUDES"
+
 changequote(,)dnl
 if test "x$GCC" = "xyes"; then
   case " $CFLAGS " in
@@ -135,8 +155,10 @@ if test "x$GCC" = "xyes"; then
 fi
 changequote([,])dnl
 
-GLIB_PACKAGES="gobject-2.0 gmodule-2.0"
+GLIB_REQUIRED_VERSION=2.0.0
+GLIB_PACKAGES="gobject-2.0"
 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
@@ -147,7 +169,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)
 
 PKG_CHECK_MODULES(DEP, glib-2.0 >= $GLIB_REQUIRED_VERSION $GLIB_PACKAGES, ,
   AC_MSG_ERROR([
@@ -158,6 +180,12 @@ 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="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
+AM_GLIB_GNU_GETTEXT
+
+AC_CHECK_FUNCS(bind_textdomain_codeset)
+
+GOBJECT_INTROSPECTION_CHECK([0.6.7])
 
 GTK_DOC_CHECK([1.0])
 
@@ -185,6 +213,7 @@ atk/Makefile
 atk/atk.rc
 tests/Makefile
 docs/Makefile
+docs/version.xml
 atk.spec
 atk-zip.sh
 ])