summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-base/xorg-server/files/1.7.5.902-fix-tslib-1.0-check.patch')
-rw-r--r--x11-base/xorg-server/files/1.7.5.902-fix-tslib-1.0-check.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/x11-base/xorg-server/files/1.7.5.902-fix-tslib-1.0-check.patch b/x11-base/xorg-server/files/1.7.5.902-fix-tslib-1.0-check.patch
new file mode 100644
index 0000000..3675822
--- /dev/null
+++ b/x11-base/xorg-server/files/1.7.5.902-fix-tslib-1.0-check.patch
@@ -0,0 +1,19 @@
+--- configure.ac 2010-03-16 22:24:14.000000000 +0100
++++ configure.ac.new 2010-03-16 22:33:10.000000000 +0100
+@@ -1915,8 +1915,14 @@
+ AC_DEFINE(KDRIVEFBDEV, 1, [Build fbdev-based kdrive server])
+ fi
+
+-
+- PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
++dnl Do tripple check for tslib in the transition phase to unversioned pkgconfig files...
++ PKG_CHECK_MODULES([TSLIB], [tslib], [HAVE_TSLIB="yes"], [
++ PKG_CHECK_MODULES([TSLIB], [tslib-1.0], [HAVE_TSLIB="yes"], [
++ PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [
++ HAVE_TSLIB="no"
++ ])
++ ])
++ ])
+ if test "x$HAVE_TSLIB" = xno; then
+ AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"])
+ fi