From: Julian Seward <jseward@acm.org>
Date: Tue, 18 Jun 2002 01:05:58 +0000 (+0000)
Subject: Further mess with the X config checks, so as to get a reasonably
X-Git-Tag: svn/VALGRIND_1_0_3~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5d90a759902ca565c60e9e7ba77ba520acbe514;p=thirdparty%2Fvalgrind.git

Further mess with the X config checks, so as to get a reasonably
comprehensive set of X suppressions more robustly.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@437
---

diff --git a/configure.in b/configure.in
index 52f6b3ee2a..2db8a72413 100644
--- a/configure.in
+++ b/configure.in
@@ -179,6 +179,11 @@ AC_DEFINE(HAVE_NFDS_T)
 fi
 
 # try to detect the XFree version
+# JRS 2002-06-17: this is completely bogus because it
+# detects the server version, whereas we need to know the 
+# client library version.  So what follows is hacked to
+# use all the X supp files regardless of what is detected.
+# This is really stoooopid and should be fixed properly.
 
 AC_PATH_X
 
@@ -222,15 +227,22 @@ EOF
 	   AC_MSG_RESULT([XFree 4.x family])
 	   AC_DEFINE(XFREE_4)
 	   DEFAULT_SUPP="${DEFAULT_SUPP} xfree-4.supp"
+	   # haaaaaaack!
+	   DEFAULT_SUPP="${DEFAULT_SUPP} xfree-3.supp"
 	   ;;
 
 	*version=3*) 
 	   AC_MSG_RESULT([XFree 3.x family])
 	   AC_DEFINE(XFREE_3)
 	   DEFAULT_SUPP="${DEFAULT_SUPP} xfree-3.supp"
+	   # haaaaaaack!
+	   DEFAULT_SUPP="${DEFAULT_SUPP} xfree-4.supp"
 	   ;;
 
 	*) AC_MSG_RESULT([unknown XFree86 server (${xfree})])
+	   # haaaaaaack!
+	   DEFAULT_SUPP="${DEFAULT_SUPP} xfree-3.supp"
+	   DEFAULT_SUPP="${DEFAULT_SUPP} xfree-4.supp"
 	   ;;
      esac
    fi