diff options
| author | Karsten Bräckelmann <guenther@rudersport.de> | 2007-11-27 18:00:15 +0000 |
|---|---|---|
| committer | Karsten Bräckelmann <kbrae@src.gnome.org> | 2007-11-27 18:00:15 +0000 |
| commit | 2eb72b1a2545890a0ebe4d164e272fd7368c442e (patch) | |
| tree | 27e9dc312d1d7b95de397d2700285d301a9edbc8 | |
| parent | b94c93a25fcef6b5aa8d3705c7a94d8e64609289 (diff) | |
| download | metacity-2eb72b1a2545890a0ebe4d164e272fd7368c442e.tar.gz | |
Remove circular dep metacity / g-c-c. Bug #482730.
2007-11-27 Karsten Bräckelmann <guenther@rudersport.de>
* configure.in: Remove circular dep metacity / g-c-c. Bug #482730.
svn path=/branches/gnome-2-20/; revision=3443
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 7 |
2 files changed, 6 insertions, 5 deletions
@@ -1,3 +1,7 @@ +2007-11-27 Karsten Bräckelmann <guenther@rudersport.de> + + * configure.in: Remove circular dep metacity / g-c-c. Bug #482730. + 2007-11-17 Elijah Newren <newren gmail com> * 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 |