Update deprecated autoconf macros and use new libtool syntax
# Process this file with automake to create Makefile.in.
# Process this file with automake to create Makefile.in.
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
SUBDIRS=atk tests docs po
SUBDIRS=atk tests docs po
dnl Process this file with autoconf to produce a configure script.
dnl Process this file with autoconf to produce a configure script.
dnl ==========================================================================
dnl Versioning
dnl ==========================================================================
dnl Versioning
m4_define([lt_version_info], [lt_current:lt_revision:lt_age])
m4_define([lt_current_minus_age], [m4_eval(lt_current - lt_age)])
m4_define([lt_version_info], [lt_current:lt_revision:lt_age])
m4_define([lt_current_minus_age], [m4_eval(lt_current - lt_age)])
+AC_INIT([atk],
+ [atk_version],
+ [http://bugzilla.gnome.org/enter_bug.cgi?product=atk],
+ [atk])
-AC_INIT(atk, [atk_version],
- [http://bugzilla.gnome.org/enter_bug.cgi?product=atk])
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([ChangeLog])
AC_CONFIG_SRCDIR([ChangeLog])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_MACRO_DIR([m4])
-AM_CONFIG_HEADER(config.h)
-
-AM_INIT_AUTOMAKE([-Wno-portability])
+AM_INIT_AUTOMAKE([1.10 -Wno-portability])
# Support silent build rules, requires at least automake-1.11. Disable
# by either passing --disable-silent-rules to configure or passing V=1
# Support silent build rules, requires at least automake-1.11. Disable
# by either passing --disable-silent-rules to configure or passing V=1
dnl ==========================================================================
dnl ==========================================================================
-GETTEXT_PACKAGE=atk10
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"],
- [Define the gettext package to be used])
-
-AM_DISABLE_STATIC
-AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
+
+# Initialize libtool
+LT_PREREQ([2.2])
+LT_INIT([disable-static win32-dll])
+
+AC_CHECK_FUNCS(bind_textdomain_codeset)
AC_MSG_CHECKING([for some Win32 platform])
case "$host" in
AC_MSG_CHECKING([for some Win32 platform])
case "$host" in
ACLOCAL="$ACLOCAL $ac_cv_atk_aclocal_flags"
AC_ARG_ENABLE(rebuilds,
ACLOCAL="$ACLOCAL $ac_cv_atk_aclocal_flags"
AC_ARG_ENABLE(rebuilds,
- [AC_HELP_STRING([--disable-rebuilds],
+ [AS_HELP_STRING([--disable-rebuilds],
[disable all source autogeneration rules])],,
[enable_rebuilds=yes])
[disable all source autogeneration rules])],,
[enable_rebuilds=yes])
# Rerun PKG_CONFIG to add gthread-2.0 cflags, but not libs
DEP_CFLAGS=`$PKG_CONFIG --cflags $GLIB_PACKAGES gthread-2.0`
# Rerun PKG_CONFIG to add gthread-2.0 cflags, but not libs
DEP_CFLAGS=`$PKG_CONFIG --cflags $GLIB_PACKAGES gthread-2.0`
+# i18n stuff
+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
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])
GOBJECT_INTROSPECTION_CHECK([0.6.7])
+# Documentation support
+GTK_DOC_CHECK([1.13])
# define a MAINT-like variable REBUILD which is set if Perl
# and awk are found, so autogenerated sources can be rebuilt
# define a MAINT-like variable REBUILD which is set if Perl
# and awk are found, so autogenerated sources can be rebuilt