1. oops - types on tslib fixes

2. sdl1.2 - optional...


SVN revision: 39486
This commit is contained in:
Carsten Haitzler 2009-03-15 03:13:17 +00:00
parent ad895c3afd
commit c173f09b34
2 changed files with 5 additions and 7 deletions

View File

@ -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

View File

@ -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"
])
])