dnl The triplet
m4_define([atk_major_version], [2])
-m4_define([atk_minor_version], [13])
-m4_define([atk_micro_version], [90])
+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])
+AM_GNU_GETTEXT([external])
+
GETTEXT_PACKAGE=atk10
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"],
[Define the gettext package to be used])
-ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
-AM_GLIB_GNU_GETTEXT
-
# 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
AC_PROG_AWK
AC_CHECK_PROGS(PERL, perl5 perl)
+# Check whether MSVC toolset is explicitly set
+AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x])
+AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x])
+
REBUILD=\#
if test "x$enable_rebuilds" = "xyes" && \
test -n "$PERL" && \
fi
AC_SUBST(REBUILD)
-# option to specify python interpreter to use; this just sets $PYTHON, so that
-# we will fallback to reading $PYTHON if --with-python is not given, and
-# python.m4 will get the expected input.
-# This dependency on Python is for 'make dist', so normal builds would not
-# need Python
-AC_ARG_WITH(python,
- AS_HELP_STRING([--with-python=PATH],
- [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]),
- [PYTHON="$withval"], [])
-if test x"$PYTHON" = xyes; then
- AC_MSG_ERROR([--with-python option requires a path or program argument])
-fi
-AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
-
# Check for the visibility flags
ATK_HIDDEN_VISIBILITY_CFLAGS=""
case "$host" in
esac
AC_SUBST(ATK_HIDDEN_VISIBILITY_CFLAGS)
-GNOME_COMPILE_WARNINGS([maximum])
-
AC_CONFIG_FILES([
Makefile
po/Makefile.in
atk.pc
-atk-uninstalled.pc
atk/Makefile
atk/atk.rc
atk/atkversion.h
tests/Makefile
-build/Makefile
-build/win32/Makefile
-build/win32/vs9/Makefile
-build/win32/vs10/Makefile
-build/win32/vs11/Makefile
-build/win32/vs12/Makefile
+win32/Makefile
+win32/vs9/Makefile
+win32/vs9/atk-version-paths.vsprops
+win32/vs10/Makefile
+win32/vs10/atk-version-paths.props
+win32/vs11/Makefile
+win32/vs12/Makefile
+win32/vs14/Makefile
+win32/vs15/Makefile
docs/Makefile
-docs/version.xml
-atk.spec
-atk-zip.sh
config.h.win32
])