[folks] build: Fix PKG_CONFIG_PATH for calls to g-ir-scanner

[Philip Withnall <pwithnall src gnome org>]

commit 1af18e6813cf1cb2e6319f03b7f5dd9bf22587bd
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Fri Oct 25 20:15:27 2013 +0100

    build: Fix PKG_CONFIG_PATH for calls to g-ir-scanner
    
    Ensure that g-ir-scanner’s PKG_CONFIG_PATH includes the build
    directory containing the generated -uninstalled.pc files for folks,
    so that the backends can link against it properly for being scanned.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=708059

 NEWS                                        |    2 ++
 backends/eds/lib/Makefile.am                |    4 ++++
 backends/libsocialweb/lib/Makefile.am       |    4 ++++
 backends/telepathy/lib/Makefile.am          |    4 ++++
 backends/tracker/lib/Makefile.am            |    4 ++++
 configure.ac                                |    5 -----
 folks/Makefile.am                           |    4 ++++
 tests/lib/telepathy/contactlist/Makefile.am |    4 ++++
 8 files changed, 26 insertions(+), 5 deletions(-)
---
diff --git a/NEWS b/NEWS
index 061a6da..0fd1f52 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,8 @@ Bugs fixed:
   implementation respect the algorithm described in
   http://blog.barisione.org/2010-06/handling-phone-numbers
 • Bug 710869 — Disable some GCC warnings for generated C code
+• Bug 708059 — build failure: fatal error: folks/folks.h: No such file or
+  directory
 
 API changes:
 
diff --git a/backends/eds/lib/Makefile.am b/backends/eds/lib/Makefile.am
index 1dc88e0..9172585 100644
--- a/backends/eds/lib/Makefile.am
+++ b/backends/eds/lib/Makefile.am
@@ -126,6 +126,10 @@ INTROSPECTION_SCANNER_ARGS = \
        --warn-all \
        $(NULL)
 
+# Set PKG_CONFIG_PATH so we can find the backend's uninstalled pkg-config file.
+INTROSPECTION_SCANNER_ENV = \
+       PKG_CONFIG_PATH=$(top_builddir)/folks:$${PKG_CONFIG_PATH}
+
 INTROSPECTION_COMPILER_ARGS = \
        --includedir=$(srcdir) \
        --includedir=$(abs_top_builddir)/folks \
diff --git a/backends/libsocialweb/lib/Makefile.am b/backends/libsocialweb/lib/Makefile.am
index be74f15..5c26f52 100644
--- a/backends/libsocialweb/lib/Makefile.am
+++ b/backends/libsocialweb/lib/Makefile.am
@@ -113,6 +113,10 @@ INTROSPECTION_SCANNER_ARGS = \
        --warn-all \
        $(NULL)
 
+# Set PKG_CONFIG_PATH so we can find the backend's uninstalled pkg-config file.
+INTROSPECTION_SCANNER_ENV = \
+       PKG_CONFIG_PATH=$(top_builddir)/folks:$${PKG_CONFIG_PATH}
+
 INTROSPECTION_COMPILER_ARGS = \
        --includedir=$(srcdir) \
        --includedir=$(abs_top_builddir)/folks \
diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am
index 2f0b9c4..6b81966 100644
--- a/backends/telepathy/lib/Makefile.am
+++ b/backends/telepathy/lib/Makefile.am
@@ -322,6 +322,10 @@ INTROSPECTION_SCANNER_ARGS = \
        --warn-all \
        $(NULL)
 
+# Set PKG_CONFIG_PATH so we can find the backend's uninstalled pkg-config file.
+INTROSPECTION_SCANNER_ENV = \
+       PKG_CONFIG_PATH=$(top_builddir)/folks:$${PKG_CONFIG_PATH}
+
 DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
 
 INTROSPECTION_COMPILER_ARGS = \
diff --git a/backends/tracker/lib/Makefile.am b/backends/tracker/lib/Makefile.am
index de878f8..3e1ebe8 100644
--- a/backends/tracker/lib/Makefile.am
+++ b/backends/tracker/lib/Makefile.am
@@ -105,6 +105,10 @@ INTROSPECTION_SCANNER_ARGS = \
        --warn-all \
        $(NULL)
 
+# Set PKG_CONFIG_PATH so we can find the backend's uninstalled pkg-config file.
+INTROSPECTION_SCANNER_ENV = \
+       PKG_CONFIG_PATH=$(top_builddir)/folks:$${PKG_CONFIG_PATH}
+
 INTROSPECTION_COMPILER_ARGS = \
        --includedir=$(srcdir) \
        --includedir=$(abs_top_builddir)/folks \
diff --git a/configure.ac b/configure.ac
index 991a94e..3dea7ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,11 +54,6 @@ LT_INIT
 PKG_PROG_PKG_CONFIG([0.21])
 GLIB_GSETTINGS
 
-# Always look for .pc files in /folks so backend support libraries can be
-# introspected properly
-PKG_CONFIG_PATH=$(pwd)/folks:$PKG_CONFIG_PATH
-AC_SUBST([PKG_CONFIG_PATH])
-
 AC_SUBST([CFLAGS])
 AC_SUBST([CPPFLAGS])
 AC_SUBST([LDFLAGS])
diff --git a/folks/Makefile.am b/folks/Makefile.am
index e58d827..915d950 100644
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -197,6 +197,10 @@ INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS =
 INTROSPECTION_COMPILER_ARGS = -l $(libfolks_dlname)
 
+# Set PKG_CONFIG_PATH so we can find the backend's uninstalled pkg-config file.
+INTROSPECTION_SCANNER_ENV = \
+       PKG_CONFIG_PATH=$(top_builddir)/folks:$${PKG_CONFIG_PATH}
+
 if HAVE_INTROSPECTION
 Folks-$(API_VERSION_DOT).gir: libfolks.la
 GIRS = Folks-$(API_VERSION_DOT).gir
diff --git a/tests/lib/telepathy/contactlist/Makefile.am b/tests/lib/telepathy/contactlist/Makefile.am
index 05d23f6..d5ce41e 100644
--- a/tests/lib/telepathy/contactlist/Makefile.am
+++ b/tests/lib/telepathy/contactlist/Makefile.am
@@ -67,6 +67,10 @@ INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
 INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 
+# Set PKG_CONFIG_PATH so we can find the backend's uninstalled pkg-config file.
+INTROSPECTION_SCANNER_ENV = \
+       PKG_CONFIG_PATH=$(top_builddir)/folks:$${PKG_CONFIG_PATH}
+
 tp-test-contactlist.gir: $(libtp_test_contactlist_la_SOURCES) \
        libtp-test-contactlist.la
 tp_test_contactlist_gir_INCLUDES = GObject-2.0 TelepathyGLib-0.12