1fix tslib version check in configure.in
2
3The patch makes sure that the old as well as the new tslib pkg-config
4metadata file naming style is handled correctly.
5
6tslib 0.0 to 1.0 created only a tslib-<VERSION>.pc pkg-config metadata
7file.
8
9With tslib 1.1 the tslib-<VERSION>.pc phase out was started.
10Additionally, the pkg-config metadata file tslib.pc was added.
11
12Since tslib 1.6 the tslib-<VERSION>.pc metadata file is deprecated.
13Now, there is only a tslib.pc.
14
15Upstream-Status: Inappropriate [no upstream]
16Signed-off-by: Ben Guan <ben.guan@cn.bosch.com>
17Signed-off-by: Mark Jonas <mark.jonas@de.bosch.com>
18
19diff -Nru DirectFB-1.7.7.orig/configure.in DirectFB-1.7.7/configure.in
20--- DirectFB-1.7.7.orig/configure.in	2015-02-10 01:16:46.000000000 +0800
21+++ DirectFB-1.7.7/configure.in	2018-06-06 17:19:18.472143103 +0800
22@@ -2459,10 +2459,13 @@
23
24 enable_tslib=no
25 if test "$checkfor_tslib" = "yes"; then
26-  PKG_CHECK_MODULES([TSLIB], [tslib-1.0 >= 1.0.0], [enable_tslib=yes], [enable_tslib=no])
27+  PKG_CHECK_MODULES([TSLIB], [tslib >= 1.1], [enable_tslib=yes], [enable_tslib=no])
28   if test "$enable_tslib" = "no"; then
29-     PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [enable_tslib=yes], [enable_tslib=no
30-       AC_MSG_WARN([*** no tslib -- tslib driver will not be built.])])
31+    PKG_CHECK_MODULES([TSLIB], [tslib-1.0 >= 1.0], [enable_tslib=yes], [enable_tslib=no])
32+    if test "$enable_tslib" = "no"; then
33+      PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [enable_tslib=yes], [enable_tslib=no
34+        AC_MSG_WARN([*** no tslib -- tslib driver will not be built.])])
35+    fi
36   fi
37 fi
38
39