AC_INIT(idl/Accessibility.idl)
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_MINOR_VERSION=7
+AT_SPI_MICRO_VERSION=6
+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"
AM_INIT_AUTOMAKE(at-spi, $AT_SPI_VERSION)
AC_SUBST(AT_SPI_MAJOR_VERSION)
# libtool versioning
LT_RELEASE=$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION
LT_CURRENT=10
-LT_REVISION=4
+LT_REVISION=7
LT_AGE=10
LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}'
AC_SUBST(LT_VERSION_INFO)
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)
+dnl required versions of other tools.
+m4_define([req_ver_atk], [1.9.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 Initialize maintainer mode
AM_MAINTAINER_MODE
-AC_PROG_INTLTOOL
+dnl translation of any at-spi strings: used only for .server
+AC_PROG_INTLTOOL([0.31])
dnl Checks for programs
AC_PROG_CC
AM_DISABLE_STATIC
AM_PROG_LIBTOOL
+GETTEXT_PACKAGE="${PACKAGE}"
+AC_SUBST(GETTEXT_PACKAGE)
dnl internationalization support; uncomment if translatable strings are reintroduced
-dnl ALL_LINGUAS="ar az be bg bn bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr gu he hi hr id is it ja ko lt mn ms nb ne nl nn no or pa pl pt_BR pt ro ru sk sl sq sr@ije sr@Latn sr sv uk vi wa zh_CN"
-dnl AM_GLIB_GNU_GETTEXT
+ALL_LINGUAS="ar az be bg bn bs ca cs cy da de dz el en_CA en_GB eo es et eu fa fi fr gl gu he hi hr hu id is it ja ka ko lt mn mr ms nb ne nl nn or pa pl pt_BR pt ro ru rw sk sl sq sr@ije sr@Latn sr sv th ug uk vi wa xh zh_CN zh_HK zh_TW"
+AM_GLIB_GNU_GETTEXT
+
+# AM_GLIB_GNU_GETTEXT above subst. $DATADIRNAME
+# this is the directory where the *.{mo,gmo} files are installed
+localedir='${prefix}/${DATADIRNAME}/locale'
+AC_SUBST(localedir)
GTK_DOC_CHECK([1.0])
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
- 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)
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)
-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)
-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)
-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)
-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)
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
- 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
- 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)
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, XevieStart, have_xevie="yes")
+
+ if test "x$have_xevie" = "xyes"; then
+ XEVIE_LIBS="-lXext"
+ AC_DEFINE(HAVE_XEVIE)
+ else
+ AC_CHECK_LIB(Xevie, XevieQueryVersion, have_xevie="maybe",,-lXext)
+ if test "x$have_xevie" = "xmaybe"; then
+ AC_CHECK_HEADER(X11/extensions/Xevie.h, have_xevie=yes)
+ if test "x$have_xevie" = "xyes"; then
+ XEVIE_LIBS="-lXext -lXevie"
+ AC_DEFINE(HAVE_XEVIE)
+ fi
+ fi
+ fi
+ AC_SUBST(XEVIE_LIBS)
fi
dnl CFLAGS="$CFLAGS -Wall"
#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/])
])
+#libtool option to strip symbols starting with cspi
+#
+LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^cspi]].*"'
+AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
+
REBUILD=\#
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)
AC_OUTPUT([
Makefile
+po/Makefile.in
libspi-1.0.pc
libspi-1.0-uninstalled.pc
libloginhelper-1.0.pc
docs/Makefile
docs/reference/Makefile
docs/reference/cspi/Makefile
+docs/reference/idl/Makefile
idl/Makefile
libspi/Makefile
registryd/Makefile