Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
bryceharrington authored and jadahl committed Dec 4, 2015
1 parent 3543bb7 commit da33164
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
2 changes: 2 additions & 0 deletions configure.ac
Expand Up @@ -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])
Expand Down
12 changes: 12 additions & 0 deletions 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])
])])

0 comments on commit da33164

Please sign in to comment.