diff options
| author | Laurent Vivier <laurent@vivier.eu> | 2020-08-24 17:24:29 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2020-08-25 08:12:19 +0200 |
| commit | 4113f4cfeea57774d492af48aec97a043d82a32e (patch) | |
| tree | beeb3cc39e13e6a2a33fa4949fedbc38d57574de /configure | |
| parent | ddcf607fa3d6881cf0286a9b88a40fde265cbe37 (diff) | |
meson: move xkbcommon to meson
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Message-id: 20200824152430.1844159-2-laurent@vivier.eu
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 29 |
1 files changed, 4 insertions, 25 deletions
@@ -432,7 +432,7 @@ vde="" vnc_sasl="auto" vnc_jpeg="auto" vnc_png="auto" -xkbcommon="" +xkbcommon="auto" xen="" xen_ctrl_version="" xen_pci_passthrough="" @@ -1631,9 +1631,9 @@ for opt do ;; --disable-libpmem) libpmem=no ;; - --enable-xkbcommon) xkbcommon=yes + --enable-xkbcommon) xkbcommon="enabled" ;; - --disable-xkbcommon) xkbcommon=no + --disable-xkbcommon) xkbcommon="disabled" ;; --enable-plugins) plugins="yes" ;; @@ -3447,22 +3447,6 @@ EOF fi ########################################## -# xkbcommon probe -if test "$xkbcommon" != "no" ; then - if $pkg_config xkbcommon --exists; then - xkbcommon_cflags=$($pkg_config xkbcommon --cflags) - xkbcommon_libs=$($pkg_config xkbcommon --libs) - xkbcommon=yes - else - if test "$xkbcommon" = "yes" ; then - feature_not_found "xkbcommon" "Install libxkbcommon-devel" - fi - xkbcommon=no - fi -fi - - -########################################## # xfsctl() probe, used for file-posix.c if test "$xfs" != "no" ; then cat > $TMPC << EOF @@ -6827,11 +6811,6 @@ if test "$audio_win_int" = "yes" ; then fi echo "CONFIG_BDRV_RW_WHITELIST=$block_drv_rw_whitelist" >> $config_host_mak echo "CONFIG_BDRV_RO_WHITELIST=$block_drv_ro_whitelist" >> $config_host_mak -if test "$xkbcommon" = "yes" ; then - echo "CONFIG_XKBCOMMON=y" >> $config_host_mak - echo "XKBCOMMON_CFLAGS=$xkbcommon_cflags" >> $config_host_mak - echo "XKBCOMMON_LIBS=$xkbcommon_libs" >> $config_host_mak -fi if test "$xfs" = "yes" ; then echo "CONFIG_XFS=y" >> $config_host_mak fi @@ -8251,7 +8230,7 @@ NINJA=$PWD/ninjatool $meson setup \ -Db_coverage=$(if test "$gcov" = yes; then echo true; else echo false; fi) \ -Dsdl=$sdl -Dsdl_image=$sdl_image \ -Dvnc=$vnc -Dvnc_sasl=$vnc_sasl -Dvnc_jpeg=$vnc_jpeg -Dvnc_png=$vnc_png \ - -Dgettext=$gettext \ + -Dgettext=$gettext -Dxkbcommon=$xkbcommon \ $cross_arg \ "$PWD" "$source_path" |