discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=64a1251de7033269ca3be841d21328aad35db326
commit 64a1251de7033269ca3be841d21328aad35db326 Author: Mike Blumenkrantz <[email protected]> Date: Fri Aug 11 18:48:53 2017 -0400 add wayland variable to pkgconfig modules should be able to detect whether wayland support is available --- configure.ac | 2 +- enlightenment.pc.in | 1 + meson.build | 8 +++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 308613cb3..d6028d946 100644 --- a/configure.ac +++ b/configure.ac @@ -694,7 +694,7 @@ if test "x${e_cv_want_wayland_only}" != "xno" ;then fi ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir) - + AC_SUBST(WAYLAND, "true") AC_DEFINE_UNQUOTED([HAVE_WAYLAND],[1],[enable wayland support]) ]) else diff --git a/enlightenment.pc.in b/enlightenment.pc.in index d1fe04379..7b08f4ce8 100644 --- a/enlightenment.pc.in +++ b/enlightenment.pc.in @@ -10,6 +10,7 @@ themes=${pkgdatadir}/themes backgrounds=${pkgdatadir}/backgrounds config_apps=@datadir@/@PACKAGE@/config-apps release=@release@ +wayland=@WAYLAND@ Name: enlightenment Description: Enlightenment Window Manager diff --git a/meson.build b/meson.build index 65bfe914e..1617ed263 100644 --- a/meson.build +++ b/meson.build @@ -350,6 +350,11 @@ subdir('doc') meson.add_install_script('meson/meson_inst.sh' , suid_exes) meson.add_install_script('meson/meson_modules.sh', module_files) +wayland = 'false' +if config_h.has('HAVE_WAYLAND') == true + wayland = 'true' +endif + configure_file(output : 'config.h', install : false, configuration: config_h) @@ -369,7 +374,8 @@ pkgconfig.generate(name : proj, 'pkgdatadir=${datarootdir}/' + proj + '/data', 'themes=${pkgdatadir}/themes', 'backgrounds=${pkgdatadir}/backgrounds', - 'release=@0@'.format(release) + 'release=@0@'.format(release), + 'wayland=@0@'.format(wayland) ] ) --
