summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorKjartan Maraas <kmaraas@gnome.org>2007-10-03 06:53:29 +0000
committerKjartan Maraas <kmaraas@src.gnome.org>2007-10-03 06:53:29 +0000
commit34cfd6fafd928b6c206d8984a0c80c9affc6690b (patch)
tree3c67e68b14713a6eb1d90881dc479016a98579c1 /configure.in
parentc691288b14bf86cb46c6e502347a75b0cceb95ab (diff)
downloadmetacity-34cfd6fafd928b6c206d8984a0c80c9affc6690b.tar.gz
Remove circular dep metacity<->gnomecc.
2007-10-03 Kjartan Maraas <kmaraas@gnome.org> * configure.in: Remove circular dep metacity<->gnomecc. svn path=/trunk/; revision=3355
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in7
1 files changed, 2 insertions, 5 deletions
diff --git a/configure.in b/configure.in
index b8a8cad5..b51cc01d 100644
--- a/configure.in
+++ b/configure.in
@@ -176,11 +176,8 @@ else
AC_MSG_ERROR("Pango 1.2.0 or greater based on Xft2 is required")
fi
-if $PKG_CONFIG --exists gnome-keybindings; then
- GNOME_KEYBINDINGS_KEYSDIR=$($PKG_CONFIG --variable keysdir gnome-keybindings)
-else
- GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings"
-fi
+# Unconditionally use this dir to avoid a circular dep with gnomecc
+GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings"
AC_SUBST(GNOME_KEYBINDINGS_KEYSDIR)
STARTUP_NOTIFICATION_VERSION=0.7