jeyzu pushed a commit to branch master.
commit 74270a6571a1d96851f88ab7090053d0765ac366
Author: Jérémy Zurcher <[email protected]>
Date: Tue Apr 16 15:07:13 2013 +0200
fix wayland related conditionals in configure.ac
AM_CONDITIONAL can't be invoked conditionally
---
configure.ac | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index fa511a3..f987e6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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)
--
------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
