diff options
| author | Bryce Harrington <bryce@osg.samsung.com> | 2015-12-03 17:40:47 -0800 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2015-12-04 17:46:19 +0800 |
| commit | da331647269ee9d73c4008ae901d107320bdc8d1 (patch) | |
| tree | 27f0fb392e0789ebf584595902bf2b8b849f1b15 | |
| parent | 3543bb755c8858b0a70dfd20fd1beb74d865751d (diff) | |
| download | wayland-protocols-da331647269ee9d73c4008ae901d107320bdc8d1.tar.gz | |
configure.ac: Fix compatibility for older pkg-config versions
noarch_pkgconfigdir is not available on oldish pkg-config's. Among
other things this affects Wayland's nightly auto-build Ubuntu 14.04
PPAs.
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Cc: Pekka Paalanen <ppaalanen@gmail.com>
Cc: Quentin Glidic <sardemff7+wayland@sardemff7.net>
Cc: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | m4/compat.m4 | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 93688d0..c51b7fc 100644 --- a/configure.ac +++ b/configure.ac @@ -11,6 +11,8 @@ AC_INIT([wayland-protocols], [wayland-protocols], [http://wayland.freedesktop.org/]) +AC_CONFIG_MACRO_DIR([m4]) + AC_SUBST([WAYLAND_PROTOCOLS_VERSION], [wayland_protocols_version]) AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz]) diff --git a/m4/compat.m4 b/m4/compat.m4 new file mode 100644 index 0000000..290ef03 --- /dev/null +++ b/m4/compat.m4 @@ -0,0 +1,12 @@ +dnl noarch_pkgconfigdir only available in pkg-config 0.27 and newer +dnl http://lists.freedesktop.org/archives/pkg-config/2012-July/000875.html +dnl Ubuntu 14.04 provides only pkg-config 0.26 so lacks this function. +dnl +dnl The Wayland project maintains automated builds for Ubuntu 14.04 in +dnl a Launchpad PPA. 14.04 is a Long Term Support distro release, which +dnl will reach EOL April 2019, however the Wayland PPA may stop targeting +dnl it some time after the next LTS release (April 2016). +m4_ifndef([PKG_NOARCH_INSTALLDIR], [AC_DEFUN([PKG_NOARCH_INSTALLDIR], [ + noarch_pkgconfigdir='${datadir}'/pkgconfig + AC_SUBST([noarch_pkgconfigdir]) +])]) |