diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2019-03-03 11:36:00 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2019-03-03 11:36:00 -0800 |
| commit | 6a4309a40f48321c69952bfbee4c73cf2d8405dd (patch) | |
| tree | d13efe40cc22b6dd88e277dadbd0f58144b33d8a | |
| parent | 63d2de15dbac3db071beafaad7bbc7ccf0ff79cd (diff) | |
Re-enable code to use XKB Bells
Enabled by default, use --without-xkb to disable.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | grid.c | 4 |
2 files changed, 15 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 8f266c3..2c478ed 100644 --- a/configure.ac +++ b/configure.ac @@ -57,8 +57,18 @@ if test "x$USE_GETTEXT" = "xyes" ; then fi AM_CONDITIONAL(USE_GETTEXT, test "x$USE_GETTEXT" = "xyes") +# 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]) +fi + # Checks for pkg-config packages -PKG_CHECK_MODULES(XFD, [xaw7 fontconfig xft xrender xmu xproto >= 7.0.17]) +PKG_CHECK_MODULES(XFD, [xaw7 fontconfig xft xrender xmu xproto >= 7.0.17 ${XKBMODULE}]) PKG_CHECK_MODULES(APPDEFS, xt) xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt` @@ -25,6 +25,10 @@ in this Software without prior written authorization from The Open Group. * Author: Jim Fulton, MIT X Consortium */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> #include <X11/Xaw/SimpleP.h> |