From 34cfd6fafd928b6c206d8984a0c80c9affc6690b Mon Sep 17 00:00:00 2001 From: Kjartan Maraas Date: Wed, 3 Oct 2007 06:53:29 +0000 Subject: [PATCH] Remove circular dep metacity<->gnomecc. 2007-10-03 Kjartan Maraas * configure.in: Remove circular dep metacity<->gnomecc. svn path=/trunk/; revision=3355 --- ChangeLog | 4 ++++ configure.in | 7 ++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 728e52430..862530959 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-10-03 Kjartan Maraas + + * configure.in: Remove circular dep metacity<->gnomecc. + 2007-09-15 Elijah Newren * configure.in: post-release version bump to 2.20.1 diff --git a/configure.in b/configure.in index b8a8cad5e..b51cc01df 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