2004-03-15 Laszlo Peter <laca@sun.com>

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

diff --git a/configure.in b/configure.in
index d11d3c2..a2361e1 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=3
-AT_SPI_MICRO_VERSION=7
-AT_SPI_INTERFACE_AGE=7
-AT_SPI_BINARY_AGE=7
+AT_SPI_MICRO_VERSION=15
+AT_SPI_INTERFACE_AGE=15
+AT_SPI_BINARY_AGE=15
 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=9
-LT_REVISION=5
+LT_REVISION=12
 LT_AGE=9
 LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}'
 AC_SUBST(LT_VERSION_INFO)
@@ -47,44 +47,10 @@ AM_DISABLE_STATIC
 AM_PROG_LIBTOOL
 
 dnl internationalization support
-dnl ALL_LINGUAS="az be bn ca cs cy da de el eo es et fi fr he hi is it ja ko mn ms ne nl pl pt_BR pt ro ru sk sl sq sr@Latn sr sv uk vi zh_CN"
+dnl ALL_LINGUAS="ar az be bn ca cs cy da de el eo es et eu fa fi fr 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 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
+GTK_DOC_CHECK ([1.0])
 
 dnl NOTE: We need to use a separate automake conditional for this
 dnl      to make this work with the tarballs.
@@ -119,7 +85,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 +99,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)
 
@@ -156,10 +120,9 @@ AC_SUBST(LIBBONOBO_IDL_DIR)
 
 CFLAGS="$CFLAGS $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=
@@ -225,7 +188,9 @@ AC_SUBST(REBUILD)
 AC_OUTPUT([
 Makefile
 libspi-1.0.pc
+libspi-1.0-uninstalled.pc
 cspi-1.0.pc
+cspi-1.0-uninstalled.pc
 docs/Makefile
 docs/reference/Makefile
 docs/reference/cspi/Makefile