projects
/
platform
/
core
/
uifw
/
at-spi2-atk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug #517761, Collection match rules not working for attributes.
[platform/core/uifw/at-spi2-atk.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
ea56073
..
85b658b
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-1,8
+1,8
@@
AC_INIT(idl/Accessibility.idl)
AT_SPI_MAJOR_VERSION=1
AC_INIT(idl/Accessibility.idl)
AT_SPI_MAJOR_VERSION=1
-AT_SPI_MINOR_VERSION=
7
-AT_SPI_MICRO_VERSION=
8
+AT_SPI_MINOR_VERSION=
21
+AT_SPI_MICRO_VERSION=
5
AT_SPI_INTERFACE_AGE=0
AT_SPI_BINARY_AGE=0
AT_SPI_VERSION="$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION.$AT_SPI_MICRO_VERSION"
AT_SPI_INTERFACE_AGE=0
AT_SPI_BINARY_AGE=0
AT_SPI_VERSION="$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION.$AT_SPI_MICRO_VERSION"
@@
-16,7
+16,7
@@
AC_SUBST(AT_SPI_BINARY_AGE)
# libtool versioning
LT_RELEASE=$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION
LT_CURRENT=10
# libtool versioning
LT_RELEASE=$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION
LT_CURRENT=10
-LT_REVISION=
9
+LT_REVISION=
11
LT_AGE=10
LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}'
AC_SUBST(LT_VERSION_INFO)
LT_AGE=10
LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}'
AC_SUBST(LT_VERSION_INFO)
@@
-26,10
+26,10
@@
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)
dnl required versions of other tools.
AC_SUBST(LT_AGE)
dnl required versions of other tools.
-m4_define([req_ver_atk], [1.12.0])
+m4_define([req_ver_atk], [1.17.0])
+m4_define([req_ver_gtk], [2.10.0])
+m4_define([req_ver_gail], [1.9.0])
m4_define([req_ver_libbonobo], [1.107.0])
m4_define([req_ver_libbonobo], [1.107.0])
-m4_define([req_ver_gail], [1.3.0])
-m4_define([req_ver_gtk], [2.0.0])
dnl Specify a header configuration file
AM_CONFIG_HEADER(config.h)
dnl Specify a header configuration file
AM_CONFIG_HEADER(config.h)
@@
-45,6
+45,10
@@
AC_PROG_CC
AC_PROG_INSTALL
AC_ISC_POSIX
AC_PROG_INSTALL
AC_ISC_POSIX
+# Check for Python
+
+AM_PATH_PYTHON(2.4)
+
GNOME_COMMON_INIT
GNOME_COMPILE_WARNINGS(maximum)
GNOME_COMMON_INIT
GNOME_COMPILE_WARNINGS(maximum)
@@
-84,8
+88,6
@@
dnl Checks for libraries
PKG_CHECK_MODULES(LIBSPI, [
libbonobo-2.0 >= req_ver_libbonobo
atk >= req_ver_atk
PKG_CHECK_MODULES(LIBSPI, [
libbonobo-2.0 >= req_ver_libbonobo
atk >= req_ver_atk
- gtk+-2.0 >= req_ver_gtk
- gail >= req_ver_gail
])
AC_SUBST(LIBSPI_LIBS)
AC_SUBST(LIBSPI_CFLAGS)
])
AC_SUBST(LIBSPI_LIBS)
AC_SUBST(LIBSPI_CFLAGS)
@@
-110,7
+112,7
@@
AC_SUBST(TESTS_CFLAGS)
PKG_CHECK_MODULES(ATK_BRIDGE, [
libbonobo-2.0 >= req_ver_libbonobo
atk >= req_ver_atk
PKG_CHECK_MODULES(ATK_BRIDGE, [
libbonobo-2.0 >= req_ver_libbonobo
atk >= req_ver_atk
-])
+])
AC_SUBST(ATK_BRIDGE_LIBS)
AC_SUBST(ATK_BRIDGE_CFLAGS)
AC_SUBST(ATK_BRIDGE_LIBS)
AC_SUBST(ATK_BRIDGE_CFLAGS)
@@
-173,9
+175,9
@@
if test x$enable_xevie = xyes ; then
XEVIE_LIBS="-lXext"
AC_DEFINE(HAVE_XEVIE)
else
XEVIE_LIBS="-lXext"
AC_DEFINE(HAVE_XEVIE)
else
- AC_CHECK_LIB(Xevie, XevieQueryVersion, have_xevie="maybe",,-lXext)
+ AC_CHECK_LIB(Xevie, XevieQueryVersion, have_xevie="maybe",,-lXe
vie -lXe
xt)
if test "x$have_xevie" = "xmaybe"; then
if test "x$have_xevie" = "xmaybe"; then
- AC_CHECK_HEADER(X11/extensions/Xevie.h, have_xevie=yes)
+ AC_CHECK_HEADER(X11/extensions/Xevie.h, have_xevie=yes
, [], [#include <X11/Xlib.h>]
)
if test "x$have_xevie" = "xyes"; then
XEVIE_LIBS="-lXext -lXevie"
AC_DEFINE(HAVE_XEVIE)
if test "x$have_xevie" = "xyes"; then
XEVIE_LIBS="-lXext -lXevie"
AC_DEFINE(HAVE_XEVIE)
@@
-238,6
+240,7
@@
login-helper/Makefile
test/Makefile
cspi/Makefile
cspi/bonobo/Makefile
test/Makefile
cspi/Makefile
cspi/bonobo/Makefile
+pyatspi/Makefile
])
echo "AT-SPI setup:
])
echo "AT-SPI setup: