Fix for BGO#657585: The bus launcher should not flush a NULL display

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

diff --git a/configure.ac b/configure.ac
index 3d82d3f..18bddf3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([at-spi2-core], [1.91.4], [accessibility-atspi@lists.linux-foundation.org])
+AC_INIT([at-spi2-core], [2.1.5], [accessibility-atspi@lists.linux-foundation.org])
 AC_PREREQ([2.59])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR([m4])
@@ -42,19 +42,19 @@ AC_SUBST(DBUS_CFLAGS)
 PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.26.0])
 AC_SUBST(GLIB_LIBS)
 AC_SUBST(GLIB_CFLAGS)
-AC_CHECK_LIB([glib-2.0], [g_ptr_array_new_with_free_func], [],
+AC_CHECK_LIB([glib-2.0], [g_ptr_array_new_with_free_func], [:],
        [AC_MSG_ERROR([The version of glib-2.0 found does not define ]
                [g_ptr_array_new_with_free_func. Please upgrade glib.])],
        [$GLIB_LIBS])
 
-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)
 
+PKG_CHECK_MODULES(GIO, [gio-2.0 >= 2.28])
+AC_SUBST(GIO_LIBS)
+AC_SUBST(GIO_CFLAGS)
+
 # --------------------------------------------------------------------
 # Find DL functionality
 
@@ -171,17 +171,6 @@ GOBJECT_INTROSPECTION_CHECK([0.9.6])
 
 AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
 
-AC_ARG_ENABLE([relocate],
-       [AS_HELP_STRING([--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_SUBST(enable_relocate)
-
 dnl find sizes & alignments
 orig_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS"
@@ -196,6 +185,9 @@ DBIND_CHECK_ALIGNOF(dbind_struct)
 
 GTK_DOC_CHECK([1.09])
 
+if test "x$GCC" = xyes; then
+       CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
+fi
 CPPFLAGS=$orig_CPPFLAGS 
 AC_CONFIG_FILES([Makefile po/Makefile.in
        xml/Makefile
@@ -203,10 +195,11 @@ AC_CONFIG_FILES([Makefile po/Makefile.in
 dbind/dbind-config.h
        atspi/Makefile
        registryd/Makefile
-       bus/at-spi-dbus-bus
        bus/Makefile
 doc/Makefile
 doc/libatspi/Makefile
+atspi-2.pc
+atspi-2-uninstalled.pc
 ])
 
 AC_OUTPUT