forked from enlightenment/enlightenment
fix wayland related conditionals in configure.ac
AM_CONDITIONAL can't be invoked conditionally
This commit is contained in:
parent
d754b04421
commit
74270a6571
|
@ -840,6 +840,7 @@ fi
|
||||||
|
|
||||||
AM_CONDITIONAL([HAVE_WAYLAND_CLIENTS], [test "x${have_wayland_clients}" = "xyes"])
|
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
|
if test "x${have_wayland_clients}" = "xyes"; then
|
||||||
AC_ARG_ENABLE([wayland-egl],
|
AC_ARG_ENABLE([wayland-egl],
|
||||||
AS_HELP_STRING([--enable-wayland-egl],[enable wayland clients to render using EGL @<:@default=disabled@:>@]),
|
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"])
|
AM_CONDITIONAL([HAVE_WAYLAND_EGL], [test "x${have_wayland_egl}" = "xyes"])
|
||||||
fi
|
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],
|
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)
|
AC_E_OPTIONAL_MODULE([ibar], true)
|
||||||
|
|
Loading…
Reference in New Issue