diff options
| author | Denis Gorodnichev <[email protected]> | 2014-07-24 10:37:41 +0400 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-11-25 18:06:24 +0100 |
| commit | b25395fab6fe9ee38bc0cd359941d0a825d88451 (patch) | |
| tree | e7b6720a543a00495fae1dd1423d652056bedb03 /configure.ac | |
| parent | b8d8e52f0effbf76ff909f88932098d4daf4336e (diff) | |
| download | marco-b25395fab6fe9ee38bc0cd359941d0a825d88451.tar.bz2 marco-b25395fab6fe9ee38bc0cd359941d0a825d88451.tar.xz | |
merge metacity(gtk3) changes
merge metacity(gtk3) changes
fix warnings
clean up unused variables
replace UNUSED_VARIABLE by G_GNUC_UNUSED
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 6958c8e4..b4c375f8 100644 --- a/configure.ac +++ b/configure.ac @@ -124,6 +124,7 @@ case "$with_gtk" in 3.0) GTK_API_VERSION=3.0 GTK_MIN_VERSION=2.90.0 CANBERRA_GTK=libcanberra-gtk3 + MATE_DESKTOP_VERSION=1.9.3 ;; esac AM_CONDITIONAL([HAVE_GTK2], [test "x$with_gtk" = "x2.0"]) @@ -133,6 +134,10 @@ GIO_MIN_VERSION=2.25.10 MARCO_PC_MODULES="gtk+-$GTK_API_VERSION >= $GTK_MIN_VERSION gio-2.0 >= $GIO_MIN_VERSION pango >= 1.2.0 $CANBERRA_GTK" AC_SUBST(GTK_API_VERSION) +if test x$GTK_API_VERSION = x3.0; then + MARCO_PC_MODULES="$MARCO_PC_MODULES mate-desktop-2.0 >= $MATE_DESKTOP_VERSION" +fi + GLIB_GSETTINGS AC_ARG_ENABLE(verbose-mode, |