diff options
| author | monsta <[email protected]> | 2016-11-22 15:49:16 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-11-22 15:49:16 +0300 |
| commit | ea481767c4e3ec19136a5b61ad46f244a9a5ffa7 (patch) | |
| tree | bbcceb1d2a0be587e7127109f57e41e9e9b43f98 /configure.ac | |
| parent | 8f9a34f003061d7c5e6cfe8a8cb64ec6e98d7c4a (diff) | |
| download | mate-utils-ea481767c4e3ec19136a5b61ad46f244a9a5ffa7.tar.bz2 mate-utils-ea481767c4e3ec19136a5b61ad46f244a9a5ffa7.tar.xz | |
move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option
and require mate-panel >= 1.17
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 42 |
1 files changed, 9 insertions, 33 deletions
diff --git a/configure.ac b/configure.ac index 33570bd7..ef0e9f41 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ m4_define([mate_utils_major], [1]) -m4_define([mate_utils_minor], [16]) +m4_define([mate_utils_minor], [17]) m4_define([mate_utils_micro], [0]) m4_define([mate_utils_version], [mate_utils_major.mate_utils_minor.mate_utils_micro]) @@ -62,34 +62,11 @@ dnl pkg-config check GLIB_REQUIRED=2.36.0 GIO_REQUIRED=2.36.0 GIO_UNIX_REQUIRED=2.18.0 -LIBMATE_PANEL_APPLET_REQUIRED=1.7.0 +GTK_REQUIRED=3.14.0 +LIBMATE_PANEL_APPLET_REQUIRED=1.17.0 LIBGTOP_REQUIRED=2.12.0 +LIBCANBERRA_GTK_REQUIRED=0.4 -dnl GTK library version - -AC_MSG_CHECKING([which gtk+ version to compile against]) -AC_ARG_WITH([gtk], - [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])], - [case "$with_gtk" in - 2.0|3.0) ;; - *) AC_MSG_ERROR([invalid gtk version specified]) ;; - esac], - [with_gtk=2.0]) -AC_MSG_RESULT([$with_gtk]) - -case "$with_gtk" in - 2.0) GTK_API_VERSION=2.0 - GTK_REQUIRED=2.24.0 - LIBCANBERRA_GTK_VERSION=libcanberra-gtk - LIBCANBERRA_GTK_REQUIRED=0.4 - ;; - 3.0) GTK_API_VERSION=3.0 - GTK_REQUIRED=3.0.0 - LIBCANBERRA_GTK_VERSION=libcanberra-gtk3 - LIBCANBERRA_GTK_REQUIRED=0.4 - ;; -esac -AC_SUBST(GTK_API_VERSION) AC_SUBST(GTK_REQUIRED) # common checks @@ -109,18 +86,18 @@ PKG_CHECK_MODULES(GIO_UNIX, gio-unix-2.0 >= $GIO_UNIX_REQUIRED) AC_SUBST(GIO_UNIX_CFLAGS) AC_SUBST(GIO_UNIX_LIBS) -PKG_CHECK_MODULES(GTK, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED) +PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) # libeggsmclient -PKG_CHECK_MODULES(LIBEGGSMCLIENT, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED) +PKG_CHECK_MODULES(LIBEGGSMCLIENT, gtk+-3.0 >= $GTK_REQUIRED) AC_SUBST(LIBEGGSMCLIENT_CFLAGS) AC_SUBST(LIBEGGSMCLIENT_LIBS) # libgdict requires just gtk+ -PKG_CHECK_MODULES(LIBGDICT, glib-2.0 >= $GLIB_REQUIRED dnl - gtk+-$GTK_API_VERSION >= $GTK_REQUIRED) +PKG_CHECK_MODULES(LIBGDICT, glib-2.0 >= $GLIB_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED) AC_SUBST(LIBGDICT_CFLAGS) AC_SUBST(LIBGDICT_LIBS) @@ -179,7 +156,7 @@ PKG_CHECK_MODULES(LIBGTOP, libgtop-2.0 >= $LIBGTOP_REQUIRED) AC_SUBST(LIBGTOP_CFLAGS) AC_SUBST(LIBGTOP_LIBS) -PKG_CHECK_MODULES(LIBCANBERRA_GTK, $LIBCANBERRA_GTK_VERSION >= $LIBCANBERRA_GTK_REQUIRED) +PKG_CHECK_MODULES(LIBCANBERRA_GTK, libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED) AC_SUBST(LIBCANBERRA_GTK_CFLAGS) AC_SUBST(LIBCANBERRA_GTK_LIBS) @@ -425,7 +402,6 @@ mate-utils $VERSION configuration summary: sbin dir : $sbindir data dir : $datadir - GTK+ API version : $GTK_API_VERSION Debug messages (libmatedict) : $enable_debug API Reference (libmatedict) : $enable_gtk_doc Logview built with ZLib support : $msg_zlib |