projects
/
platform
/
upstream
/
at-spi2-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release v2.11.5
[platform/upstream/at-spi2-core.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
227d6ad
..
84841a0
100644
(file)
--- 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])
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)
AC_SUBST(DBUS_LIBS)
AC_SUBST(DBUS_CFLAGS)
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.
2
6.0])
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.
3
6.0])
AC_SUBST(GLIB_LIBS)
AC_SUBST(GLIB_CFLAGS)
AC_CHECK_LIB([glib-2.0], [g_ptr_array_new_with_free_func], [:],
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_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
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"
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)
fi
AC_SUBST(X_LIBS)
+AC_SUBST(HAVE_X11)
save_LIBS="$LIBS"
LIBS=""
save_LIBS="$LIBS"
LIBS=""
@@
-123,6
+134,10
@@
AC_ARG_ENABLE(xevie,
[Build with XEViE support [default=yes]])],
enable_xevie="$enableval", enable_xevie=yes)
[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)
if test x$enable_xevie = xyes ; then
have_xevie=
AC_CHECK_LIB(Xext, XevieStart, have_xevie="yes", have_xevie="no", $X_LIBS)