-AC_INIT([at-spi2-atk], [0.3.90], [accessibility-atspi@lists.linux-foundation.org])
+AC_INIT([at-spi2-atk], [1.91.3], [accessibility-atspi@lists.linux-foundation.org])
AC_CONFIG_AUX_DIR(config)
AT_SPI_ATK_MAJOR_VERSION=0
AC_SUBST(GLIB_LIBS)
AC_SUBST(GLIB_CFLAGS)
-PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= 0.7.0])
+PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.90, dbus_glib=yes, dbus_glib=no)
+if test "x$dbus_glib" = "xno"; then
+ PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.7.0, dbus_glib_old=yes)
+fi
AC_SUBST(DBUS_GLIB_LIBS)
AC_SUBST(DBUS_GLIB_CFLAGS)
fi
AM_CONDITIONAL(RELOCATE, test x$enable_relocate = xyes)
+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)
DBIND_CHECK_ALIGNOF(dbind_struct)
CPPFLAGS=$orig_CPPFLAGS
+if test "x$dbus_glib_old" = "xyes"; then
+ P2P_CFLAGS=-DDISABLE_P2P
+fi
+
+if test "x$enable_p2p" = "xno"; then
+ P2P_CFLAGS=-DDISABLE_P2P
+fi
+
+AC_SUBST(P2P_CFLAGS)
+
AC_CONFIG_FILES([Makefile
dbind/dbind-config.h
dbind/Makefile
])
AC_OUTPUT
+
+if test "x$dbus_glib_old" = "xyes"; then
+ P2P_CFLAGS=-DDISABLE_P2P
+ AC_MSG_WARN([found dbus-glib older than 0.90; disabling peer-to-peer support])
+fi