tslib detection fixes from Marc Andre Tanner. Thanks.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@42799 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/configure.ac b/configure.ac
index 87abb8f..999a333 100644 (file)
--- a/configure.ac
+++ b/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/m4/ecore_check_options.m4 b/m4/ecore_check_options.m4
index 03aa740..b8c6db8 100644 (file)
--- a/m4/ecore_check_options.m4
+++ b/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"
                  ])
               ])
            ])