2003-04-02 Padraig O'Briain <padraig.obriain@sun.com>

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

diff --git a/configure.in b/configure.in
index b6d9abe..502d685 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=1
-AT_SPI_MICRO_VERSION=5
-AT_SPI_INTERFACE_AGE=0
-AT_SPI_BINARY_AGE=5
+AT_SPI_MICRO_VERSION=9
+AT_SPI_INTERFACE_AGE=1
+AT_SPI_BINARY_AGE=109
 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,7 +15,7 @@ AC_SUBST(AT_SPI_BINARY_AGE)
 
 # libtool versioning
 LT_RELEASE=$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION
-LT_CURRENT=`expr $AT_SPI_MICRO_VERSION - $AT_SPI_INTERFACE_AGE`
+LT_CURRENT=`expr 100 '*' $AT_SPI_MINOR_VERSION + $AT_SPI_MICRO_VERSION - $AT_SPI_INTERFACE_AGE`
 LT_REVISION=$AT_SPI_INTERFACE_AGE
 LT_AGE=`expr $AT_SPI_BINARY_AGE - $AT_SPI_INTERFACE_AGE`
 LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}'
@@ -113,6 +113,7 @@ PKG_CHECK_MODULES(REGISTRYD, \
        libbonobo-2.0 >= 1.107.0 \
        gtk+-2.0 > 2.0.0 \
        atk >= 1.1.0)
+REGISTRYD_LIBS="$REGISTRYD_LIBS" 
 AC_SUBST(REGISTRYD_LIBS)
 AC_SUBST(REGISTRYD_CFLAGS)
 
@@ -127,6 +128,7 @@ AC_SUBST(TESTS_CFLAGS)
 PKG_CHECK_MODULES(ATK_BRIDGE, \
        libbonobo-2.0 >= 1.107.0 \
        atk >= 1.1.0)
+ATK_BRIDGE_LIBS="$ATK_BRIDGE_LIBS" 
 AC_SUBST(ATK_BRIDGE_LIBS)
 AC_SUBST(ATK_BRIDGE_CFLAGS)
 
@@ -146,30 +148,16 @@ 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"
 dnl path to Xtst
 AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, XTST_LIBS=-lXtst)
 if test "x$XTST_LIBS" = x; then
-  save_LIBS="$LIBS"
-  for xtstpath in /usr/X11R6/lib /usr/openwin/lib; do
-    LIBS="-L$xtstpath -lXtst"
-    case "$host" in
-    *solaris*) XTST_RPATH_FLAGS="-R$xtstpath" ;;
-    esac
-    AC_MSG_CHECKING(for -lXtst in $xtstpath)
-    AC_TRY_LINK([], [XTestFakeKeyEvent()], [
-       AC_MSG_RESULT(yes)
-       XTST_LIBS="$XTST_RPATH_FLAGS -L$xtstpath -lXtst"
-        LIBS="$save_LIBS"
-       break],[AC_MSG_RESULT(no)])
-  done
-  if test "x$XTST_LIBS" = x; then
-    AC_MSG_ERROR(Couldn't find the Xtst library. Check config.log for details)
-  fi
+  AC_MSG_ERROR(Couldn't find the Xtst library. Check config.log for details)
 fi
 AC_SUBST(XTST_LIBS)
 
 have_xkb=
-AC_CHECK_LIB(X11, XkbQueryExtension, have_xkb="maybe",,$X_LIBS)
+AC_CHECK_LIB(X11, XkbQueryExtension, have_xkb="maybe")
 if test "x$have_xkb" = "xmaybe"; then 
   AC_CHECK_HEADER(X11/XKBlib.h, have_xkb=yes)
 fi
@@ -181,26 +169,12 @@ fi
 have_xinput=
 AC_CHECK_LIB(Xi, XOpenDevice, XINPUT_LIBS=-lXi)
 if test "x$XINPUT_LIBS" = x; then
-  save_LIBS="$LIBS"
-  for xinputpath in /usr/X11R6/lib /usr/openwin/lib; do
-    LIBS="-L$xinputpath -lXi"
-    case "$host" in
-    *solaris*) XINPUT_RPATH_FLAGS="-R$xinputpath" ;;
-    esac
-    AC_MSG_CHECKING(for -lXi in $xinputpath)
-    AC_TRY_LINK([], [XOpenDisplay()], [
-       AC_MSG_RESULT(yes)
-       XINPUT_LIBS="$XINPUT_RPATH_FLAGS -L$xinputpath -lXi"
-        LIBS="$save_LIBS"
-       break],[AC_MSG_RESULT(no)])
-  done
-  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)
-fi
+  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 CFLAGS="$CFLAGS -Wall"
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)