summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Zaoui <daniel.zaoui@samsung.com>2013-10-22 19:43:54 +0300
committerDaniel Zaoui <daniel.zaoui@samsung.com>2013-10-23 02:37:10 +0300
commit19e674eeef638a69f7678bb0c184cdf30d178751 (patch)
treeaf72455f662572f4b56cfd1878ee8fc80d406b1a
parent36fa887496789b9adfca56813b9f2f59f584c64a (diff)
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...
-rw-r--r--configure.ac18
1 files changed, 9 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac
index 073473b..000e297 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,12 +93,6 @@ AC_SUBST(gl_cocoa_libs)
93EXPEDITE_CHECK_ENGINE([software-16-wince], [Software 16 bits WinCE], "yes", [wince_16_libs="-laygshell"]) 93EXPEDITE_CHECK_ENGINE([software-16-wince], [Software 16 bits WinCE], "yes", [wince_16_libs="-laygshell"])
94AC_SUBST(wince_16_libs) 94AC_SUBST(wince_16_libs)
95 95
96# Wayland EGL
97EXPEDITE_CHECK_ENGINE([wayland-egl], [Wayland EGL], "yes")
98
99# Wayland SHM
100EXPEDITE_CHECK_ENGINE([wayland-shm], [Wayland SHM], "yes")
101
102### Checks for programs 96### Checks for programs
103 97
104AC_ISC_POSIX 98AC_ISC_POSIX
@@ -197,14 +191,20 @@ have_wl_egl="no"
197if test "x$want_wayland_egl" = "xyes" -o "x$want_wayland_shm" = "xyes"; then 191if test "x$want_wayland_egl" = "xyes" -o "x$want_wayland_shm" = "xyes"; then
198 PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client], [have_wl="yes"], [have_wl="no"]) 192 PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client], [have_wl="yes"], [have_wl="no"])
199 if test "x$have_wl" = "xyes"; then 193 if test "x$have_wl" = "xyes"; then
200 AC_DEFINE(BUILD_WAYLAND, 1, [build wayland support]) 194 EXPEDITE_CHECK_ENGINE([wayland-shm], [Wayland SHM], "yes",
201 AC_DEFINE(BUILD_WAYLAND_SHM, 1, [build wayland SHM support]) 195 [
196 AC_DEFINE(BUILD_WAYLAND, 1, [build wayland support])
197 AC_DEFINE(BUILD_WAYLAND_SHM, 1, [build wayland SHM support])
198 ])
202 fi 199 fi
203 200
204 if test "x$have_wl" = "xyes" -a "x$want_wayland_egl" = "xyes"; then 201 if test "x$have_wl" = "xyes" -a "x$want_wayland_egl" = "xyes"; then
205 PKG_CHECK_MODULES([WAYLAND_EGL], [wayland-egl], [have_wl_egl="yes"], [have_wl_egl="no"]) 202 PKG_CHECK_MODULES([WAYLAND_EGL], [wayland-egl], [have_wl_egl="yes"], [have_wl_egl="no"])
206 if test "x$have_wl_egl" = "xyes"; then 203 if test "x$have_wl_egl" = "xyes"; then
207 AC_DEFINE(BUILD_WAYLAND_EGL, 1, [build wayland EGL support]) 204 EXPEDITE_CHECK_ENGINE([wayland-egl], [Wayland EGL], "yes",
205 [
206 AC_DEFINE(BUILD_WAYLAND_EGL, 1, [build wayland EGL support])
207 ])
208 fi 208 fi
209 fi 209 fi
210fi 210fi