diff options
author | Monsta <[email protected]> | 2015-12-12 23:14:17 +0300 |
---|---|---|
committer | monsta <[email protected]> | 2016-01-11 14:05:07 +0300 |
commit | cbb995375f1b97679fd42090e31277666249cc84 (patch) | |
tree | 46f1d7dcbbb63837e2ddfe8013bb756d01b72fdb /configure.ac | |
parent | 6a9264b25f20fe81d837217a6d4875d4e594983f (diff) | |
download | mate-system-monitor-cbb995375f1b97679fd42090e31277666249cc84.tar.bz2 mate-system-monitor-cbb995375f1b97679fd42090e31277666249cc84.tar.xz |
drop GTK+2 code and --with-gtk build option
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/configure.ac b/configure.ac index f9f5d19..4eb50c7 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,9 @@ GLIB_REQUIRED=2.36.0 LIBGTOP_REQUIRED=2.23.1 GIOMM_REQUIRED=2.26.0 GLIBMM_REQUIRED=2.22 +GTK_REQUIRED=3.0.0 +GTKMM_REQUIRED=3.0.0 +LIBWNCK_REQUIRED=3.0.0 LIBXML_REQUIRED=2.0 RSVG_REQUIRED=2.35 SYSTEMD_REQUIRED=44 @@ -40,34 +43,8 @@ SYSTEMD_REQUIRED=44 AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_36], [Warn on use of APIs deprecated before GLib 2.36]) -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.20.0 - GTKMM_API_VERSION=2.4 - GTKMM_REQUIRED=2.22 - LIBWNCK_API_VERSION=1.0 - LIBWNCK_REQUIRED=2.5.0 - ;; - 3.0) GTK_API_VERSION=3.0 - GTK_REQUIRED=3.0.0 - GTKMM_API_VERSION=3.0 - GTKMM_REQUIRED=3.0.0 - LIBWNCK_API_VERSION=3.0 - LIBWNCK_REQUIRED=2.91.0 - ;; - esac - PKG_CHECK_MODULES(GMODULE,gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""]) -PKG_CHECK_MODULES(PROCMAN,$GMODULE_ADD glib-2.0 >= $GLIB_REQUIRED libgtop-2.0 >= $LIBGTOP_REQUIRED libwnck-$LIBWNCK_API_VERSION >= $LIBWNCK_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gtkmm-$GTKMM_API_VERSION >= $GTKMM_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED librsvg-2.0 >= $RSVG_REQUIRED glibmm-2.4 >= $GLIBMM_REQUIRED giomm-2.4 >= $GIOMM_REQUIRED) +PKG_CHECK_MODULES(PROCMAN,$GMODULE_ADD glib-2.0 >= $GLIB_REQUIRED libgtop-2.0 >= $LIBGTOP_REQUIRED libwnck-3.0 >= $LIBWNCK_REQUIRED gtk+-3.0 >= $GTK_REQUIRED gtkmm-3.0 >= $GTKMM_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED librsvg-2.0 >= $RSVG_REQUIRED glibmm-2.4 >= $GLIBMM_REQUIRED giomm-2.4 >= $GIOMM_REQUIRED) have_systemd=no AC_ARG_ENABLE(systemd, AS_HELP_STRING([--disable-systemd], [disable systemd support]),,enable_systemd=no) @@ -144,7 +121,6 @@ Configuration: C++ Compiler: ${CXX} CFLAGS: ${CFLAGS} CXXFLAGS: ${CXXFLAGS} - Gtk+ Version: ${GTK_API_VERSION} Maintainer mode: ${USE_MAINTAINER_MODE} Systemd support: ${have_systemd} " |