[telepathy-qt4/master] Move TelepathyQt4Farsight.pc to TelepathyQt4/, correct dependencies and add -uninstalled versions

[Simon McVittie]

The -uninstalled versions are to be able to use an uninstalled version
for development, like in telepathy-glib:
http://smcv.pseudorandom.co.uk/2008/09/pc-uninstalled/

Moving the TpQt4Fs .pc file to the parent directory means you only have to
put one directory in PKG_CONFIG_PATH.
---
 TelepathyQt4/TelepathyQt4-uninstalled.pc.in        |   11 +++++++++++
 .../TelepathyQt4Farsight-uninstalled.pc.in         |   11 +++++++++++
 .../{Farsight => }/TelepathyQt4Farsight.pc.in      |    2 +-
 configure.ac                                       |    4 +++-
 4 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 TelepathyQt4/TelepathyQt4-uninstalled.pc.in
 create mode 100644 TelepathyQt4/TelepathyQt4Farsight-uninstalled.pc.in
 rename TelepathyQt4/{Farsight => }/TelepathyQt4Farsight.pc.in (69%)

diff --git a/TelepathyQt4/TelepathyQt4-uninstalled.pc.in b/TelepathyQt4/TelepathyQt4-uninstalled.pc.in
new file mode 100644
index 0000000..c0790d0
--- /dev/null
+++ b/TelepathyQt4/TelepathyQt4-uninstalled.pc.in
@@ -0,0 +1,11 @@
+prefix=/nonexistent
+exec_prefix=/nonexistent
+abs_top_builddir=@abs_top_builddir@
+abs_top_srcdir=@abs_top_srcdir@
+
+Name: Telepathy-Qt4 (uninstalled copy)
+Description: Qt4 utility library for the Telepathy framework
+Version: @VERSION@
+Requires.private: QtCore >= 4.5, QtDBus >= 4.5
+Libs: ${abs_top_builddir}/TelepathyQt4/libtelepathy-qt4.la
+Cflags: -I${abs_top_srcdir} -I${abs_top_builddir}
diff --git a/TelepathyQt4/TelepathyQt4Farsight-uninstalled.pc.in b/TelepathyQt4/TelepathyQt4Farsight-uninstalled.pc.in
new file mode 100644
index 0000000..36172ad
--- /dev/null
+++ b/TelepathyQt4/TelepathyQt4Farsight-uninstalled.pc.in
@@ -0,0 +1,11 @@
+prefix=/nonexistent
+exec_prefix=/nonexistent
+abs_top_builddir=@abs_top_builddir@
+abs_top_srcdir=@abs_top_srcdir@
+
+Name: Telepathy-Qt4-Farsight (uninstalled copy)
+Description: Qt4 Telepathy Farsight utility library for the Telepathy framework
+Version: @VERSION@
+Requires.private: QtCore >= 4.5, QtDBus >= 4.5, telepathy-glib >= 0.7.28, telepathy-farsight >= 0.0.4, TelepathyQt4 = @VERSION@
+Libs: ${abs_top_builddir}/TelepathyQt4/Farsight/libtelepathy-qt4-farsight.la
+Cflags: -I${abs_top_srcdir} -I${abs_top_builddir}
diff --git a/TelepathyQt4/Farsight/TelepathyQt4Farsight.pc.in b/TelepathyQt4/TelepathyQt4Farsight.pc.in
similarity index 69%
rename from TelepathyQt4/Farsight/TelepathyQt4Farsight.pc.in
rename to TelepathyQt4/TelepathyQt4Farsight.pc.in
index 392b95d..569125b 100644
--- a/TelepathyQt4/Farsight/TelepathyQt4Farsight.pc.in
+++ b/TelepathyQt4/TelepathyQt4Farsight.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: Telepathy-Qt4-Farsight
 Description: Qt4 Telepathy Farsight utility library for the Telepathy framework
 Version: @VERSION@
-Requires.private: QtCore >= 4.5, QtDBus >= 4.5, TelepathyQt4
+Requires.private: QtCore >= 4.5, QtDBus >= 4.5, telepathy-glib >= 0.7.28, telepathy-farsight >= 0.0.4, TelepathyQt4 = @VERSION@
 Libs: -L${libdir} -ltelepathy-qt4-farsight
 Cflags: -I${includedir}/telepathy-1.0
diff --git a/configure.ac b/configure.ac
index d01e2e9..59153b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -250,10 +250,12 @@ AC_OUTPUT([
     Makefile
     TelepathyQt4/Makefile
     TelepathyQt4/Farsight/Makefile
-    TelepathyQt4/Farsight/TelepathyQt4Farsight.pc
     TelepathyQt4/Prototype/Makefile
     TelepathyQt4/Prototype/TpQt4Prototype.pc
     TelepathyQt4/TelepathyQt4.pc
+    TelepathyQt4/TelepathyQt4-uninstalled.pc
+    TelepathyQt4/TelepathyQt4Farsight.pc
+    TelepathyQt4/TelepathyQt4Farsight-uninstalled.pc
     doxygen.cfg
     examples/Makefile
     examples/accounts/Makefile
-- 
1.5.6.5