From 96c238bbc68eb0e139862f74fd1512c1709279fc Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Mon, 22 Aug 2005 18:40:07 +0000 Subject: [PATCH] =?UTF-8?q?Patch=20from=20Bj=C3=B6rn=20Lindqvist=20to=20ch?= =?UTF-8?q?eck=20for=20the=20appropriate=20versions=20of=20glib?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2005-08-22 Elijah Newren * configure.in: Patch from Björn Lindqvist to check for the appropriate versions of glib and gtk. Fixes #314116. --- ChangeLog | 5 +++++ configure.in | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8856409cc..cf71683e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-08-22 Elijah Newren + + * configure.in: Patch from Björn Lindqvist to check for the + appropriate versions of glib and gtk. Fixes #314116. + 2005-08-12 Elijah Newren * src/place.c (meta_window_place): Avoid obscuring diff --git a/configure.in b/configure.in index a70038e21..ae12e9b8e 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"