diff options
| author | Kjartan Maraas <kmaraas@gnome.org> | 2007-10-03 06:53:29 +0000 |
|---|---|---|
| committer | Kjartan Maraas <kmaraas@src.gnome.org> | 2007-10-03 06:53:29 +0000 |
| commit | 34cfd6fafd928b6c206d8984a0c80c9affc6690b (patch) | |
| tree | 3c67e68b14713a6eb1d90881dc479016a98579c1 | |
| parent | c691288b14bf86cb46c6e502347a75b0cceb95ab (diff) | |
| download | metacity-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
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 7 |
2 files changed, 6 insertions, 5 deletions
@@ -1,3 +1,7 @@ +2007-10-03 Kjartan Maraas <kmaraas@gnome.org> + + * configure.in: Remove circular dep metacity<->gnomecc. + 2007-09-15 Elijah Newren <newren gmail com> * configure.in: post-release version bump to 2.20.1 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 |