summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2005-08-22 18:40:07 +0000
committerElijah Newren <newren@src.gnome.org>2005-08-22 18:40:07 +0000
commit96c238bbc68eb0e139862f74fd1512c1709279fc (patch)
tree1ba7c7f04b75625fdb4c62b7f11ddae92b32320f
parent2df2e18a9bf8c8e401d6f675dd0367f2ceb6f5a7 (diff)
downloadmetacity-96c238bbc68eb0e139862f74fd1512c1709279fc.tar.gz
Patch from Björn Lindqvist to check for the appropriate versions of glib
2005-08-22 Elijah Newren <newren@gmail.com> * configure.in: Patch from Björn Lindqvist to check for the appropriate versions of glib and gtk. Fixes #314116.
-rw-r--r--ChangeLog5
-rw-r--r--configure.in7
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8856409c..cf71683e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-22 Elijah Newren <newren@gmail.com>
+
+ * configure.in: Patch from Björn Lindqvist to check for the
+ appropriate versions of glib and gtk. Fixes #314116.
+
2005-08-12 Elijah Newren <newren@gmail.com>
* src/place.c (meta_window_place): Avoid obscuring
diff --git a/configure.in b/configure.in
index a70038e2..ae12e9b8 100644
--- a/configure.in
+++ b/configure.in
@@ -159,8 +159,11 @@ ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi f
AM_GLIB_GNU_GETTEXT
## here we get the flags we'll actually use
-PKG_CHECK_MODULES(METACITY_MESSAGE, gtk+-2.0 >= 2.2.0)
-PKG_CHECK_MODULES(METACITY_WINDOW_DEMO, gtk+-2.0 >= 2.2.0)
+# GOptionEntry requires glib-2.6.0
+PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.6.0)
+# gtk_window_set_icon_name requires gtk2+-2.60
+PKG_CHECK_MODULES(METACITY_MESSAGE, gtk+-2.0 >= 2.6.0)
+PKG_CHECK_MODULES(METACITY_WINDOW_DEMO, gtk+-2.0 >= 2.6.0)
if $PKG_CONFIG --atleast-version 1.2.0 pangoxft; then
echo "pangoxft found"