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 /tools | |
| 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>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/ci-build.sh | 4 |
1 files changed, 4 insertions, 0 deletions
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 |