-
-AC_INIT([at-spi-atk], [2.0.0], [accessibility-atspi@lists.linux-foundation.org])
+AC_INIT([at-spi2-atk], [2.9.3], [accessibility-atspi@lists.linux-foundation.org])
AC_CONFIG_AUX_DIR(config)
-AT_SPI_ATK_MAJOR_VERSION=2
-AT_SPI_ATK_MINOR_VERSION=0
-AT_SPI_ATK_MICRO_VERSION=0
+AT_SPI_ATK_MAJOR_VERSION=0
+AT_SPI_ATK_MINOR_VERSION=3
AT_SPI_ATK_INTERFACE_AGE=0
AT_SPI_ATK_BINARY_AGE=0
AT_SPI_ATK_VERSION="$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION"
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)
-AM_INIT_AUTOMAKE([-Wall foreign])
+AM_INIT_AUTOMAKE([-Wall foreign no-dist-gzip dist-xz])
+
+# Enable silent build when available (Automake 1.11)
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
AC_PROG_CC
-AM_PATH_PYTHON(2.4)
AM_DISABLE_STATIC
AM_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG
+GETTEXT_PACKAGE="${PACKAGE}"
+AC_SUBST(GETTEXT_PACKAGE)
+
AC_CONFIG_HEADERS([config.h])
PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.0])
AC_SUBST(DBUS_LIBS)
AC_SUBST(DBUS_CFLAGS)
-PKG_CHECK_MODULES(DROUTE, [droute-0.1 >= 0.1])
-AC_SUBST(DROUTE_LIBS)
-AC_SUBST(DROUTE_CFLAGS)
-
-PKG_CHECK_MODULES(DBIND, [dbind-0.1 >= 0.1])
-AC_SUBST(DBIND_LIBS)
-AC_SUBST(DBIND_CFLAGS)
-
-PKG_CHECK_MODULES(GLIB, [glib-2.0])
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.32.0])
AC_SUBST(GLIB_LIBS)
AC_SUBST(GLIB_CFLAGS)
-PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= 0.7.0])
-AC_SUBST(DBUS_GLIB_LIBS)
-AC_SUBST(DBUS_GLIB_CFLAGS)
-
PKG_CHECK_MODULES(GOBJ, [gobject-2.0 >= 2.0.0])
AC_SUBST(GOBJ_LIBS)
AC_SUBST(GOBJ_CFLAGS)
AC_SUBST(GMODULE_LIBS)
AC_SUBST(GMODULE_CFLAGS)
-PKG_CHECK_MODULES(LIB_XML, [libxml-2.0 >= 2.0.0])
-AC_SUBST(LIB_XML_LIBS)
-AC_SUBST(LIB_XML_CFLAGS)
-
-PKG_CHECK_MODULES(ATK, [atk >= 1.17.0])
+PKG_CHECK_MODULES(ATK, [atk >= 2.7.90])
AC_SUBST(ATK_LIBS)
AC_SUBST(ATK_CFLAGS)
-PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.10.0])
-AC_SUBST(GTK_LIBS)
-AC_SUBST(GTK_CFLAGS)
+PKG_CHECK_MODULES(ATSPI, [atspi-2 >= 2.9.3])
+AC_SUBST(ATSPI_LIBS)
+AC_SUBST(ATSPI_CFLAGS)
-AC_PATH_XTRA
-
-AC_ARG_VAR([DEFAULT_ATSPI_INTROSPECTION_PATH],
- [Set the default path for the install ofDBus introspection XML
- relative to the pkgdatadir.])
-if test -z "$DEFAULT_ATSPI_INTROSPECTION_PATH"; then
- DEFAULT_ATSPI_INTROSPECTION_PATH=dbus
-fi
+GLIB_GSETTINGS
-AC_ARG_VAR([GTK_MODULE_DIR],
- [Where to place the atk-adaptor gtk module])
-if test -z "$GTK_MODULE_DIR"; then
- GTK_MODULE_DIR=gtk-2.0/modules
-fi
+AC_ARG_ENABLE(p2p, [ --enable-p2p Allow peer-to-peer DBus connections [default=yes]], enable_p2p="$enableval", enable_p2p=yes)
#libtool option to strip symbols starting with cspi
LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^cspi]].*"'
AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
+# Extra libraries for sockets added by Willie Walker
+# based upon how SunStudio libraries work.
+#
+if test "$GCC" = yes; then
+ EXTRA_SOCKET_LIBS=""
+else
+ EXTRA_SOCKET_LIBS="-lsocket -lnsl"
+fi
+AC_SUBST(EXTRA_SOCKET_LIBS)
+
+dnl find sizes & alignments
+orig_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS"
+CPPFLAGS=$orig_CPPFLAGS
+
+if test "x$GCC" = xyes; then
+ CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
+fi
+
+if test "x$enable_p2p" = "xno"; then
+ P2P_CFLAGS=-DDISABLE_P2P
+fi
+
+AC_SUBST(P2P_CFLAGS)
+
AC_CONFIG_FILES([Makefile
- pkgconfig/cspi-1.0.pc
- pkgconfig/cspi-1.0-uninstalled.pc
- tests/Makefile
- common/Makefile
+ atk-bridge-2.0.pc
+ droute/Makefile
atk-adaptor/Makefile
- tests/dummyatk/Makefile
- tests/data/Makefile
- tests/pyatspi/Makefile
- tests/pyatspi/pasytest/Makefile
- tests/apps/Makefile
- tests/cspi/Makefile
- cspi/Makefile
- pyatspi/Makefile
+ atk-adaptor/adaptors/Makefile
+ atk-adaptor/gtk-2.0/Makefile
])
AC_OUTPUT