X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=463191fb10addf50c3aac604582547609e7fa7ab;hb=6d468128c7a8a43f9b0930910a1e8c9c75820c2b;hp=fc0c93d0cd5b313f4220a8bfadaa851d8901d241;hpb=7afb51e5093fef46c699d92ee8eee94f5b6886fb;p=platform%2Fupstream%2Fat-spi2-core.git

diff --git a/configure.ac b/configure.ac
index fc0c93d..463191f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([at-spi2-core], [2.1.1], [accessibility-atspi@lists.linux-foundation.org])
+AC_INIT([at-spi2-core], [2.25.2], [accessibility-atspi@lists.linux-foundation.org])
 AC_PREREQ([2.59])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR([m4])
@@ -20,9 +20,15 @@ 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
+AM_PROG_AR
 LT_INIT([disable-static])
 PKG_PROG_PKG_CONFIG
 
@@ -39,17 +45,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(GIO, [gio-2.0 >= 2.26.0])
-AC_SUBST(GIO_LIBS)
-AC_SUBST(GIO_CFLAGS)
 
 PKG_CHECK_MODULES(GOBJ, [gobject-2.0 >= 2.0.0])
 AC_SUBST(GOBJ_LIBS)
@@ -72,55 +70,72 @@ AC_SUBST(DL_LIBS)
 
 AC_PATH_XTRA
 
-if test x$no_x = xyes ; then
+AC_ARG_ENABLE(x11,
+              [AS_HELP_STRING([--disable-x11],
+                              [disable the X11 backend])],,
+			      [enable_x11=auto])
+
+if test x$enable_x11 = xno; then
+	AM_CONDITIONAL(USE_X11, false)
+elif test x$no_x = xyes ; then
 	AC_MSG_ERROR([X development libraries not found])
 else
+	AM_CONDITIONAL(USE_X11, true)
 	X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-fi
-AC_SUBST(X_LIBS)
-
-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])],
-	$X_LIBS)
-AC_SUBST(XTST_LIBS)
-LIBS="$LIBS $save_LIBS"
+	AC_SUBST(X_LIBS)
+	AC_DEFINE(HAVE_X11, 1, [Define to use X11])
+	AC_SUBST(HAVE_X11)
 
-save_LIBS="$LIBS"
-LIBS=""
-AC_CHECK_LIB(X11, XkbQueryExtension, have_xkb="maybe", have_xkb="no", $X_LIBS)
-if test "x$have_xkb" = "xmaybe"; then 
-	AC_CHECK_HEADER([X11/XKBlib.h], have_xkb=yes)
-fi
-if test "x$have_xkb" = "xyes"; then
-	AC_DEFINE([HAVE_XKB], [], [Xkb is present])
-fi
-LIBS="$LIBS $save_LIBS"
+	dnl Check for Xtst
+	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])],
+		$X_LIBS)
+	AC_SUBST(XTST_LIBS)
+	LIBS="$LIBS $save_LIBS"
+
+	dnl Check for XkbQueryExtension
+	save_LIBS="$LIBS"
+	LIBS=""
+	AC_CHECK_LIB(X11, XkbQueryExtension, have_xkb="maybe", have_xkb="no", $X_LIBS)
+	if test "x$have_xkb" = "xmaybe"; then 
+		AC_CHECK_HEADER([X11/XKBlib.h], have_xkb=yes)
+	fi
+	if test "x$have_xkb" = "xyes"; then
+		AC_DEFINE([HAVE_XKB], [], [Xkb is present])
+	fi
+	LIBS="$LIBS $save_LIBS"
 
-save_LIBS="$LIBS"
-LIBS=""
-AC_CHECK_LIB(Xi, XOpenDevice, have_xinput="maybe", have_xinput="no", $X_LIBS)
-if test "x$have_xinput" = "xmaybe"; then
+	dnl Check for Xi
 	save_LIBS="$LIBS"
-	LIBS="$LIBS $X_LIBS"
-	AC_CHECK_HEADER([X11/extensions/XInput.h], [have_xinput="yes"])
-	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])
+	LIBS=""
+	AC_CHECK_LIB(Xi, XOpenDevice, have_xinput="maybe", have_xinput="no", $X_LIBS)
+	if test "x$have_xinput" = "xmaybe"; then
+		save_LIBS="$LIBS"
+		LIBS="$LIBS $X_LIBS"
+		AC_CHECK_HEADER([X11/extensions/XInput.h], [have_xinput="yes"])
+		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])
+	fi
+	XINPUT_LIBS="-lXi"
+	AC_SUBST(XINPUT_LIBS)
+	LIBS="$LIBS $save_LIBS"
 fi
-XINPUT_LIBS="-lXi"
-AC_SUBST(XINPUT_LIBS)
-LIBS="$LIBS $save_LIBS"
 
 save_LIBS="$LIBS"
 LIBS=""
 AC_ARG_ENABLE(xevie,
 	[AS_HELP_STRING([--enable-xevie],
-		[Build with XEViE support [default=yes]])],
-	enable_xevie="$enableval", enable_xevie=yes)
+		[Build with XEViE support [default=no]])],
+	enable_xevie="$enableval", enable_xevie=no)
+
+if test -z "$backend_set"; then
+  enable_x11_backend=yes
+fi
 
 if test x$enable_xevie = xyes ; then
 	have_xevie=
@@ -180,14 +195,16 @@ AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
 dnl find sizes & alignments
 orig_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS"
-DBIND_CHECK_ALIGNOF(char)
-DBIND_CHECK_ALIGNOF(dbus_bool_t)
-DBIND_CHECK_ALIGNOF(dbus_int16_t)
-DBIND_CHECK_ALIGNOF(dbus_int32_t)
-DBIND_CHECK_ALIGNOF(dbus_int64_t)
-DBIND_CHECK_ALIGNOF(double)
-DBIND_CHECK_ALIGNOF(dbind_pointer)
-DBIND_CHECK_ALIGNOF(dbind_struct)
+AC_CHECK_ALIGNOF(char)
+AC_CHECK_ALIGNOF(dbus_bool_t, [#include <dbus/dbus.h>])
+AC_CHECK_ALIGNOF(dbus_int16_t, [#include <dbus/dbus.h>])
+AC_CHECK_ALIGNOF(dbus_int32_t, [#include <dbus/dbus.h>])
+AC_CHECK_ALIGNOF(dbus_int64_t, [#include <dbus/dbus.h>])
+AC_CHECK_ALIGNOF(double, [#include <dbus/dbus.h>])
+AC_CHECK_ALIGNOF(dbind_pointer, [AC_INCLUDES_DEFAULT
+typedef void *dbind_pointer;])
+AC_CHECK_ALIGNOF(dbind_struct, [AC_INCLUDES_DEFAULT
+typedef struct {char s1;} dbind_struct;])
 
 GTK_DOC_CHECK([1.09])
 
@@ -198,12 +215,13 @@ CPPFLAGS=$orig_CPPFLAGS
 AC_CONFIG_FILES([Makefile po/Makefile.in
 	xml/Makefile
 	dbind/Makefile
-dbind/dbind-config.h
 	atspi/Makefile
 	registryd/Makefile
 	bus/Makefile
 doc/Makefile
 doc/libatspi/Makefile
+doc/libatspi/version.xml
+test/Makefile
 atspi-2.pc
 atspi-2-uninstalled.pc
 ])