diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-02-13 23:16:49 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2003-02-13 23:16:49 +0000 |
| commit | 02a491c1bce0eab09e5bd4dee2152a4da3df50d5 (patch) | |
| tree | 30bfd5967d6d106455a5426cbc6ff50c318a0ffe /configure.in | |
| parent | ed25155fc17c1063bb3848bb41592f48068941c6 (diff) | |
| download | metacity-02a491c1bce0eab09e5bd4dee2152a4da3df50d5.tar.gz | |
require GTK+ 2.2.0
2003-02-13 Havoc Pennington <hp@redhat.com>
* configure.in: require GTK+ 2.2.0
* src/ui.c (meta_ui_init): remove hackaround for Pango X core
fonts backend
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/configure.in b/configure.in index 622dc42f..73235261 100644 --- a/configure.in +++ b/configure.in @@ -83,7 +83,7 @@ if test "x$GCC" = "xyes"; then fi changequote([,])dnl -METACITY_PC_MODULES='gtk+-2.0 >= 2.0.0' +METACITY_PC_MODULES='gtk+-2.0 >= 2.2.0 pango >= 1.2.0' AC_ARG_ENABLE(config-dialog, [ --enable-config-dialog enable the config dialog that you need with GNOME 2.0 (obsolete with GNOME 2.2)],,enable_config_dialog=no) @@ -120,11 +120,17 @@ ALL_LINGUAS="am az bg ca cs da de el en_GB es fi fr gl he hu it ja ko lv mk mn m AM_GLIB_GNU_GETTEXT ## here we get the flags we'll actually use -PKG_CHECK_MODULES(METACITY_MESSAGE, gtk+-2.0 >= 2.0.0) -PKG_CHECK_MODULES(METACITY_WINDOW_DEMO, gtk+-2.0 >= 2.0.0) +PKG_CHECK_MODULES(METACITY_MESSAGE, gtk+-2.0 >= 2.2.0) +PKG_CHECK_MODULES(METACITY_WINDOW_DEMO, gtk+-2.0 >= 2.2.0) if test x$enable_config_dialog = xyes; then - PKG_CHECK_MODULES(METACITY_PROPS, gtk+-2.0 >= 2.0.0 gconf-2.0 >= 1.1.9 libglade-2.0) + PKG_CHECK_MODULES(METACITY_PROPS, gtk+-2.0 >= 2.2.0 gconf-2.0 >= 1.1.9 libglade-2.0) +fi + +if $PKG_CONFIG --atleast-version 1.2.0 pangoxft; then + echo "pangoxft found" +else + AC_MSG_ERROR("Pango 1.2.0 or greater based on Xft2 is required") fi STARTUP_NOTIFICATION_VERSION=0.4 @@ -155,13 +161,6 @@ fi PKG_CHECK_MODULES(METACITY, $METACITY_PC_MODULES) -if $PKG_CONFIG --atleast-version 2.2.0 gtk+-2.0; then - AC_DEFINE(HAVE_GTK_MULTIHEAD,,[gtk+ with multihead support found]) - with_multihead=yes -else - with_multihead=no -fi - AC_PATH_XTRA ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" @@ -384,7 +383,6 @@ metacity-$VERSION: GConf: ${enable_gconf} XFree86 Xinerama: ${use_xfree_xinerama} Solaris Xinerama: ${use_solaris_xinerama} - Multihead: ${with_multihead} Startup notification: ${have_startup_notification} Session management: ${found_sm} Shape extension: ${found_shape} |