diff options
| author | Stefano Karapetsas <[email protected]> | 2012-11-15 08:26:24 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-11-15 08:26:24 -0800 |
| commit | 86a51f1ba55208272a50e17ac94f745907131758 (patch) | |
| tree | 93d19d85feadd31f2027f09557447998ebd42bda /configure.ac | |
| parent | 30ec51cebbfaa251bff071e39ab777af012cb015 (diff) | |
| parent | 39d84d1c8a3ff07d20126f7220b7a3bfec5e306a (diff) | |
| download | mate-desktop-86a51f1ba55208272a50e17ac94f745907131758.tar.bz2 mate-desktop-86a51f1ba55208272a50e17ac94f745907131758.tar.xz | |
Merge pull request #36 from jasmineaura/develop
Properly support GTK3, simplify GTK2 compat, and some fixes
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 91b8711..6114659 100644 --- a/configure.ac +++ b/configure.ac @@ -60,14 +60,14 @@ MATE_DEBUG_CHECK MATE_COMPILE_WARNINGS([maximum]) MATE_MAINTAINER_MODE_DEFINES -# As a special favour for vuntz, support --disable-deprecations - -AC_ARG_ENABLE([deprecations], - [AS_HELP_STRING([--disable-deprecations],[dont warn about deprecated usages])], - [],[enable_deprecations=yes]) -if test "$enable_deprecations" = "no"; then - DISABLE_DEPRECATED="" - AC_SUBST([DISABLE_DEPRECATED]) +AC_ARG_ENABLE(deprecation_flags, + [AC_HELP_STRING([--enable-deprecation-flags], + [use *_DISABLE_DEPRECATED flags @<:@default=no@:>@])],, + [enable_deprecation_flags=no]) + +if test "x$enable_deprecation_flags" = "xyes"; then + DISABLE_DEPRECATED_CFLAGS=$DISABLE_DEPRECATED + AC_SUBST(DISABLE_DEPRECATED_CFLAGS) fi # Should we build mate-about or the shared desktop docs? Useful for people who @@ -105,7 +105,7 @@ dnl ---------------------------------------------------------------------------- dnl GTK library version dnl ---------------------------------------------------------------------------- GTK_API_VERSION=2.0 -GTK_REQUIRED=2.18.0 +GTK_REQUIRED=2.24.0 AC_MSG_CHECKING([which gtk+ version to compile against]) AC_ARG_WITH([gtk], @@ -119,7 +119,7 @@ AC_MSG_RESULT([$with_gtk]) case "$with_gtk" in 2.0) GTK_API_VERSION=2.0 - GTK_REQUIRED=2.18.0 + GTK_REQUIRED=2.24.0 ;; 3.0) GTK_API_VERSION=3.0 GTK_REQUIRED=3.0.0 @@ -333,7 +333,7 @@ mate-desktop $VERSION `echo mate-desktop $VERSION | sed "s/./=/g"` compiler: ${CC} cflags: ${CFLAGS} Maintainer mode: ${USE_MAINTAINER_MODE} - Warn about deprecations: ${enable_deprecations} + Use *_DISABLE_DEPRECATED: ${enable_deprecation_flags} Gtk+ version: ${GTK_API_VERSION} Build mate-about: ${enable_mate_about} |