enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

Fix build break for non-wayland builds 

This patch fixes an issue where implementing WBOD for wayland would
always (previously) require ecore-drm to build. We fix this by
adjusting the enlightenment_alert requirements based on if we are
building with wayland support or not.

Signed-off-by: Chris Michael <cpmichael@osg.samsung.com>
This commit is contained in:
Chris Michael 2016-01-14 08:56:50 -05:00
parent 3911b504cc
commit 542e44a445
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
configure.ac
View File

@ -934,18 +934,26 @@ fi
AM_CONDITIONAL([HAVE_WAYLAND_ONLY], [test "x${have_wayland_only}" = "xyes"])
e_alert_requires="\
evas >= $efl_version \
ecore >= $efl_version \
xcb \
xcb-shape \
xcb-keysyms \
eina >= ${efl_version} \
ecore >= ${efl_version} \
ecore-ipc >= ${efl_version}"
if test "x${have_wayland}" = "xyes"; then
e_alert_requires="\
$e_alert_requires \
ecore-input >= ${efl_version} \
ecore-drm >= ${efl_version} \
evas >= ${efl_version}"
fi
if test "x${have_wayland_only}" != "xyes"; then
PKG_CHECK_MODULES(E_ALERT, [
xcb
xcb-shape
xcb-keysyms
eina >= ${efl_version}
ecore >= ${efl_version}
ecore-ipc >= ${efl_version}
ecore-input >= ${efl_version}
ecore-drm >= ${efl_version}
evas >= ${efl_version}
])
PKG_CHECK_MODULES(E_ALERT, [$e_alert_requires])
fi
if test "x${have_wayland_only}" != "xyes"; then