From ce7e069ab3086b067b9831112dacda84af99f4d7 Mon Sep 17 00:00:00 2001 From: raster Date: Sun, 15 Mar 2009 03:13:17 +0000 Subject: [PATCH] 1. oops - types on tslib fixes 2. sdl1.2 - optional... git-svn-id: http://svn.enlightenment.org/svn/e/trunk/ecore@39486 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- configure.ac | 2 +- m4/ecore_check_options.m4 | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 1ee30f2..af77653 100644 --- a/configure.ac +++ b/configure.ac @@ -352,7 +352,7 @@ if test -z "$SDL_CONFIG" ; then AC_SUBST(SDL_LIBS) have_sdl="no" else - PKG_CHECK_MODULES([SDL], [sdl >= 1.2.0], [have_sdl="yes"]) + PKG_CHECK_MODULES([SDL], [sdl >= 1.2.0], [have_sdl="yes"], [have_sdl="no"]) fi if test "x${have_sdl}" = "xyes" ; then diff --git a/m4/ecore_check_options.m4 b/m4/ecore_check_options.m4 index 257c63b..03aa740 100644 --- a/m4/ecore_check_options.m4 +++ b/m4/ecore_check_options.m4 @@ -199,14 +199,12 @@ if test "x${_ecore_want_tslib}" = "xyes" -o "x${_ecore_want_tslib}" = "xauto" ; [ AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code]) _ecore_have_ts="yes" - ], - [ + ],[ PKG_CHECK_MODULES(TSLIB, tslib, [ AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code]) _ecore_have_ts="yes" - ], - [ + ],[ AC_CHECK_HEADER([tslib.h], [ AC_CHECK_LIB([ts], [ts_open], @@ -215,14 +213,14 @@ if test "x${_ecore_want_tslib}" = "xyes" -o "x${_ecore_want_tslib}" = "xauto" ; TSLIB_CFLAGS="" AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code]) _ecore_have_ts="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_ts="no" ]) ]) -- 2.7.4