On Thu, Dec 03, 2015 at 01:43:44PM -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]> > --- > 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]) > +])])
please add comments here to note why they're required and what obsoletes them. It'll save time down the road when we're trying to figure out which functions are still needed and which ones can be dropped, etc. Cheers, Peter > 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 > _______________________________________________ wayland-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/wayland-devel
