fix wayland related conditionals in configure.ac
authorJérémy Zurcher <jeremy@asynk.ch>
Tue, 16 Apr 2013 13:07:13 +0000 (15:07 +0200)
committerJérémy Zurcher <jeremy@asynk.ch>
Tue, 16 Apr 2013 13:12:44 +0000 (15:12 +0200)
AM_CONDITIONAL can't be invoked conditionally

configure.ac

index fa511a3..f987e6b 100644 (file)
@@ -840,6 +840,7 @@ fi
 
 AM_CONDITIONAL([HAVE_WAYLAND_CLIENTS], [test "x${have_wayland_clients}" = "xyes"])
 
+AM_CONDITIONAL([HAVE_WAYLAND_EGL], false)
 if test "x${have_wayland_clients}" = "xyes"; then
   AC_ARG_ENABLE([wayland-egl],
     AS_HELP_STRING([--enable-wayland-egl],[enable wayland clients to render using EGL @<:@default=disabled@:>@]),
@@ -863,10 +864,11 @@ if test "x${have_wayland_clients}" = "xyes"; then
   AM_CONDITIONAL([HAVE_WAYLAND_EGL], [test "x${have_wayland_egl}" = "xyes"])
 fi
 
-AM_CONDITIONAL(WL_DESKTOP_SHELL, false)
+AM_CONDITIONAL(HAVE_WL_DESKTOP_SHELL, false)
+AM_CONDITIONAL(USE_MODULE_WL_DESKTOP_SHELL, false)
 define([CHECK_MODULE_WL_DESKTOP_SHELL],
 [
-  AC_E_CHECK_PKG(WL_DESKTOP_SHELL, [ ecore >= $efl_version eina >= $efl_version ], [], [WL_DESKTOP_SHELL=false])
+  AC_E_CHECK_PKG(WL_DESKTOP_SHELL, [ ecore >= $efl_version eina >= $efl_version ], [], [HAVE_WL_DESKTOP_SHELL=false])
 ])
 
 AC_E_OPTIONAL_MODULE([ibar], true)