diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2022-10-15 10:52:48 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2022-10-15 11:25:32 -0700 |
| commit | f70d09457ae6ea2248e074f57fdb16de925c43e2 (patch) | |
| tree | b561f36d56b610784b9bbda5771a30120cbe8519 | |
| parent | 691a763dafc81db145a951d3151e7f050c2fb342 (diff) | |
Add configure check and --with-xkb option for use of XkbStdBell
Optionally enable existing code to call XkbStdBell from libxkbfile
Enabled by default if libxkbfile is available, disable with --without-xkb
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | configure.ac | 23 |
2 files changed, 24 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 106e7cc..0d63b0e 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-06.1' - FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake make xorg-util-macros xorgproto libsm libxaw libxmu libxt libxext libx11 libxft libxrender' + FDO_DISTRIBUTION_TAG: '2022-10-15.0' + FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake make xorg-util-macros xorgproto libsm libxaw libxmu libxt libxext libx11 libxft libxrender libxkbfile' # diff --git a/configure.ac b/configure.ac index 42fedc8..dfd5680 100644 --- a/configure.ac +++ b/configure.ac @@ -39,8 +39,11 @@ XORG_DEFAULT_OPTIONS # Base set of required pkg-config packages XLOGO_DEPS="sm xaw7 xmu xt >= 1.0 xext x11" -# Use render & xft2 to draw logo? +# Ensure pkg-config is initialized, since first call to macros is conditional +PKG_PROG_PKG_CONFIG +# Use render & xft2 to draw logo? +AC_MSG_CHECKING([whether to use render & xft2 to draw logo]) AC_ARG_WITH(render, AS_HELP_STRING([--with-render], [Use Xrender & Xft2 to draw logo]), USE_RENDER="$withval", USE_RENDER="try") @@ -48,6 +51,7 @@ AC_ARG_WITH(render, if test "x$USE_RENDER" = "xtry" ; then PKG_CHECK_EXISTS([xrender xft], USE_RENDER="yes", USE_RENDER="no") fi +AC_MSG_RESULT([$USE_RENDER]) if test "x$USE_RENDER" = "xyes" ; then XLOGO_DEPS="xft xrender $XLOGO_DEPS" @@ -56,6 +60,23 @@ if test "x$USE_RENDER" = "xyes" ; then fi AM_CONDITIONAL([USE_RENDER], [test "x$USE_RENDER" = "xyes"]) +# Use XKB to ring the bell? +AC_MSG_CHECKING([whether to use XkbStdBell]) +AC_ARG_WITH(xkb, + AS_HELP_STRING([--with-xkb], [Use XKB to sound bells]), + USE_XKB="$withval", USE_XKB="try") + +if test "x$USE_XKB" = "xtry" ; then + PKG_CHECK_EXISTS([xkbfile], USE_XKB="yes", USE_XKB="no") +fi +AC_MSG_RESULT([$USE_XKB]) + +if test "x$USE_XKB" = "xyes" ; then + XLOGO_DEPS="xkbfile $XLOGO_DEPS" + + AC_DEFINE(XKB, 1, [Define to 1 to use XkbStdBell]) +fi + PKG_CHECK_MODULES(XLOGO, $XLOGO_DEPS) PKG_CHECK_MODULES(APPDEFS, xt) |