summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Hult <rhult@src.gnome.org>2004-02-18 14:03:51 +0000
committerRichard Hult <rhult@src.gnome.org>2004-02-18 14:03:51 +0000
commitaa8ec7d828c7ba9c7fcc1478e673412e287ad8ec (patch)
tree48232b5fa2314677e536098b1ba97d7af0c8bc13
parentce307172593e96dccb6c8e1c39dcbeb70016fc40 (diff)
downloadgconf-aa8ec7d828c7ba9c7fcc1478e673412e287ad8ec.tar.gz
Set the right requires libs.
-rw-r--r--configure.in4
-rw-r--r--gconf-2.0.pc.in2
2 files changed, 5 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index 0df2675f..ed595e1f 100644
--- a/configure.in
+++ b/configure.in
@@ -191,16 +191,20 @@ else
have_orbit=no
fi
+PC_REQUIRES=ORBit-2.0
if test x$with_ipc = xdbus -o x$with_ipc = xboth; then
PKG_CHECK_MODULES(GCONF_DBUS, dbus-glib-1 >= 0.20, have_dbus=yes, have_dbus=no)
if test x$have_dbus = xyes; then
AC_DEFINE(HAVE_DBUS, 1, D-BUS support in the daemon)
+ PC_REQUIRES="dbus-1 dbus-glib-1"
fi
else
have_dbus=no
fi
+AC_SUBST(PC_REQUIRES)
+
if test x$have_orbit = xno -a x$have_dbus = xno; then
AC_MSG_ERROR([You need either ORBit or D-BUS for IPC])
fi
diff --git a/gconf-2.0.pc.in b/gconf-2.0.pc.in
index 04c3003f..42c8b31c 100644
--- a/gconf-2.0.pc.in
+++ b/gconf-2.0.pc.in
@@ -8,6 +8,6 @@ gconf_serverdir=@libexecdir@
Name: gconf
Description: GNOME Config System.
Version: @VERSION@
-Requires: ORBit-2.0
+Requires: @PC_REQUIRES@
Libs: -L${libdir} -lgconf-@MAJOR_VERSION@
Cflags: -I${includedir}/gconf/@MAJOR_VERSION@