From e1fefd6702a8e07433cb0d246c04b90524178720 Mon Sep 17 00:00:00 2001 From: Lars Munch Date: Tue, 29 Sep 2009 12:56:14 +0000 Subject: [PATCH] tslib detection fixes from Marc Andre Tanner. Thanks. SVN revision: 42799 --- legacy/ecore/configure.ac | 2 +- legacy/ecore/m4/ecore_check_options.m4 | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/legacy/ecore/configure.ac b/legacy/ecore/configure.ac index 87abb8f2b5..999a333ac3 100644 --- a/legacy/ecore/configure.ac +++ b/legacy/ecore/configure.ac @@ -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 diff --git a/legacy/ecore/m4/ecore_check_options.m4 b/legacy/ecore/m4/ecore_check_options.m4 index 03aa740674..b8c6db8376 100644 --- a/legacy/ecore/m4/ecore_check_options.m4 +++ b/legacy/ecore/m4/ecore_check_options.m4 @@ -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" ]) ]) ])