correct Xtst, Xdamage, Xfixes detection and usage (bug #341854)

correct Xtst, Xdamage, Xfixes detection and usage (bug #341854)

2 files changed, 20 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 05ded94..bc5513b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-05-15  Carlos Eduardo Rodrigues Diogenes <cerdiogenes@yahoo.com.br>
 
+	* configure.in: changed the detection of the Xtst, Xdamage and Xfixes
+	libraries, so, these are used in systems where theses libs are
+	installed in /usr/lib (bug #341854)
+	
 	* magnifier/zoom-region.c: Round problem in conversion from
 	source-to-view and view-to-source coords resolved (bug #338551).
 
diff --git a/configure.in b/configure.in
index d28ce7e..a16ae06 100644
--- a/configure.in
+++ b/configure.in
@@ -129,6 +129,9 @@ if test "x$XTST_LIBS" = x; then
     X_LIBS="$X_LIBS $XTST_LIBS"
     AC_DEFINE(HAVE_XTST, 1, [The XTest extension is present])
   fi
+else
+  X_LIBS="$X_LIBS $XTST_LIBS"
+  AC_DEFINE(HAVE_XTST, 1, [The XTest extension is present])
 fi
 
 dnl path to DAMAGE
@@ -159,6 +162,14 @@ if test "x$XDAMAGE_LIBS" = x; then
     fi
     AC_DEFINE(HAVE_DAMAGE, 1, [The DAMAGE extension is present])
   fi
+else
+  X_LIBS="$X_LIBS $XDAMAGE_LIBS"
+  CFLAGS="-I /opt/fdo/include $CFLAGS"
+  AC_CHECK_HEADER(X11/extensions/Xdamage.h, have_xdamage=yes)
+  if test "x$have_xdamage" = x; then
+    AC_CHECK_HEADER(X11/Xdamage.h, have_xdamage=yes)
+  fi
+  AC_DEFINE(HAVE_DAMAGE, 1, [The DAMAGE extension is present])
 fi
 
 dnl path to XFIXES
@@ -186,6 +197,11 @@ if test "x$XFIXES_LIBS" = x; then
     AC_CHECK_HEADER(X11/extensions/Xfixes.h, have_xfixes=yes)
     AC_DEFINE(HAVE_XFIXES, 1, [The XFIXES extension is present])
   fi
+else
+  X_LIBS="$X_LIBS $XFIXES_LIBS"
+  CFLAGS="-I /opt/fdo/include $CFLAGS"
+  AC_CHECK_HEADER(X11/extensions/Xfixes.h, have_xfixes=yes)
+  AC_DEFINE(HAVE_XFIXES, 1, [The XFIXES extension is present])
 fi
 
 AC_SUBST(X_LIBS)