forked from enlightenment/efl
1. oops - types on tslib fixes
2. sdl1.2 - optional... SVN revision: 39486
This commit is contained in:
parent
ad895c3afd
commit
c173f09b34
|
@ -352,7 +352,7 @@ if test -z "$SDL_CONFIG" ; then
|
||||||
AC_SUBST(SDL_LIBS)
|
AC_SUBST(SDL_LIBS)
|
||||||
have_sdl="no"
|
have_sdl="no"
|
||||||
else
|
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
|
fi
|
||||||
|
|
||||||
if test "x${have_sdl}" = "xyes" ; then
|
if test "x${have_sdl}" = "xyes" ; then
|
||||||
|
|
|
@ -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])
|
AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code])
|
||||||
_ecore_have_ts="yes"
|
_ecore_have_ts="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_ts="yes"
|
||||||
],
|
],[
|
||||||
[
|
|
||||||
AC_CHECK_HEADER([tslib.h],
|
AC_CHECK_HEADER([tslib.h],
|
||||||
[
|
[
|
||||||
AC_CHECK_LIB([ts], [ts_open],
|
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=""
|
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_ts="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_ts="yes"
|
||||||
,
|
],[
|
||||||
_ecore_have_ts="no"
|
_ecore_have_ts="no"
|
||||||
])
|
])
|
||||||
])
|
])
|
||||||
|
|
Loading…
Reference in New Issue