forked from enlightenment/efl
tslib detection fixes from Marc Andre Tanner. Thanks.
SVN revision: 42799
This commit is contained in:
parent
7a51d7bf39
commit
e1fefd6702
|
@ -877,7 +877,7 @@ ECORE_CHECK_MODULE([SDL], [${want_ecore_sdl}], [${ecore_sdl_deps}],
|
||||||
ECORE_CHECK_MODULE([FB], [${want_ecore_fb}], [$have_fb])
|
ECORE_CHECK_MODULE([FB], [${want_ecore_fb}], [$have_fb])
|
||||||
|
|
||||||
if test "x${have_ecore_fb}" = "xyes" ; then
|
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
|
fi
|
||||||
|
|
||||||
# ecore_directfb
|
# ecore_directfb
|
||||||
|
|
|
@ -198,12 +198,12 @@ if test "x${_ecore_want_tslib}" = "xyes" -o "x${_ecore_want_tslib}" = "xauto" ;
|
||||||
PKG_CHECK_MODULES(TSLIB, tslib-1.0,
|
PKG_CHECK_MODULES(TSLIB, tslib-1.0,
|
||||||
[
|
[
|
||||||
AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code])
|
AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code])
|
||||||
_ecore_have_ts="yes"
|
_ecore_have_tslib="yes"
|
||||||
],[
|
],[
|
||||||
PKG_CHECK_MODULES(TSLIB, tslib,
|
PKG_CHECK_MODULES(TSLIB, tslib,
|
||||||
[
|
[
|
||||||
AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code])
|
AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code])
|
||||||
_ecore_have_ts="yes"
|
_ecore_have_tslib="yes"
|
||||||
],[
|
],[
|
||||||
AC_CHECK_HEADER([tslib.h],
|
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_LIBS="-lts"
|
||||||
TSLIB_CFLAGS=""
|
TSLIB_CFLAGS=""
|
||||||
AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code])
|
AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code])
|
||||||
_ecore_have_ts="yes"
|
_ecore_have_tslib="yes"
|
||||||
],[
|
],[
|
||||||
AC_CHECK_LIB([tslib], [ts_open],
|
AC_CHECK_LIB([tslib], [ts_open],
|
||||||
[
|
[
|
||||||
TSLIB_LIBS="-ltslib"
|
TSLIB_LIBS="-ltslib"
|
||||||
TSLIB_CFLAGS=""
|
TSLIB_CFLAGS=""
|
||||||
AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code])
|
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"
|
||||||
])
|
])
|
||||||
])
|
])
|
||||||
])
|
])
|
||||||
|
|
Loading…
Reference in New Issue