X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.in;h=e3b2a9025a38d6f4f6847cb2b0103368421359d1;hb=bd703dfccbb700770f4629e5b5a8af45c3a8dfc3;hp=b2475ae79b24f65cd12b9de5c2edd6fd8e6455d8;hpb=1a8973e358fb04fa8f56fd96a10ba174eae7bd27;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git

diff --git a/configure.in b/configure.in
index b2475ae..e3b2a90 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=3
-AT_SPI_MICRO_VERSION=4
-AT_SPI_INTERFACE_AGE=4
-AT_SPI_BINARY_AGE=4
+AT_SPI_MINOR_VERSION=5
+AT_SPI_MICRO_VERSION=3
+AT_SPI_INTERFACE_AGE=3
+AT_SPI_BINARY_AGE=3
 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)
@@ -15,9 +15,9 @@ AC_SUBST(AT_SPI_BINARY_AGE)
 
 # libtool versioning
 LT_RELEASE=$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION
-LT_CURRENT=9
-LT_REVISION=4
-LT_AGE=9
+LT_CURRENT=10
+LT_REVISION=3
+LT_AGE=10
 LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}'
 AC_SUBST(LT_VERSION_INFO)
 AC_SUBST(LT_RELEASE)
@@ -39,56 +39,17 @@ AC_PROG_INSTALL
 AC_ISC_POSIX
 
 GNOME_COMMON_INIT
-GNOME_PLATFORM_GNOME_2(yes, force)
 GNOME_COMPILE_WARNINGS(maximum)
 
 dnl Initialize libtool
 AM_DISABLE_STATIC
 AM_PROG_LIBTOOL
 
-dnl internationalization support
-dnl ALL_LINGUAS="sv"
+dnl internationalization support; uncomment if translatable strings are reintroduced
+dnl ALL_LINGUAS="ar az be bg bn 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 ne nl nn no 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
 
-AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
-
-gtk_doc_min_version=0.6
-if $GTKDOC ; then
-    gtk_doc_version=`gtkdoc-mkdb --version`
-    AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version])
-    if perl <<EOF ; then
-my @installed = split /\./, "$gtk_doc_version";
-my @required = split /\./, "$gtk_doc_min_version";
-
-while (scalar @required) {
-    my \$installed_ver = (shift @installed || 0);
-    my \$required_ver = shift @required;
-    exit 1 if (\$installed_ver < \$required_ver);
-    exit 0 if (\$installed_ver > \$required_ver);
-}
-exit 0;
-EOF
-      AC_MSG_RESULT(yes)
-   else
-      AC_MSG_RESULT(no)
-	GTKDOC=false
-   fi
-fi
-
-dnl Let people disable the gtk-doc stuff.
-AC_ARG_ENABLE(gtk-doc, [  --enable-gtk-doc  Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
-
-if test x$enable_gtk_doc = xauto ; then
-  if test x$GTKDOC = xtrue ; then
-    enable_gtk_doc=yes
-  else
-    enable_gtk_doc=no
-  fi
-fi
-
-dnl NOTE: We need to use a separate automake conditional for this
-dnl   	  to make this work with the tarballs.
-AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+GTK_DOC_CHECK([1.0])
 
 AC_PATH_XTRA
 
@@ -119,7 +80,6 @@ PKG_CHECK_MODULES(REGISTRYD, \
 	libbonobo-2.0 >= 1.107.0 \
 	gtk+-2.0 > 2.0.0 \
 	atk >= 1.3.4)
-REGISTRYD_LIBS="$REGISTRYD_LIBS" 
 AC_SUBST(REGISTRYD_LIBS)
 AC_SUBST(REGISTRYD_CFLAGS)
 
@@ -134,7 +94,6 @@ AC_SUBST(TESTS_CFLAGS)
 PKG_CHECK_MODULES(ATK_BRIDGE, \
 	libbonobo-2.0 >= 1.107.0 \
 	atk >= 1.3.4)
-ATK_BRIDGE_LIBS="$ATK_BRIDGE_LIBS" 
 AC_SUBST(ATK_BRIDGE_LIBS)
 AC_SUBST(ATK_BRIDGE_CFLAGS)
 
@@ -154,12 +113,11 @@ LIBBONOBO_IDL_DIR="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
 AC_SUBST(BONOBO_ACTIVATION_IDL_DIR)
 AC_SUBST(LIBBONOBO_IDL_DIR)
 
-CFLAGS="$CFLAGS $X_LIBS"
+LIBS="$LIBS $X_LIBS"
 dnl path to Xtst
-AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, XTST_LIBS=-lXtst)
-if test "x$XTST_LIBS" = x; then
-  AC_MSG_ERROR(Couldn't find the Xtst library. Check config.log for details)
-fi
+AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, XTST_LIBS=-lXtst,[
+	AC_MSG_ERROR([Couldn't find the Xtst library. Check config.log])],
+	-lX11 -lXext)
 AC_SUBST(XTST_LIBS)
 
 have_xkb=
@@ -173,13 +131,27 @@ if test "x$have_xkb" = "xyes"; then
 fi
 
 have_xinput=
-AC_CHECK_LIB(Xi, XOpenDevice, XINPUT_LIBS=-lXi)
+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)
 fi			       
 AC_CHECK_HEADER(X11/extensions/XInput.h, have_xinput=yes)
 AC_SUBST(XINPUT_LIBS)
 
+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
+  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"
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
@@ -211,7 +183,10 @@ AC_SUBST(REBUILD)
 AC_OUTPUT([
 Makefile
 libspi-1.0.pc
+libspi-1.0-uninstalled.pc
+libloginhelper-1.0.pc
 cspi-1.0.pc
+cspi-1.0-uninstalled.pc
 docs/Makefile
 docs/reference/Makefile
 docs/reference/cspi/Makefile
@@ -219,6 +194,7 @@ idl/Makefile
 libspi/Makefile
 registryd/Makefile
 atk-bridge/Makefile
+login-helper/Makefile
 test/Makefile
 cspi/Makefile
 cspi/bonobo/Makefile