aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorChris Michael <cpmichael@osg.samsung.com>2016-01-14 08:56:50 -0500
committerChris Michael <cpmichael@osg.samsung.com>2016-01-14 08:56:50 -0500
commit542e44a4457087c8ef65afc1ac3b18cc8dffbbf0 (patch)
tree91277e640fcd9dd5dd544aa083be3e3042255baf /configure.ac
parentPort e_alert to implement WBOD for drm/wayland (diff)
downloadenlightenment-542e44a4457087c8ef65afc1ac3b18cc8dffbbf0.tar.gz
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>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac30
1 files changed, 19 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac
index dcecd586f..f5a4960b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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