X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=bea395deef5a9053438e57eb667054f8bbe139aa;hb=13c2ca4b4f9cfbfb7a40bfb37427621d5c5937aa;hp=7aa2c976999d474f2ab8ce605abe14378cdb7acc;hpb=b5deb7538bb00757ef264f95969ff8a426898810;p=platform%2Fupstream%2Fat-spi2-core.git

diff --git a/configure.ac b/configure.ac
index 7aa2c97..bea395d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([at-spi2-core], [2.7.4], [accessibility-atspi@lists.linux-foundation.org])
+AC_INIT([at-spi2-core], [2.16.0], [accessibility-atspi@lists.linux-foundation.org])
 AC_PREREQ([2.59])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR([m4])
@@ -44,13 +44,9 @@ 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_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(GOBJ, [gobject-2.0 >= 2.0.0])
 AC_SUBST(GOBJ_LIBS)
@@ -60,6 +56,17 @@ PKG_CHECK_MODULES(GIO, [gio-2.0 >= 2.28])
 AC_SUBST(GIO_LIBS)
 AC_SUBST(GIO_CFLAGS)
 
+PKG_CHECK_MODULES(APPSVC, [appsvc])
+AC_SUBST(APPSVC_LIBS)
+AC_SUBST(APPSVC_CFLAGS)
+
+PKG_CHECK_MODULES(VCONF, [vconf])
+AC_SUBST(VCONF_LIBS)
+AC_SUBST(VCONF_CFLAGS)
+
+PKG_CHECK_MODULES(AUL, [aul])
+AC_SUBST(AUL_LIBS)
+AC_SUBST(AUL_CFLAGS)
 # --------------------------------------------------------------------
 # Find DL functionality
 
@@ -73,18 +80,29 @@ 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=""
 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
 AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, XTST_LIBS=-lXtst,[
-	AC_MSG_ERROR([Couldn't find the Xtst library. Check config.log])],
+	AC_MSG_WARN([Couldn't find the Xtst library. Check config.log])],
 	$X_LIBS)
 AC_SUBST(XTST_LIBS)
 LIBS="$LIBS $save_LIBS"
@@ -110,7 +128,7 @@ if test "x$have_xinput" = "xmaybe"; then
 	LIBS="$save_LIBS"
 fi
 if test "x$have_xinput" != "xyes"; then
-	AC_MSG_ERROR([Couldn't find the XInput library. Check config.log for details])
+	AC_MSG_WARN([Couldn't find the XInput library. Check config.log for details])
 fi
 XINPUT_LIBS="-lXi"
 AC_SUBST(XINPUT_LIBS)
@@ -123,6 +141,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)
@@ -172,6 +194,8 @@ 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)
@@ -203,6 +227,7 @@ dbind/dbind-config.h
 	bus/Makefile
 doc/Makefile
 doc/libatspi/Makefile
+doc/libatspi/version.xml
 test/Makefile
 atspi-2.pc
 atspi-2-uninstalled.pc