diff options
| author | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2016-04-10 15:40:14 +0300 |
|---|---|---|
| committer | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2016-04-14 20:25:00 +0300 |
| commit | 65778e800ee73e0a502d39662e5732c8a3933649 (patch) | |
| tree | 265611c6c24ed42c07efd6cdeeef53c1af0b8a5f | |
| parent | a4eb7c36f4eecd43319b82f8680b9a752e0b619d (diff) | |
| download | metacity-wip/test-3-20.tar.gz | |
configure: minor cleanupwip/test-3-20
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 5f443719..16a4ad7d 100644 --- a/configure.ac +++ b/configure.ac @@ -83,6 +83,8 @@ dnl ************************************************************************** GLIB_REQUIRED_VERSION=2.44.0 GTK_REQUIRED_VERSION=3.19.8 +PANGO_REQUIRED_VERSION=1.2.0 +XCOMPOSITE_REQUIRED_VERSION=0.3 PKG_CHECK_MODULES([LIBMETACITY], [ glib-2.0 >= $GLIB_REQUIRED_VERSION @@ -116,12 +118,7 @@ AC_CHECK_SIZEOF(__int64) ## byte order AC_C_BIGENDIAN -GTK_MIN_VERSION=3.19.6 -GIO_MIN_VERSION=2.25.10 -CANBERRA_GTK=libcanberra-gtk3 -XCOMPOSITE_VERSION=0.3 - -METACITY_PC_MODULES="gtk+-3.0 >= $GTK_MIN_VERSION gio-2.0 >= $GIO_MIN_VERSION pango >= 1.2.0 gsettings-desktop-schemas >= 3.3.0 xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage" +METACITY_PC_MODULES="gtk+-3.0 >= $GTK_REQUIRED_VERSION gio-2.0 >= $GLIB_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION gsettings-desktop-schemas >= 3.3.0 xcomposite >= $XCOMPOSITE_REQUIRED_VERSION xfixes xrender xdamage" GLIB_GSETTINGS @@ -132,7 +129,7 @@ AC_ARG_ENABLE(canberra, if test x$enable_canberra = xyes; then AC_DEFINE(HAVE_CANBERRA,1,[Build with canberra support]) - METACITY_PC_MODULES="$METACITY_PC_MODULES $CANBERRA_GTK" + METACITY_PC_MODULES="$METACITY_PC_MODULES libcanberra-gtk3" fi AC_ARG_ENABLE(verbose-mode, @@ -160,10 +157,9 @@ AC_ARG_ENABLE(render, enable_render=auto) ## here we get the flags we'll actually use -PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.36.0 gthread-2.0 >= 2.32.0) -# gtk_window_set_icon_name requires gtk2+-2.60 -PKG_CHECK_MODULES(METACITY_MESSAGE, gtk+-3.0 >= $GTK_MIN_VERSION) -PKG_CHECK_MODULES(METACITY_WINDOW_DEMO, gtk+-3.0 >= $GTK_MIN_VERSION) +PKG_CHECK_MODULES(ALL, glib-2.0 >= $GLIB_REQUIRED_VERSION gthread-2.0 >= $GLIB_REQUIRED_VERSION) +PKG_CHECK_MODULES(METACITY_MESSAGE, gtk+-3.0 >= $GTK_REQUIRED_VERSION) +PKG_CHECK_MODULES(METACITY_WINDOW_DEMO, gtk+-3.0 >= $GTK_REQUIRED_VERSION) if $PKG_CONFIG --atleast-version 1.2.0 pangoxft; then echo "pangoxft found" |