forked from enlightenment/efl
Move tslib (Touchscreen) checks inside the "want_ecore_fb" block, as tslib
is only used if we're building ecore_fb. SVN revision: 27206
This commit is contained in:
parent
6356e709b8
commit
26b9a98431
|
@ -59,15 +59,6 @@ changequote([,])dnl
|
||||||
|
|
||||||
AC_CHECK_FUNCS(gettimeofday)
|
AC_CHECK_FUNCS(gettimeofday)
|
||||||
|
|
||||||
tslib_libs=""
|
|
||||||
AC_CHECK_HEADER(tslib.h,
|
|
||||||
[
|
|
||||||
tslib_libs="-ltslib"
|
|
||||||
AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_X Module])
|
|
||||||
]
|
|
||||||
)
|
|
||||||
AC_SUBST(tslib_libs)
|
|
||||||
|
|
||||||
AC_CHECK_HEADERS(netinet/in.h)
|
AC_CHECK_HEADERS(netinet/in.h)
|
||||||
|
|
||||||
case "$host_os" in
|
case "$host_os" in
|
||||||
|
@ -586,7 +577,15 @@ AC_ARG_ENABLE(ecore-fb,
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
tslib_libs=""
|
||||||
if test "x$want_ecore_fb" = "xyes"; then
|
if test "x$want_ecore_fb" = "xyes"; then
|
||||||
|
AC_CHECK_HEADER(tslib.h,
|
||||||
|
[
|
||||||
|
tslib_libs="-ltslib"
|
||||||
|
AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code])
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
AC_CHECK_HEADER(linux/fb.h,
|
AC_CHECK_HEADER(linux/fb.h,
|
||||||
[
|
[
|
||||||
AC_CHECK_HEADER(linux/input.h,
|
AC_CHECK_HEADER(linux/input.h,
|
||||||
|
@ -607,6 +606,7 @@ else
|
||||||
AM_CONDITIONAL(BUILD_ECORE_FB, false)
|
AM_CONDITIONAL(BUILD_ECORE_FB, false)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
AC_SUBST(tslib_libs)
|
||||||
AC_SUBST(ecore_fb_cflags)
|
AC_SUBST(ecore_fb_cflags)
|
||||||
AC_SUBST(ecore_fb_libs)
|
AC_SUBST(ecore_fb_libs)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue