diff options
| author | Simon McVittie <smcv@collabora.com> | 2018-12-03 16:15:59 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2018-12-03 16:15:59 +0000 |
| commit | 6c364ec3cff824f08e0dd8608db7d761f21ca8e2 (patch) | |
| tree | 46a2c35c49138333693f16e38902324746955ed0 | |
| parent | 32ccd07597dce3977ae8cd23436387be7e396523 (diff) | |
| download | dbus-glib-6c364ec3cff824f08e0dd8608db7d761f21ca8e2.tar.gz | |
Require pkg-config 0.28, for PKG_PROG_PKG_CONFIG
Signed-off-by: Simon McVittie <smcv@collabora.com>
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 9a0568a..a4f1539 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ # SOFTWARE. sudo: required -dist: trusty +dist: xenial language: c script: - ./tools/ci-install.sh @@ -30,7 +30,6 @@ script: env: - ci_variant=production - ci_variant=debug - - ci_docker=ubuntu:xenial ci_distro=ubuntu ci_suite=xenial - ci_docker=debian:jessie-slim ci_distro=debian ci_suite=jessie - ci_docker=debian:stretch-slim ci_distro=debian ci_suite=stretch @@ -9,6 +9,10 @@ Bugzilla bugs (indicated by "fd.o #nnn") to Gitlab issues ("dbus-glib#nnn") and merge requests ("dbus-glib!nnn"). See README and CONTRIBUTING.md for more details. +Dependencies: + +• pkg-config 0.28 is required when building from git + Enhancements: • Rewrite CONTRIBUTING.md document, based on Wayland's equivalent diff --git a/configure.ac b/configure.ac index 8be3147..ee67217 100644 --- a/configure.ac +++ b/configure.ac @@ -42,6 +42,8 @@ AC_SUBST(LT_CURRENT) AC_SUBST(LT_REVISION) AC_SUBST(LT_AGE) +m4_ifndef([PKG_PROG_PKG_CONFIG], + [pkg.m4 version 0.28 or later is required]) AC_PROG_CC AC_ISC_POSIX |