From 2eb72b1a2545890a0ebe4d164e272fd7368c442e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karsten=20Br=C3=A4ckelmann?= Date: Tue, 27 Nov 2007 18:00:15 +0000 Subject: Remove circular dep metacity / g-c-c. Bug #482730. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2007-11-27 Karsten Bräckelmann * configure.in: Remove circular dep metacity / g-c-c. Bug #482730. svn path=/branches/gnome-2-20/; revision=3443 --- ChangeLog | 4 ++++ configure.in | 7 ++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f979b91f..52e9c7c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-11-27 Karsten Bräckelmann + + * configure.in: Remove circular dep metacity / g-c-c. Bug #482730. + 2007-11-17 Elijah Newren * configure.in: post-release version bump to 2.20.2 diff --git a/configure.in b/configure.in index 3561d4c9..bb16823b 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 -- cgit v1.2.1