Release v2.5.92

[platform/core/uifw/at-spi2-atk.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f6184a4..12bb593 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
-AC_INIT([at-spi2-atk], [0.1.3], [accessibility-atspi@lists.linux-foundation.org])
+AC_INIT([at-spi2-atk], [2.5.92], [accessibility-atspi@lists.linux-foundation.org])
 AC_CONFIG_AUX_DIR(config)
 
 AT_SPI_ATK_MAJOR_VERSION=0
-AT_SPI_ATK_MINOR_VERSION=1
+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"
@@ -20,13 +20,19 @@ AC_SUBST(LT_CURRENT)
 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_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])
@@ -37,10 +43,6 @@ PKG_CHECK_MODULES(GLIB, [glib-2.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)
@@ -49,39 +51,17 @@ PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.0.0])
 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.1.5])
 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)
-
-AC_PATH_XTRA
+PKG_CHECK_MODULES(ATSPI, [atspi-2 >= 2.1.4])
+AC_SUBST(ATSPI_LIBS)
+AC_SUBST(ATSPI_CFLAGS)
 
-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)
+GLIB_GSETTINGS
 
-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
-
-AC_ARG_ENABLE(relocate, [  --enable-relocate  Relocate to coexist with CORBA [default=no]], enable_relocate="$enableval", enable_relocate=no)
-if test x$enable_relocate = xyes ; then
-       AC_DEFINE(RELOCATE, , [Relocate to coexist with CORBA])
-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]].*"'
@@ -110,13 +90,25 @@ DBIND_CHECK_ALIGNOF(dbind_pointer)
 DBIND_CHECK_ALIGNOF(dbind_struct)
 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
-                droute/Makefile
-                dbind/Makefile
+                atk-bridge-2.0.pc
                 dbind/dbind-config.h
-                common/Makefile
+                dbind/Makefile
+                droute/Makefile
                 atk-adaptor/Makefile
-                tests/Makefile
+                atk-adaptor/adaptors/Makefile
+                atk-adaptor/gtk-2.0/Makefile
+                 schemas/Makefile
                ])
 
 AC_OUTPUT