X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.in;h=74e42bbd99141b6831d935bf076a276e5aead4f7;hb=59568fcca2ea754f1ebb7133f29e1e0908e2af4a;hp=7eae3b7fc566b8b9bff809104d7ff2ffea428229;hpb=0374b876444bcf121fbf7c871ea03adc4a2b5a52;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git

diff --git a/configure.in b/configure.in
index 7eae3b7..74e42bb 100644
--- a/configure.in
+++ b/configure.in
@@ -1,10 +1,10 @@
 AC_INIT(idl/Accessibility.idl)
 
 AT_SPI_MAJOR_VERSION=1
-AT_SPI_MINOR_VERSION=6
-AT_SPI_MICRO_VERSION=2
-AT_SPI_INTERFACE_AGE=2
-AT_SPI_BINARY_AGE=2
+AT_SPI_MINOR_VERSION=7
+AT_SPI_MICRO_VERSION=13
+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)
@@ -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
-LT_REVISION=2
+LT_REVISION=11
 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.
-m4_define([req_ver_atk],	[1.7.2])
+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_gail],	[1.3.0])
-m4_define([req_ver_gtk],	[2.0.0])
 
 dnl Specify a header configuration file
 AM_CONFIG_HEADER(config.h)
@@ -37,7 +37,8 @@ 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
+IT_PROG_INTLTOOL([0.35.0])
 
 dnl Checks for programs
 AC_PROG_CC
@@ -51,9 +52,15 @@ dnl Initialize libtool
 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 gl gu he hi hr id is it ja ka 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
+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])
 
@@ -77,8 +84,6 @@ dnl Checks for libraries
 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)
@@ -103,7 +108,7 @@ AC_SUBST(TESTS_CFLAGS)
 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)
 
@@ -114,6 +119,12 @@ PKG_CHECK_MODULES(LIBCSPI, [
 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)
@@ -154,11 +165,20 @@ AC_ARG_ENABLE(xevie, [  --enable-xevie  Build with XEViE support [default=yes]],
 
 if test x$enable_xevie = xyes ; then
 	have_xevie=
-	AC_CHECK_LIB(Xext, XevieQueryVersion, have_xevie="yes")
+	AC_CHECK_LIB(Xext, XevieStart, have_xevie="yes")
 
 	if test "x$have_xevie" = "xyes"; then
-		XEVIE_LIBS=-lXext
+		XEVIE_LIBS="-lXext"
 		AC_DEFINE(HAVE_XEVIE)
+	else
+	   AC_CHECK_LIB(Xevie, XevieQueryVersion, have_xevie="maybe",,-lXevie -lXext)
+	   if test "x$have_xevie" = "xmaybe"; then
+	      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)
+	      fi
+	   fi	
 	fi
 	AC_SUBST(XEVIE_LIBS)
 fi
@@ -182,6 +202,11 @@ AC_TRY_CPP([#include <popt.h>
 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" && \
@@ -193,6 +218,7 @@ AC_SUBST(REBUILD)
 
 AC_OUTPUT([
 Makefile
+po/Makefile.in
 libspi-1.0.pc
 libspi-1.0-uninstalled.pc
 libloginhelper-1.0.pc
@@ -201,6 +227,7 @@ cspi-1.0-uninstalled.pc
 docs/Makefile
 docs/reference/Makefile
 docs/reference/cspi/Makefile
+docs/reference/idl/Makefile
 idl/Makefile
 libspi/Makefile
 registryd/Makefile