2007-02-20 Kjartan Maraas <kmaraas@gnome.org>

[platform/core/uifw/at-spi2-atk.git] / configure.in

diff --git a/configure.in b/configure.in
index 59994c0..a6cc6df 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=6
+AT_SPI_MINOR_VERSION=17        
+AT_SPI_MICRO_VERSION=0

 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=7
+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.9.0])
+m4_define([req_ver_atk],       [1.12.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)


@@ -38,7 +38,7 @@ dnl Initialize maintainer mode
 AM_MAINTAINER_MODE
 
 dnl translation of any at-spi strings: used only for .server
 AM_MAINTAINER_MODE
 
 dnl translation of any at-spi strings: used only for .server

-AC_PROG_INTLTOOL([0.31])
+IT_PROG_INTLTOOL([0.35.0])

 
 dnl Checks for programs
 AC_PROG_CC
 
 dnl Checks for programs
 AC_PROG_CC


@@ -55,7 +55,6 @@ AM_PROG_LIBTOOL
 GETTEXT_PACKAGE="${PACKAGE}"
 AC_SUBST(GETTEXT_PACKAGE)
 dnl internationalization support; uncomment if translatable strings are reintroduced
 GETTEXT_PACKAGE="${PACKAGE}"
 AC_SUBST(GETTEXT_PACKAGE)
 dnl internationalization support; uncomment if translatable strings are reintroduced

-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 no 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
 AM_GLIB_GNU_GETTEXT
 
 # AM_GLIB_GNU_GETTEXT above subst. $DATADIRNAME


@@ -85,8 +84,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)


@@ -111,7 +108,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)
 


@@ -122,6 +119,12 @@ PKG_CHECK_MODULES(LIBCSPI, [
 AC_SUBST(LIBCSPI_LIBS)
 AC_SUBST(LIBCSPI_CFLAGS)
 
 AC_SUBST(LIBCSPI_LIBS)
 AC_SUBST(LIBCSPI_CFLAGS)
 

+PKG_CHECK_MODULES(ORBIT, [
+       ORBit-2.0
+])
+AC_SUBST(ORBIT_LIBS)
+AC_SUBST(ORBIT_CFLAGS)
+

 dnl orbit-idl.
 ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
 AC_SUBST(ORBIT_IDL)
 dnl orbit-idl.
 ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
 AC_SUBST(ORBIT_IDL)


@@ -168,9 +171,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",,-lXevie -lXext)

           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)