summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColomban Wendling <[email protected]>2020-08-08 20:58:03 +0200
committerRobert Antoni Buj Gelonch <[email protected]>2020-08-08 23:24:58 +0200
commit27adfb941829c99638219e3e76371c86e42e3dcb (patch)
tree42eea6657ec0dac4cd322f3378a419a414d5bcd8
parent06664526f7f019d75785e194c65654449a72fe3c (diff)
downloadmate-settings-daemon-27adfb941829c99638219e3e76371c86e42e3dcb.tar.bz2
mate-settings-daemon-27adfb941829c99638219e3e76371c86e42e3dcb.tar.xz
Add option --without-libatspi and assorted status line
-rw-r--r--configure.ac21
1 files changed, 15 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 8ec3b57..cf4f72a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,13 +120,21 @@ dnl ---------------------------------------------------------------------------
dnl - Check for libatspi
dnl ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(LIBATSPI, atspi-2 >= $LIBATSPI_REQUIRED_VERSION,
- [AC_DEFINE(HAVE_LIBATSPI, 1, [Define if libatspi is available])
- have_libatspi=yes], have_libatspi=no)
+AC_ARG_WITH([libatspi],
+ [AS_HELP_STRING([--without-libatspi], [Disable key monitoring support (default: auto)])],
+ [with_libatspi=$withval], [with_libatspi=auto])
+
+have_libatspi=no
+AS_IF([test "x$with_libatspi" != xno],
+ [PKG_CHECK_MODULES([LIBATSPI], [atspi-2 >= $LIBATSPI_REQUIRED_VERSION],
+ [AC_DEFINE([HAVE_LIBATSPI], [1], [Define if libatspi is available])
+ have_libatspi=yes], [have_libatspi=no])
+ AS_IF([test "x$have_libatspi" = xno -a "x$with_libatspi" = xyes],
+ [AC_MSG_ERROR([libatspi support requested but libraries not found])])
+ PKG_CHECK_EXISTS([atspi-2 > 2.36.0],
+ [AC_DEFINE([DESTROYING_ATSPI_LISTENER_DOES_NOT_CRASH], [1], [Define if libatspi does not have bug 22])],
+ [])])
AM_CONDITIONAL([HAVE_LIBATSPI], [test "x$have_libatspi" = xyes])
-PKG_CHECK_EXISTS([atspi-2 > 2.36.0],
- [AC_DEFINE([DESTROYING_ATSPI_LISTENER_DOES_NOT_CRASH], [1], [Define if libatspi does not have bug 22])],
- [])
dnl ---------------------------------------------------------------------------
dnl - Check for D-Bus
@@ -485,6 +493,7 @@ echo "
PulseAudio support: ${have_pulse}
Libnotify support: ${have_libnotify}
+ Libatspi support: ${have_libatspi}
Libcanberra support: ${have_libcanberra}
Libmatemixer support: ${have_libmatemixer}
Smartcard support: ${have_smartcard_support}