summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Lima (Etrunko) <eduardo.lima@intel.com>2012-11-09 18:23:17 +0000
committerEduardo de Barros Lima <eblima@gmail.com>2012-11-09 18:23:17 +0000
commit8f5ebabc11869693ef035c4b86a12c1384f2eabb (patch)
tree41333b88f843dbd3c55f748ed04387b72fc625ea
parent902905ef6018ddf4aade38a5abb0b86d78376af1 (diff)
Move AM_CONDITIONAL to outside the if block
The configure script was failing fail if the --disable option for the wayland engines were explicitly set. Signed-off-by: Eduardo Lima (Etrunko) <eduardo.lima@intel.com> SVN revision: 79034
Diffstat (limited to '')
-rw-r--r--configure.ac9
1 files changed, 6 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 1873f02..0359a65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -189,10 +189,10 @@ AM_CONDITIONAL(BUILD_DIRECTFB, test "x$have_directfb" = "xyes")
189 189
190# Wayland 190# Wayland
191 191
192have_wl="no"
193have_wl_egl="no"
192if test "x$want_wayland_egl" = "xyes" -o "x$want_wayland_shm" = "xyes"; then 194if test "x$want_wayland_egl" = "xyes" -o "x$want_wayland_shm" = "xyes"; then
193 PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client], [have_wl="yes"], [have_wl="no"]) 195 PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client], [have_wl="yes"], [have_wl="no"])
194 AM_CONDITIONAL(BUILD_WAYLAND, test "x$have_wl" = "xyes")
195 AM_CONDITIONAL(BUILD_WAYLAND_SHM, test "x$have_wl" = "xyes")
196 if test "x$have_wl" = "xyes"; then 196 if test "x$have_wl" = "xyes"; then
197 AC_DEFINE(BUILD_WAYLAND, 1, [build wayland support]) 197 AC_DEFINE(BUILD_WAYLAND, 1, [build wayland support])
198 AC_DEFINE(BUILD_WAYLAND_SHM, 1, [build wayland SHM support]) 198 AC_DEFINE(BUILD_WAYLAND_SHM, 1, [build wayland SHM support])
@@ -200,13 +200,16 @@ if test "x$want_wayland_egl" = "xyes" -o "x$want_wayland_shm" = "xyes"; then
200 200
201 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
202 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"])
203 AM_CONDITIONAL(BUILD_WAYLAND_EGL, test "x$have_wl_egl" = "xyes")
204 if test "x$have_wl_egl" = "xyes"; then 203 if test "x$have_wl_egl" = "xyes"; then
205 AC_DEFINE(BUILD_WAYLAND_EGL, 1, [build wayland EGL support]) 204 AC_DEFINE(BUILD_WAYLAND_EGL, 1, [build wayland EGL support])
206 fi 205 fi
207 fi 206 fi
208fi 207fi
209 208
209AM_CONDITIONAL(BUILD_WAYLAND, test "x$have_wl" = "xyes")
210AM_CONDITIONAL(BUILD_WAYLAND_SHM, test "x$have_wl" = "xyes")
211AM_CONDITIONAL(BUILD_WAYLAND_EGL, test "x$have_wl_egl" = "xyes")
212
210### Checks for header files 213### Checks for header files
211 214
212 215