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
at-spi-bus-launcher: launch universal-switch
[platform/upstream/at-spi2-core.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
8c73942
..
bea395d
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,4
+1,4
@@
-AC_INIT([at-spi2-core], [2.
3.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])
AC_PREREQ([2.59])
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR([m4])
@@
-22,6
+22,11
@@
AC_SUBST(LT_AGE)
AM_INIT_AUTOMAKE([1.9 -Wall foreign no-dist-gzip dist-xz])
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])
PKG_PROG_PKG_CONFIG
AC_PROG_CC
LT_INIT([disable-static])
PKG_PROG_PKG_CONFIG
@@
-39,13
+44,9
@@
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_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)
PKG_CHECK_MODULES(GOBJ, [gobject-2.0 >= 2.0.0])
AC_SUBST(GOBJ_LIBS)
@@
-55,6
+56,17
@@
PKG_CHECK_MODULES(GIO, [gio-2.0 >= 2.28])
AC_SUBST(GIO_LIBS)
AC_SUBST(GIO_CFLAGS)
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
# --------------------------------------------------------------------
# Find DL functionality
@@
-68,18
+80,29
@@
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=""
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, XTST_LIBS=-lXtst,[
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"
$X_LIBS)
AC_SUBST(XTST_LIBS)
LIBS="$LIBS $save_LIBS"
@@
-105,7
+128,7
@@
if test "x$have_xinput" = "xmaybe"; then
LIBS="$save_LIBS"
fi
if test "x$have_xinput" != "xyes"; 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)
fi
XINPUT_LIBS="-lXi"
AC_SUBST(XINPUT_LIBS)
@@
-118,6
+141,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)
@@
-167,6
+194,8
@@
else
fi
AC_SUBST(DBUS_SERVICES_DIR)
fi
AC_SUBST(DBUS_SERVICES_DIR)
+AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
+
GOBJECT_INTROSPECTION_CHECK([0.9.6])
AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
GOBJECT_INTROSPECTION_CHECK([0.9.6])
AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
@@
-198,6
+227,8
@@
dbind/dbind-config.h
bus/Makefile
doc/Makefile
doc/libatspi/Makefile
bus/Makefile
doc/Makefile
doc/libatspi/Makefile
+doc/libatspi/version.xml
+test/Makefile
atspi-2.pc
atspi-2-uninstalled.pc
])
atspi-2.pc
atspi-2-uninstalled.pc
])