X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=84841a0745b90044d93b2b0137c3a561f189aec5;hb=1a8023ab75cec38933fcec9e4eb34f80dc5e813c;hp=227d6ad4acef63fd5302e15e01b66d677feeb5b4;hpb=e2dc5271d1a64d5c384eab1a0a76352fee8e8976;p=platform%2Fupstream%2Fat-spi2-core.git

diff --git a/configure.ac b/configure.ac
index 227d6ad..84841a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([at-spi2-core], [2.9.3], [accessibility-atspi@lists.linux-foundation.org])
+AC_INIT([at-spi2-core], [2.11.5], [accessibility-atspi@lists.linux-foundation.org])
 AC_PREREQ([2.59])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR([m4])
@@ -44,7 +44,7 @@ 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], [:],
@@ -73,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=""
@@ -123,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)