build: fix wlterm wayland-dependency check

The logic behind this two-layer check is bogus and doesn't work. Merge
both layers so we have a proper dependency-check again. This will make the
error messages less verbose but at least it works again.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2012-11-17 19:42:57 +01:00
parent 64eccac61f
commit 0799a4e1fb

View File

@ -605,21 +605,17 @@ if test ! "x$enable_wlterm" = "xno" ; then
wlterm_avail=no
elif test "x$eloop_avail" = "xno" ; then
wlterm_avail=no
elif test ! "x$have_wayland" = "xyes" ; then
wlterm_avail=no
else
wlterm_avail=yes
fi
if test "x$enable_wlterm" = "xyes" ; then
if test "x$wlterm_avail" = "xno" ; then
AC_ERROR([eloop or TSM cannot be built for wlterm])
AC_ERROR([wayland, eloop or TSM cannot be built for wlterm])
fi
fi
if test "x$have_wayland" = "xyes" ; then
wlterm_avail=yes
elif test "x$enable_wlterm" = "xyes" ; then
AC_ERROR([wayland libraries not found for wlterm])
fi
fi
#