dnl The triplet
m4_define([atk_major_version], [1])
-m4_define([atk_minor_version], [7])
-m4_define([atk_micro_version], [1])
+m4_define([atk_minor_version], [25])
+m4_define([atk_micro_version], [2])
m4_define([atk_version],
[atk_major_version.atk_minor_version.atk_micro_version])
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])
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
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
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)
[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
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
*** 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([
# 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 et eu fa fi fr ga gu he hi hr hu kn ko id is it ja li lv lt ml mk mn mr ms ne nl nn no pa pl pt pt_BR ro ru sk sl sq sr sr@ije sr@Latn sv ta tk tr uk vi wa yi zh_CN zh_TW"
+ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
AM_GLIB_GNU_GETTEXT
-AM_GLIB_DEFINE_LOCALEDIR(ATK_LOCALEDIR)
-
AC_CHECK_FUNCS(bind_textdomain_codeset)
GTK_DOC_CHECK([1.0])