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
*** empty log message ***
[platform/core/uifw/at-spi2-atk.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
e90a36c
..
8f942ff
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-2,9
+2,9
@@
AC_INIT(idl/Accessibility.idl)
AT_SPI_MAJOR_VERSION=1
AT_SPI_MINOR_VERSION=5
AT_SPI_MAJOR_VERSION=1
AT_SPI_MINOR_VERSION=5
-AT_SPI_MICRO_VERSION=
4
-AT_SPI_INTERFACE_AGE=
4
-AT_SPI_BINARY_AGE=
4
+AT_SPI_MICRO_VERSION=
5
+AT_SPI_INTERFACE_AGE=
5
+AT_SPI_BINARY_AGE=
5
AT_SPI_VERSION="$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION.$AT_SPI_MICRO_VERSION"
AM_INIT_AUTOMAKE(at-spi, $AT_SPI_VERSION)
AC_SUBST(AT_SPI_MAJOR_VERSION)
AT_SPI_VERSION="$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION.$AT_SPI_MICRO_VERSION"
AM_INIT_AUTOMAKE(at-spi, $AT_SPI_VERSION)
AC_SUBST(AT_SPI_MAJOR_VERSION)
@@
-25,6
+25,12
@@
AC_SUBST(LT_CURRENT)
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)
+dnl required versions of other tools.
+m4_define([req_ver_atk], [1.7.2])
+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)
@@
-54,9
+60,9
@@
GTK_DOC_CHECK([1.0])
AC_PATH_XTRA
if test x$no_x = xyes ; then
AC_PATH_XTRA
if test x$no_x = xyes ; then
- AC_MSG_ERROR([X development libraries not found])
+
AC_MSG_ERROR([X development libraries not found])
else
else
- X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+
X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
fi
AC_SUBST(X_LIBS)
fi
AC_SUBST(X_LIBS)
@@
-68,38
+74,43
@@
dnl AC_MSG_ERROR(Old libspi.1.x library found in $libdir. Please remove $(libd
dnl fi
dnl Checks for libraries
dnl fi
dnl Checks for libraries
-PKG_CHECK_MODULES(LIBSPI, \
- libbonobo-2.0 >= 1.107.0 \
- atk >= 1.3.4 \
- gtk+-2.0 > 2.0.0 \
- gail >= 1.3.0)
+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)
-PKG_CHECK_MODULES(REGISTRYD, \
- libbonobo-2.0 >= 1.107.0 \
- gtk+-2.0 > 2.0.0 \
- atk >= 1.3.4)
+PKG_CHECK_MODULES(REGISTRYD, [
+ libbonobo-2.0 >= req_ver_libbonobo
+ atk >= req_ver_atk
+ gtk+-2.0 >= req_ver_gtk
+])
AC_SUBST(REGISTRYD_LIBS)
AC_SUBST(REGISTRYD_CFLAGS)
AC_SUBST(REGISTRYD_LIBS)
AC_SUBST(REGISTRYD_CFLAGS)
-PKG_CHECK_MODULES(TESTS, \
- libbonobo-2.0 >= 1.107.0 \
- atk >= 1.3.4 \
- gtk+-2.0 > 2.0.0 \
- gail >= 1.3.0)
+PKG_CHECK_MODULES(TESTS, [
+ libbonobo-2.0 >= req_ver_libbonobo
+ atk >= req_ver_atk
+ gtk+-2.0 >= req_ver_gtk
+ gail >= req_ver_gail
+])
AC_SUBST(TESTS_LIBS)
AC_SUBST(TESTS_CFLAGS)
AC_SUBST(TESTS_LIBS)
AC_SUBST(TESTS_CFLAGS)
-PKG_CHECK_MODULES(ATK_BRIDGE, \
- libbonobo-2.0 >= 1.107.0 \
- atk >= 1.3.4)
+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)
-PKG_CHECK_MODULES(LIBCSPI, \
- libbonobo-2.0 >= 1.107.0 \
- atk >= 1.3.4)
+PKG_CHECK_MODULES(LIBCSPI, [
+ libbonobo-2.0 >= req_ver_libbonobo
+ atk >= req_ver_atk
+])
AC_SUBST(LIBCSPI_LIBS)
AC_SUBST(LIBCSPI_CFLAGS)
AC_SUBST(LIBCSPI_LIBS)
AC_SUBST(LIBCSPI_CFLAGS)
@@
-123,17
+134,17
@@
AC_SUBST(XTST_LIBS)
have_xkb=
AC_CHECK_LIB(X11, XkbQueryExtension, have_xkb="maybe")
if test "x$have_xkb" = "xmaybe"; then
have_xkb=
AC_CHECK_LIB(X11, XkbQueryExtension, have_xkb="maybe")
if test "x$have_xkb" = "xmaybe"; then
- AC_CHECK_HEADER(X11/XKBlib.h, have_xkb=yes)
+
AC_CHECK_HEADER(X11/XKBlib.h, have_xkb=yes)
fi
if test "x$have_xkb" = "xyes"; then
fi
if test "x$have_xkb" = "xyes"; then
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_XKB)
+
AC_MSG_RESULT(yes)
+
AC_DEFINE(HAVE_XKB)
fi
have_xinput=
AC_CHECK_LIB(Xi, XOpenDevice, XINPUT_LIBS=-lXi,,-lXext)
if test "x$XINPUT_LIBS" = x; then
fi
have_xinput=
AC_CHECK_LIB(Xi, XOpenDevice, XINPUT_LIBS=-lXi,,-lXext)
if test "x$XINPUT_LIBS" = x; then
- AC_MSG_ERROR(Couldn't find the XInput library. Check config.log for details)
+
AC_MSG_ERROR(Couldn't find the XInput library. Check config.log for details)
fi
AC_CHECK_HEADER(X11/extensions/XInput.h, have_xinput=yes)
AC_SUBST(XINPUT_LIBS)
fi
AC_CHECK_HEADER(X11/extensions/XInput.h, have_xinput=yes)
AC_SUBST(XINPUT_LIBS)
@@
-142,14
+153,14
@@
dnl Allow disabling XEViE.
AC_ARG_ENABLE(xevie, [ --enable-xevie Build with XEViE support [default=yes]], enable_xevie="$enableval", enable_xevie=yes)
if test x$enable_xevie = xyes ; then
AC_ARG_ENABLE(xevie, [ --enable-xevie Build with XEViE support [default=yes]], enable_xevie="$enableval", enable_xevie=yes)
if test x$enable_xevie = xyes ; then
- have_xevie=
- AC_CHECK_LIB(Xext, XevieQueryVersion, have_xevie="yes")
-
- if test "x$have_xevie" = "xyes"; then
- XEVIE_LIBS=-lXext
- AC_DEFINE(HAVE_XEVIE)
- fi
- AC_SUBST(XEVIE_LIBS)
+
have_xevie=
+
AC_CHECK_LIB(Xext, XevieQueryVersion, have_xevie="yes")
+
+
if test "x$have_xevie" = "xyes"; then
+
XEVIE_LIBS=-lXext
+
AC_DEFINE(HAVE_XEVIE)
+
fi
+
AC_SUBST(XEVIE_LIBS)
fi
dnl CFLAGS="$CFLAGS -Wall"
fi
dnl CFLAGS="$CFLAGS -Wall"
@@
-166,8
+177,8
@@
AC_TRY_CPP([#include <popt.h>
#ifndef POPT_ARG_FLOAT
#error popt too old
#endif], AC_MSG_RESULT(yes), [
#ifndef POPT_ARG_FLOAT
#error popt too old
#endif], AC_MSG_RESULT(yes), [
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([A newer version of popt is required to build at-spi.
+
AC_MSG_RESULT(no)
+
AC_MSG_ERROR([A newer version of popt is required to build at-spi.
You can download the latest version from ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/])
])
You can download the latest version from ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/])
])
@@
-175,8
+186,8
@@
REBUILD=\#
if test "x$enable_rebuilds" = "xyes" && \
test -n "$PERL" && \
$PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 && \
if test "x$enable_rebuilds" = "xyes" && \
test -n "$PERL" && \
$PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 && \
- test -n "$AWK" ; then
- REBUILD=
+
test -n "$AWK" ; then
+
REBUILD=
fi
AC_SUBST(REBUILD)
fi
AC_SUBST(REBUILD)