-AC_INIT([at-spi2-atk], [0.1.2], [accessibility-atspi@lists.linux-foundation.org])
+AC_INIT([at-spi2-atk], [0.1.5], [accessibility-atspi@lists.linux-foundation.org])
AC_CONFIG_AUX_DIR(config)
AT_SPI_ATK_MAJOR_VERSION=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])
AC_SUBST(GLIB_LIBS)
AC_SUBST(GLIB_CFLAGS)
AC_PATH_XTRA
+if test x$no_x = xyes ; then
+ AC_MSG_ERROR([X development libraries not found])
+else
+ X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+fi
+AC_SUBST(X_LIBS)
+
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
+ DEFAULT_ATSPI_INTROSPECTION_PATH=at-spi2/dbus
fi
AC_ARG_ENABLE(relocate, [ --enable-relocate Relocate to coexist with CORBA [default=no]], enable_relocate="$enableval", enable_relocate=no)
fi
AC_SUBST(EXTRA_SOCKET_LIBS)
+dnl find sizes & alignments
+orig_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS"
+DBIND_CHECK_ALIGNOF(char)
+DBIND_CHECK_ALIGNOF(dbus_bool_t)
+DBIND_CHECK_ALIGNOF(dbus_int16_t)
+DBIND_CHECK_ALIGNOF(dbus_int32_t)
+DBIND_CHECK_ALIGNOF(dbus_int64_t)
+DBIND_CHECK_ALIGNOF(double)
+DBIND_CHECK_ALIGNOF(dbind_pointer)
+DBIND_CHECK_ALIGNOF(dbind_struct)
+CPPFLAGS=$orig_CPPFLAGS
+
AC_CONFIG_FILES([Makefile
+ dbind/dbind-config.h
+ dbind/Makefile
+ droute/Makefile
common/Makefile
atk-adaptor/Makefile
- tests/Makefile
+ atk-adaptor/adaptors/Makefile
])
AC_OUTPUT