rvandegrift
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "[HACK??] Fixes wayland-only build" 

This reverts commit bc3464e98c.
This commit is contained in:
Nicolas Aguirre 2015-11-03 08:01:26 +01:00
parent 3e3a806c43
commit c15dd79841
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -448,10 +448,10 @@ AM_CONDITIONAL([HAVE_EEZE_MOUNT], [test -n "$eeze_mount"])
have_wayland_only=no have_wayland_only=no
AC_ARG_ENABLE([wayland], AC_ARG_ENABLE([wayland],
AS_HELP_STRING([--enable-wayland],[enable wayland support in enlightenment @<:@default=disabled@:>@]), AS_HELP_STRING([--enable-wayland],[enable wayland support in enlightenment @<:@default=disabled@:>@]),
[have_wayland_only=$enableval], [e_cv_want_wayland_only=$enableval],
[have_wayland_only=no]) [e_cv_want_wayland_only=no])
AC_MSG_CHECKING([whether wayland support is enabled]) AC_MSG_CHECKING([whether wayland support is enabled])
AC_MSG_RESULT([${have_wayland_only}]) AC_MSG_RESULT([${e_cv_want_wayland_only}])
# doxygen program for documentation building # doxygen program for documentation building
@ -744,7 +744,7 @@ AC_MSG_RESULT([${e_cv_want_wayland_egl}])
if test "x${e_cv_want_wayland_only}" != "xno" ;then if test "x${e_cv_want_wayland_only}" != "xno" ;then
PKG_CHECK_MODULES([WAYLAND], [ecore-wayland >= 1.16 wayland-server >= 1.8.0 wayland-client >= 1.8.0 xkbcommon uuid], PKG_CHECK_MODULES([WAYLAND], [ecore-wayland >= 1.16 wayland-server >= 1.8.0 wayland-client >= 1.8.0 xkbcommon uuid],
[ [
have_wayland=yes have_wayland_only=yes
AC_DEFINE_UNQUOTED([HAVE_WAYLAND],[1],[enable wayland support]) AC_DEFINE_UNQUOTED([HAVE_WAYLAND],[1],[enable wayland support])
]) ])
else else