diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-02-20 21:11:40 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-02-23 16:39:43 +0000 |
| commit | 6c433c0d50c4b5882fa0028f4cf156ff30bc67b1 (patch) | |
| tree | 40920c25b1c341cb985dbebe252e4c6cfd4e999a | |
| parent | 7ec30ffa907465698798bb38391d65bab91335bb (diff) | |
| download | dbus-6c433c0d50c4b5882fa0028f4cf156ff30bc67b1.tar.gz | |
Remove checks for dbus-glib from configure.ac
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=83115
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
| -rw-r--r-- | configure.ac | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index f197f07d..ac3ae26a 100644 --- a/configure.ac +++ b/configure.ac @@ -204,7 +204,7 @@ AC_ARG_ENABLE([tests], [ if test "x$enableval" = xyes; then AC_MSG_NOTICE([Full test coverage was requested with --enable-tests=yes]) - AC_MSG_NOTICE([This has many dependencies (GLib, dbus-glib, Python)]) + AC_MSG_NOTICE([This has many dependencies (GLib, Python etc.)]) fi enable_embedded_tests=$enableval enable_modular_tests=$enableval @@ -243,22 +243,6 @@ AS_IF([test "x$enable_modular_tests" != xno], ], [with_glib=no]) -# Not required, because we can use internal APIs (but that makes the -# "installable tests" less useful as integration tests) -AC_ARG_WITH([dbus_glib], - [AS_HELP_STRING([--with-dbus-glib], [Use dbus-glib for regression tests])], - [], - [with_dbus_glib=auto]) -AS_IF([test "x$with_dbus_glib" != xno], - [PKG_CHECK_MODULES([DBUS_GLIB], [dbus-glib-1], - [], - [AS_IF([test "x$with_dbus_glib" = xyes], - dnl specifically requested, but not found - [AC_MSG_ERROR([$DBUS_GLIB_ERRORS])], - dnl else: assumed to be "auto" - [with_dbus_glib=no])])]) -AM_CONDITIONAL([DBUS_WITH_DBUS_GLIB], [test "x$with_dbus_glib" != xno]) - if test "x$enable_modular_tests" != xno; then AC_DEFINE([DBUS_ENABLE_MODULAR_TESTS], [1], [Define to build independent test binaries]) @@ -1896,7 +1880,6 @@ echo " Building embedded tests: ${enable_embedded_tests} Building modular tests: ${enable_modular_tests} - with GLib: ${with_glib} - - with dbus-glib: ${with_dbus_glib} Installing tests: ${enable_installed_tests} Building verbose mode: ${enable_verbose_mode} Building assertions: ${enable_asserts} |