From 0a456ca9d48a59f196da53a345ab9695c8470e7a Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@linux.intel.com>
Date: Fri, 1 Jul 2011 14:10:42 +0100
Subject: Subsitute the correct private requirements in the pkgconfig file

---
 configure.in    | 9 +++++----
 gconf-2.0.pc.in | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/configure.in b/configure.in
index a558ab0b..100a0db4 100644
--- a/configure.in
+++ b/configure.in
@@ -203,8 +203,7 @@ AS_IF([test "x$enable_orbit" = "xyes"],
         AM_CONDITIONAL(HAVE_CORBA, [true])
         AM_CONDITIONAL(HAVE_DBUS, [false])
         AC_DEFINE(HAVE_CORBA, 1, [Use ORBit IPC mechanism])
-        AC_SUBST(HAVE_CORBA)
-        AC_SUBST(HAVE_DBUS)
+        IPC_REQUIRES="ORBit-2.0"
         IPC="ORBit"
       ],
       [
@@ -212,10 +211,12 @@ AS_IF([test "x$enable_orbit" = "xyes"],
         AM_CONDITIONAL(HAVE_CORBA, [false])
         AM_CONDITIONAL(HAVE_DBUS, [true])
         AC_DEFINE(HAVE_DBUS, 1, [Use D-BUS IPC mechanism])
-        AC_SUBST(HAVE_CORBA)
-        AC_SUBST(HAVE_DBUS)
+        IPC_REQUIRES="dbus-1"
         IPC="DBus"
       ])
+AC_SUBST(HAVE_CORBA)
+AC_SUBST(HAVE_DBUS)
+AC_SUBST(IPC_REQUIRES)
 
 
 AM_CONDITIONAL(GTK, [test "x$HAVE_GTK" != "xno"])
diff --git a/gconf-2.0.pc.in b/gconf-2.0.pc.in
index 9e99a369..ea2ac7d1 100644
--- a/gconf-2.0.pc.in
+++ b/gconf-2.0.pc.in
@@ -9,6 +9,6 @@ Name: gconf
 Description: GNOME Config System.
 Version: @VERSION@
 Requires: glib-2.0
-Requires.private: ORBit-2.0 gio-2.0
+Requires.private: @IPC_REQUIRES@ gio-2.0
 Libs: -L${libdir} -lgconf-@MAJOR_VERSION@
 Cflags: -I${includedir}/gconf/@MAJOR_VERSION@
-- 
cgit v1.2.1