enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

tslib detection fixes from Marc Andre Tanner. Thanks. 

SVN revision: 42799
This commit is contained in:
Lars Munch 2009-09-29 12:56:14 +00:00
parent 7a51d7bf39
commit e1fefd6702
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/ecore/configure.ac
View File

@ -877,7 +877,7 @@ ECORE_CHECK_MODULE([SDL], [${want_ecore_sdl}], [${ecore_sdl_deps}],
ECORE_CHECK_MODULE([FB], [${want_ecore_fb}], [$have_fb])
if test "x${have_ecore_fb}" = "xyes" ; then
ECORE_CHECK_TSLIB([${want_tslib}], [have_tslib="no"], [have_tslib="no"])
ECORE_CHECK_TSLIB([${want_tslib}], [have_tslib="yes"], [have_tslib="no"])
fi
# ecore_directfb

10
legacy/ecore/m4/ecore_check_options.m4
View File

@ -198,12 +198,12 @@ if test "x${_ecore_want_tslib}" = "xyes" -o "x${_ecore_want_tslib}" = "xauto" ;
PKG_CHECK_MODULES(TSLIB, tslib-1.0,
[
AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code])
_ecore_have_ts="yes"
_ecore_have_tslib="yes"
],[
PKG_CHECK_MODULES(TSLIB, tslib,
[
AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code])
_ecore_have_ts="yes"
_ecore_have_tslib="yes"
],[
AC_CHECK_HEADER([tslib.h],
[
@ -212,16 +212,16 @@ if test "x${_ecore_want_tslib}" = "xyes" -o "x${_ecore_want_tslib}" = "xauto" ;
TSLIB_LIBS="-lts"
TSLIB_CFLAGS=""
AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code])
_ecore_have_ts="yes"
_ecore_have_tslib="yes"
],[
AC_CHECK_LIB([tslib], [ts_open],
[
TSLIB_LIBS="-ltslib"
TSLIB_CFLAGS=""
AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code])
_ecore_have_ts="yes"
_ecore_have_tslib="yes"
],[
_ecore_have_ts="no"
_ecore_have_tslib="no"
])
])
])