From: billh <billh@e2bd861d-eb25-0410-b326-f6ed22b6b98c>
Date: Tue, 10 May 2005 17:11:59 +0000 (+0000)
Subject: Fixed configure.in checks for XEVIE on XOrg 11R6.2.
X-Git-Tag: AT_SPI2_CORE_0_1_3~509
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7deb4ff3a494dca8f99e364f5a87d035c723bfba;p=platform%2Fupstream%2Fat-spi2-core.git

Fixed configure.in checks for XEVIE on XOrg 11R6.2.


git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@749 e2bd861d-eb25-0410-b326-f6ed22b6b98c
---

diff --git a/ChangeLog b/ChangeLog
index ed3d482..ec4890a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
-2005-04-15  Abduxukur Abdurixit <abduxukur.abdurixit@t-systems.ch>
+2005-04-05  Bill Haneman <bill.haneman@sun.com>
 
-	* configure.in: Added "ug" to ALL_LINGUAS.
+	* configure.in: Revved to 1.6.4.
+	Remember to put quotes around XEVIE_LIBS assignment.
+	Fixed one of tertiary AC_CHECK_HEADER tests for XEvie.
+	Fixes bug #303694.
 
 2005-04-14  Kjartan Maraas  <kmaraas@gnome.org>
 
diff --git a/configure.in b/configure.in
index f93c70a..fc5e9a4 100644
--- a/configure.in
+++ b/configure.in
@@ -2,9 +2,9 @@ AC_INIT(idl/Accessibility.idl)
 
 AT_SPI_MAJOR_VERSION=1
 AT_SPI_MINOR_VERSION=6
-AT_SPI_MICRO_VERSION=3
-AT_SPI_INTERFACE_AGE=3
-AT_SPI_BINARY_AGE=3
+AT_SPI_MICRO_VERSION=4
+AT_SPI_INTERFACE_AGE=4
+AT_SPI_BINARY_AGE=4
 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=3
+LT_REVISION=4
 LT_AGE=10
 LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}'
 AC_SUBST(LT_VERSION_INFO)
@@ -157,14 +157,14 @@ if test x$enable_xevie = xyes ; then
 	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",,-lXext)
 	   if test "x$have_xevie" = "xmaybe"; then
-	      AC_CHECK_HEADER(X11/extensions/Xevie.h, have_xinput=yes)
+	      AC_CHECK_HEADER(X11/extensions/Xevie.h, have_xevie=yes)
 	      if test "x$have_xevie" = "xyes"; then
-	      	      XEVIE_LIBS=-lXext -lXevie	       
+	      	      XEVIE_LIBS="-lXext -lXevie"	       
 		      AC_DEFINE(HAVE_XEVIE)
 	      fi
 	   fi