On Thu, Dec 03, 2015 at 02:45:14PM -0800, Bryce Harrington wrote: > 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 <[email protected]> > Cc: Pekka Paalanen <[email protected]> > Cc: Quentin Glidic <[email protected]> > Cc: Peter Hutterer <[email protected]> > --- > > Changes from v1 > - Document why the work around is needed and what obsoletes it. > - Drop pkgconfigdir, which isn't strictly needed > > compat.m4 | 12 ++++++++++++ > configure.ac | 2 ++ > 2 files changed, 14 insertions(+) > create mode 100644 compat.m4 > > diff --git a/compat.m4 b/compat.m4 > new file mode 100644 > index 0000000..290ef03 > --- /dev/null > +++ b/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).
hehe, that is more detail than I thought was necessary (first paragraph would be enough for me), but better too much than too little Reviewed-by: Peter Hutterer <[email protected]> Cheers, Peter > +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 > _______________________________________________ wayland-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/wayland-devel
