-AC_INIT([at-spi2-core], [2.25.2], [accessibility-atspi@lists.linux-foundation.org])
+AC_INIT([at-spi2-core], [2.26.1], [accessibility-atspi@lists.linux-foundation.org])
AC_PREREQ([2.59])
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR([m4])
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)
-AM_INIT_AUTOMAKE([1.9 -Wall foreign no-dist-gzip dist-xz])
+AM_INIT_AUTOMAKE([1.13 -Wall -Wno-portability foreign subdir-objects no-dist-gzip dist-xz])
# Support silent build rules. Disable
# by either passing --disable-silent-rules to configure or passing V=1
# to make
AM_SILENT_RULES([yes])
-AC_PROG_CC
-AM_PROG_AR
+AM_PROG_CC_C_O
LT_INIT([disable-static])
PKG_PROG_PKG_CONFIG
AC_CONFIG_HEADERS([config.h])
-dnl translation of at-spi strings
-IT_PROG_INTLTOOL([0.40.0])
+AC_PROG_SED
+AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT([external])
GETTEXT_PACKAGE="${PACKAGE}"
AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],
+ ["$GETTEXT_PACKAGE"],
+ [The prefix for our gettext translation domains.])
PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.0])
AC_SUBST(DBUS_LIBS)
AC_SUBST(GLIB_LIBS)
AC_SUBST(GLIB_CFLAGS)
+# Use pkg-config to find the glib-mkenums script
+GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+AC_SUBST(GLIB_MKENUMS)
+
PKG_CHECK_MODULES(GOBJ, [gobject-2.0 >= 2.0.0])
AC_SUBST(GOBJ_LIBS)
AC_SUBST(GOBJ_CFLAGS)
AC_SUBST(GIO_LIBS)
AC_SUBST(GIO_CFLAGS)
+PKG_CHECK_MODULES(APPSVC, [appsvc])
+AC_SUBST(APPSVC_LIBS)
+AC_SUBST(APPSVC_CFLAGS)
+
+PKG_CHECK_MODULES(VCONF, [vconf])
+AC_SUBST(VCONF_LIBS)
+AC_SUBST(VCONF_CFLAGS)
+
+PKG_CHECK_MODULES(AUL, [aul])
+AC_SUBST(AUL_LIBS)
+AC_SUBST(AUL_CFLAGS)
# --------------------------------------------------------------------
# Find DL functionality
X11_LIBS="$X11_LIBS $XINPUT_LIBS"
# XKB (optional)
- PKG_CHECK_MODULES(XKB, [xkbcommon-x11], [
+ AC_CHECK_LIB(X11, XkbGetMap, [
AC_DEFINE(HAVE_XKB, 1, [Define to use XKB])
- X11_CFLAGS="$X11_CFLAGS $XKB_CFLAGS"
- X11_LIBS="$X11_LIBS $XKB_LIBS"
- ], [])
+ ], [:])
])
AC_SUBST(X11_CFLAGS)
fi
AC_SUBST(DBUS_SERVICES_DIR)
-AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
-
-GOBJECT_INTROSPECTION_CHECK([0.9.6])
+GOBJECT_INTROSPECTION_CHECK([1.32.0])
AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
AC_CHECK_ALIGNOF(dbind_struct, [AC_INCLUDES_DEFAULT
typedef struct {char s1;} dbind_struct;])
-GTK_DOC_CHECK([1.09])
+GTK_DOC_CHECK([1.25])
if test "x$GCC" = xyes; then
CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
fi
+
CPPFLAGS=$orig_CPPFLAGS
-AC_CONFIG_FILES([Makefile po/Makefile.in
+
+AC_CONFIG_FILES([
+ Makefile
+ po/Makefile.in
xml/Makefile
dbind/Makefile
atspi/Makefile
registryd/Makefile
bus/Makefile
-doc/Makefile
-doc/libatspi/Makefile
-doc/libatspi/version.xml
-test/Makefile
-atspi-2.pc
-atspi-2-uninstalled.pc
+ doc/Makefile
+ doc/libatspi/Makefile
+ doc/libatspi/version.xml
+ test/Makefile
+ atspi-2.pc
])
AC_OUTPUT