diff options
| author | Simon McVittie <smcv@collabora.com> | 2018-01-29 10:05:37 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2018-01-29 10:05:37 +0000 |
| commit | 05ef07b9b5a6ae4b53dc80728563d2455fe7e24f (patch) | |
| tree | a604e3de06e417b0e230a11fee251d845afe6d8b | |
| parent | 9606cec969ba01252ae6ea08f4ac5f389f1e3c76 (diff) | |
Require dbus 1.8
On Travis-CI, cheat our way around the obsolete version of Ubuntu used
for most builds: we can in fact compile against dbus 1.6, if we apply
some force.
Signed-off-by: Simon McVittie <smcv@collabora.com>
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rwxr-xr-x | tools/ci-build.sh | 4 |
3 files changed, 6 insertions, 3 deletions
@@ -8,12 +8,11 @@ Dependencies: • When using Python 3, version 3.4 or later is now required. Python 3.2 security support ended in 2016, and Python 3.3 security support ended in 2017. -• Unit tests now require the dbus-run-session tool from dbus version - 1.8 or later. • Most unit tests now require the tap.py module from PyPI. • The deprecated dbus-glib library is no longer required. A bundled copy of its main loop integration code is included instead. • GLib version 2.40 or later is required. +• libdbus version 1.8 or later is required. Enhancements: diff --git a/configure.ac b/configure.ac index 719a0db..fa7149f 100644 --- a/configure.ac +++ b/configure.ac @@ -187,7 +187,7 @@ AC_SUBST([RST2HTMLFLAGS]) AM_CONDITIONAL([ENABLE_API_DOCS], [test "$enable_api_docs" != no]) AM_CONDITIONAL([ENABLE_DOCS], [test "$enable_html_docs" != no]) -PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.6]) +PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.8]) PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.40]) AX_COMPILER_FLAGS([WARN_CFLAGS], diff --git a/tools/ci-build.sh b/tools/ci-build.sh index 5bee4ae..a643fb9 100755 --- a/tools/ci-build.sh +++ b/tools/ci-build.sh @@ -104,6 +104,10 @@ EOF $(pkg-config --cflags --libs dbus-1) \ ${NULL} export PATH="${drsdir}:$PATH" + + # Force the build to be run even though dbus is less than version 1.8. + export DBUS_CFLAGS="$(pkg-config --cflags dbus-1)" + export DBUS_LIBS="$(pkg-config --libs dbus-1)" fi NOCONFIGURE=1 ./autogen.sh |