X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=b5e9943167bb275aa4a6c7b9e4d83a225ed58c39;hb=a49f39ec9c4497fda18081bfc5ddc5aec063f83d;hp=3d82d3f24e1d948233b1a8d06a19ee3587ee7448;hpb=f8230043c35757edf02c2f8ce7217f51294e52e8;p=platform%2Fupstream%2Fat-spi2-core.git

diff --git a/configure.ac b/configure.ac
index 3d82d3f..b5e9943 100644
--- 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.11.91], [accessibility-atspi@lists.linux-foundation.org])
 AC_PREREQ([2.59])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR([m4])
@@ -20,7 +20,12 @@ AC_SUBST(LT_CURRENT)
 AC_SUBST(LT_REVISION)
 AC_SUBST(LT_AGE)
 
-AM_INIT_AUTOMAKE([1.9 -Wall foreign])
+AM_INIT_AUTOMAKE([1.9 -Wall foreign no-dist-gzip dist-xz])
+
+# Support silent build rules. Disable
+# by either passing --disable-silent-rules to configure or passing V=1
+# to make
+AM_SILENT_RULES([yes])
 
 AC_PROG_CC
 LT_INIT([disable-static])
@@ -39,22 +44,22 @@ PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.0])
 AC_SUBST(DBUS_LIBS)
 AC_SUBST(DBUS_CFLAGS)
 
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.26.0])
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.36.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
 
@@ -68,12 +73,23 @@ AC_SUBST(DL_LIBS)
 
 AC_PATH_XTRA
 
+AC_ARG_ENABLE(x11,
+              [AS_HELP_STRING([--disable-x11],
+                              [disable the X11 backend])],,
+			      [enable_x11=auto])
+
 if test x$no_x = xyes ; then
-	AC_MSG_ERROR([X development libraries not found])
-else
+	AC_MSG_WARN([X development libraries not found])
+  AM_CONDITIONAL(USE_X11, false)
+elif test x$enable_x11 = xauto; then
 	X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+  AC_DEFINE(HAVE_X11, 1, [Define to use X11])
+  AM_CONDITIONAL(USE_X11, true)
+else
+  AM_CONDITIONAL(USE_X11, false)
 fi
 AC_SUBST(X_LIBS)
+AC_SUBST(HAVE_X11)
 
 save_LIBS="$LIBS"
 LIBS=""
@@ -118,6 +134,10 @@ AC_ARG_ENABLE(xevie,
 		[Build with XEViE support [default=yes]])],
 	enable_xevie="$enableval", enable_xevie=yes)
 
+if test -z "$backend_set"; then
+  enable_x11_backend=yes
+fi
+
 if test x$enable_xevie = xyes ; then
 	have_xevie=
 	AC_CHECK_LIB(Xext, XevieStart, have_xevie="yes", have_xevie="no", $X_LIBS)
@@ -167,21 +187,12 @@ else
 fi
 AC_SUBST(DBUS_SERVICES_DIR)
 
+AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
+
 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 +207,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 +217,12 @@ 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
+test/Makefile
+atspi-2.pc
+atspi-2-uninstalled.pc
 ])
 
 AC_OUTPUT