dnl The triplet
m4_define([atk_major_version], [2])
-m4_define([atk_minor_version], [24])
-m4_define([atk_micro_version], [0])
+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])
[atk])
AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_SRCDIR([ChangeLog])
+AC_CONFIG_SRCDIR([README])
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.10 -Wno-portability])
+AM_INIT_AUTOMAKE([1.11 foreign -Wno-portability no-dist-gzip dist-xz tar-ustar])
# Support silent build rules, requires at least automake-1.11. Disable
# by either passing --disable-silent-rules to configure or passing V=1
changequote([,])dnl
GLIB_REQUIRED_VERSION=2.31.2
-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
-dnl Makefile
-AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION, :,
- AC_MSG_ERROR([
-*** GLIB $GLIB_REQUIRED_VERSION or better is required. The latest version of
-*** 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)
-
-PKG_CHECK_MODULES(DEP, glib-2.0 >= $GLIB_REQUIRED_VERSION $GLIB_PACKAGES, ,
- AC_MSG_ERROR([
- *** GLib not found. You can find it on ftp://ftp.gtk.org
- *** Errors follow:
- $DEP_PKG_ERRORS]))
-
-# Rerun PKG_CONFIG to add gthread-2.0 cflags, but not libs
-DEP_CFLAGS=`$PKG_CONFIG --cflags $GLIB_PACKAGES gthread-2.0`
+PKG_CHECK_MODULES(DEP, [gobject-2.0 >= $GLIB_REQUIRED_VERSION])
+AC_SUBST(DEP_CFLAGS)
+AC_SUBST(DEP_LIBS)
+
+GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
+AC_SUBST(GLIB_MKENUMS)
+AC_SUBST(GLIB_GENMARSHAL)
# i18n stuff
AM_GNU_GETTEXT_VERSION([0.19.2])
[Define the gettext package to be used])
# Introspection support
-GOBJECT_INTROSPECTION_CHECK([0.6.7])
+GOBJECT_INTROSPECTION_CHECK([1.32.0])
# Documentation support
-GTK_DOC_CHECK([1.13])
+GTK_DOC_CHECK([1.25])
# define a MAINT-like variable REBUILD which is set if Perl
# and awk are found, so autogenerated sources can be rebuilt
win32/vs14/Makefile
win32/vs15/Makefile
docs/Makefile
-docs/version.xml
-atk-zip.sh
config.h.win32
])