diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2023-02-06 18:09:37 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2023-02-06 18:09:37 -0800 |
| commit | 80959deec664cd80cd5dbf84af86b52ded4eaee0 (patch) | |
| tree | b92edf5aa99e997a543968bca699264dcd295859 | |
| parent | ca502149fb2abad58446ebf234aa5e1e40ed4517 (diff) | |
Re-enable code to use XKB Bells
Enabled by default, use ./configure --without-xkb to disable.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | configure.ac | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8917bf1..b3f0d27 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,8 +30,8 @@ variables: # The tag should be updated each time the list of packages is updated. # Changing a tag forces the associated image to be rebuilt. # Note: the tag has no meaning, we use a date format purely for readability - FDO_DISTRIBUTION_TAG: '2021-12-03.0' - FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake make xorg-util-macros xorgproto libx11 libxt libxmu libxaw' + FDO_DISTRIBUTION_TAG: '2023-02-06.0' + FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake make xorg-util-macros xorgproto libx11 libxt libxmu libxaw libxkbfile' # diff --git a/configure.ac b/configure.ac index e5557e0..75cf4e2 100644 --- a/configure.ac +++ b/configure.ac @@ -37,8 +37,18 @@ m4_ifndef([XORG_MACROS_VERSION], XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS +# Optional dependencies +AC_ARG_WITH(xkb, + AS_HELP_STRING([--without-xkb], + [Disable use of XKB to sound bells (Default is with-xkb)]), + use_xkb="$withval", use_xkb="yes") +if test x$use_xkb != xno ; then + XKBMODULE="xkbfile" + AC_DEFINE([XKB], 1, [Define to use XkbStdBell (libxkbfile)]) +fi + # Obtain compiler/linker options from dependencies -PKG_CHECK_MODULES(EDITRES, [xaw7 x11 xt >= 1.0.99.1 xmu xproto >= 7.0.17]) +PKG_CHECK_MODULES(EDITRES, [xaw7 x11 xt >= 1.0.99.1 xmu xproto >= 7.0.17 ${XKBMODULE}]) PKG_CHECK_MODULES(APPDEFS, xt) xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt` |