Fix (from devilhorns) expedite built in the case that we have wayland libraries installed,
but do not have EFL built with wayland support Hey Devilhorns, I am drunk and I just want to sleep but I promised you to push it so...
This commit is contained in:
parent
36fa887496
commit
19e674eeef
18
configure.ac
18
configure.ac
|
@ -93,12 +93,6 @@ AC_SUBST(gl_cocoa_libs)
|
||||||
EXPEDITE_CHECK_ENGINE([software-16-wince], [Software 16 bits WinCE], "yes", [wince_16_libs="-laygshell"])
|
EXPEDITE_CHECK_ENGINE([software-16-wince], [Software 16 bits WinCE], "yes", [wince_16_libs="-laygshell"])
|
||||||
AC_SUBST(wince_16_libs)
|
AC_SUBST(wince_16_libs)
|
||||||
|
|
||||||
# Wayland EGL
|
|
||||||
EXPEDITE_CHECK_ENGINE([wayland-egl], [Wayland EGL], "yes")
|
|
||||||
|
|
||||||
# Wayland SHM
|
|
||||||
EXPEDITE_CHECK_ENGINE([wayland-shm], [Wayland SHM], "yes")
|
|
||||||
|
|
||||||
### Checks for programs
|
### Checks for programs
|
||||||
|
|
||||||
AC_ISC_POSIX
|
AC_ISC_POSIX
|
||||||
|
@ -197,14 +191,20 @@ have_wl_egl="no"
|
||||||
if test "x$want_wayland_egl" = "xyes" -o "x$want_wayland_shm" = "xyes"; then
|
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"])
|
PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client], [have_wl="yes"], [have_wl="no"])
|
||||||
if test "x$have_wl" = "xyes"; then
|
if test "x$have_wl" = "xyes"; then
|
||||||
AC_DEFINE(BUILD_WAYLAND, 1, [build wayland support])
|
EXPEDITE_CHECK_ENGINE([wayland-shm], [Wayland SHM], "yes",
|
||||||
AC_DEFINE(BUILD_WAYLAND_SHM, 1, [build wayland SHM support])
|
[
|
||||||
|
AC_DEFINE(BUILD_WAYLAND, 1, [build wayland support])
|
||||||
|
AC_DEFINE(BUILD_WAYLAND_SHM, 1, [build wayland SHM support])
|
||||||
|
])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$have_wl" = "xyes" -a "x$want_wayland_egl" = "xyes"; then
|
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"])
|
PKG_CHECK_MODULES([WAYLAND_EGL], [wayland-egl], [have_wl_egl="yes"], [have_wl_egl="no"])
|
||||||
if test "x$have_wl_egl" = "xyes"; then
|
if test "x$have_wl_egl" = "xyes"; then
|
||||||
AC_DEFINE(BUILD_WAYLAND_EGL, 1, [build wayland EGL support])
|
EXPEDITE_CHECK_ENGINE([wayland-egl], [Wayland EGL], "yes",
|
||||||
|
[
|
||||||
|
AC_DEFINE(BUILD_WAYLAND_EGL, 1, [build wayland EGL support])
|
||||||
|
])
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue