add wayland variable to pkgconfig

modules should be able to detect whether wayland support is available
devs/derekf/for_derbyw
Mike Blumenkrantz 6 years ago
parent 31994d4876
commit 64a1251de7
  1. 2
      configure.ac
  2. 1
      enlightenment.pc.in
  3. 8
      meson.build

@ -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

@ -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

@ -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)
]
)

Loading…
Cancel
Save