[PATCH] configure.ac: Fix compatibility for older pkg-config versions
Bryce Harrington
bryce at osg.samsung.com
Thu Dec 3 13:43:44 PST 2015
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 at osg.samsung.com>
Cc: Pekka Paalanen <ppaalanen at gmail.com>
Cc: Quentin Glidic <sardemff7+wayland at sardemff7.net>
---
compat.m4 | 9 +++++++++
configure.ac | 2 ++
2 files changed, 11 insertions(+)
create mode 100644 compat.m4
diff --git a/compat.m4 b/compat.m4
new file mode 100644
index 0000000..d036f4d
--- /dev/null
+++ b/compat.m4
@@ -0,0 +1,9 @@
+m4_ifndef([PKG_INSTALLDIR], [AC_DEFUN([PKG_INSTALLDIR], [
+ pkgconfigdir='${libdir}'/pkgconfig
+ AC_SUBST([pkgconfigdir])
+])])
+
+m4_ifndef([PKG_NOARCH_INSTALLDIR], [AC_DEFUN([PKG_NOARCH_INSTALLDIR], [
+ noarch_pkgconfigdir='${datadir}'/pkgconfig
+ AC_SUBST([noarch_pkgconfigdir])
+])])
diff --git a/configure.ac b/configure.ac
index 93688d0..eeb95ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,6 +11,8 @@ AC_INIT([wayland-protocols],
[wayland-protocols],
[http://wayland.freedesktop.org/])
+m4_include(compat.m4)
+
AC_SUBST([WAYLAND_PROTOCOLS_VERSION], [wayland_protocols_version])
AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
--
1.9.1
More information about the wayland-devel
mailing list