]> git.draconx.ca Git - gentoo-draconx.git/blob - x11-base/xorg-server/files/1.7.5.902-fix-tslib-1.0-check.patch
3675822edf2812abbfaa31a989eaba5ab1a48804
[gentoo-draconx.git] / x11-base / xorg-server / files / 1.7.5.902-fix-tslib-1.0-check.patch
1 --- configure.ac        2010-03-16 22:24:14.000000000 +0100
2 +++ configure.ac.new    2010-03-16 22:33:10.000000000 +0100
3 @@ -1915,8 +1915,14 @@
4          AC_DEFINE(KDRIVEFBDEV, 1, [Build fbdev-based kdrive server])
5      fi
6  
7 -
8 -    PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
9 +dnl Do tripple check for tslib in the transition phase to unversioned pkgconfig files...
10 +    PKG_CHECK_MODULES([TSLIB], [tslib], [HAVE_TSLIB="yes"], [
11 +        PKG_CHECK_MODULES([TSLIB], [tslib-1.0], [HAVE_TSLIB="yes"], [
12 +               PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [
13 +                   HAVE_TSLIB="no"
14 +               ])
15 +       ])
16 +    ])
17      if test "x$HAVE_TSLIB" = xno; then
18          AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"])
19      fi