enlightenment
/
expedite
7
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix expedite building with wayland engines. 

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2014-02-12 08:10:04 +00:00
parent a5e6af917a
commit 840686042a
1 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
configure.ac
View File

@ -93,6 +93,7 @@ AC_SUBST(gl_cocoa_libs)
EXPEDITE_CHECK_ENGINE([software-16-wince], [Software 16 bits WinCE], "yes", [wince_16_libs="-laygshell"])
AC_SUBST(wince_16_libs)
### Checks for programs
AC_ISC_POSIX
@ -185,33 +186,14 @@ fi
AM_CONDITIONAL(BUILD_DIRECTFB, test "x$have_directfb" = "xyes")
# Wayland
EXPEDITE_CHECK_ENGINE([wayland-shm], [Wayland SHM], "no")
EXPEDITE_CHECK_ENGINE([wayland-egl], [Wayland EGL], "no")
have_wl="no"
have_wl_egl="no"
if test "x$want_wayland_egl" = "xyes" -o "x$want_wayland_shm" = "xyes"; then
PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client], [have_wl="yes"], [have_wl="no"])
if test "x$have_wl" = "xyes"; then
EXPEDITE_CHECK_ENGINE([wayland-shm], [Wayland SHM], "yes",
[
AC_DEFINE(BUILD_WAYLAND, 1, [build wayland support])
AC_DEFINE(BUILD_WAYLAND_SHM, 1, [build wayland SHM support])
])
fi
if test "x$have_wl" = "xyes" -a "x$want_wayland_egl" = "xyes"; then
PKG_CHECK_MODULES([WAYLAND_EGL], [wayland-egl], [have_wl_egl="yes"], [have_wl_egl="no"])
if test "x$have_wl_egl" = "xyes"; then
EXPEDITE_CHECK_ENGINE([wayland-egl], [Wayland EGL], "yes",
[
AC_DEFINE(BUILD_WAYLAND_EGL, 1, [build wayland EGL support])
])
fi
fi
if test "x$have_wayland_shm" = "xyes" -o "x$have_wayland_egl" = "xyes"; then
PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client], [have_wl="yes"], [have_wl="no"])
fi
AM_CONDITIONAL(BUILD_WAYLAND, test "x$have_wl" = "xyes")
AM_CONDITIONAL(BUILD_WAYLAND_SHM, test "x$have_wl" = "xyes")
AM_CONDITIONAL(BUILD_WAYLAND_EGL, test "x$have_wl_egl" = "xyes")
### Checks for header files
@ -297,8 +279,8 @@ echo " FB...........................: ${have_fb}"
echo " DirectFB.....................: ${have_directfb}"
echo " PSL1GHT......................: ${have_psl1ght}"
echo " Software WinCE 16 bits.......: ${have_software_16_wince}"
echo " Wayland EGL..................: ${have_wl}"
echo " Wayland SHM..................: ${have_wl_egl}"
echo " Wayland EGL..................: ${have_wayland_egl}"
echo " Wayland SHM..................: ${have_wayland_shm}"
echo
echo " Installation:"
echo " prefix.......................: ${prefix}"