move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option

and require libmatekbd, libmate-desktop, marco, m-s-d >= 1.17

1 files changed, 24 insertions, 58 deletions

diff --git a/configure.ac b/configure.ac
index e9f95e94..91b2fbf6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([mate-control-center], [1.16.0], [htts://www.mate-desktop.org/])
+AC_INIT([mate-control-center], [1.17.0], [htts://www.mate-desktop.org/])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([shell])
@@ -59,42 +59,17 @@ AC_CHECK_FUNC(XScreenSaverQueryInfo, [
 AC_SUBST(TYPING_BREAK)
 AC_SUBST(SCREENSAVER_LIBS)
 
-dnl ==============================================
-dnl Check GTK+ API version
-dnl ==============================================
-
+GLIB_REQUIRED=2.36.0
+GTK_REQUIRED=3.14.0
+MARCO_REQUIRED=1.17.0
+MSD_REQUIRED=1.17.0
+MATEKBD_REQUIRED=1.17.0
+MATE_DESKTOP_REQUIRED=1.17.0
 APPINDICATOR_REQUIRED=0.0.13
 
-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
-       MATE_DESKTOP_REQUIRED=1.15.1
-       LIBCANBERRA_API_VERSION=
-       LIBUNIQUE_API_VERSION=1.0
-       ENGINES_FOLDER="engines"
-       APPINDICATOR_API_VERSION=
-       ;;
-  3.0) GTK_API_VERSION=3.0
-       GTK_REQUIRED=3.0.0
-       MATE_DESKTOP_REQUIRED=1.15.1
-       LIBCANBERRA_API_VERSION=3
-       ENGINES_FOLDER="theming-engines"
-       APPINDICATOR_API_VERSION=3
-       ;;
-esac
-AC_SUBST(GTK_API_VERSION)
-
-PKG_CHECK_MODULES(LIBCANBERRA_GTK, libcanberra-gtk$LIBCANBERRA_API_VERSION, [
+ENGINES_FOLDER="theming-engines"
+
+PKG_CHECK_MODULES(LIBCANBERRA_GTK, libcanberra-gtk3, [
     CANBERRA_GTK=1
     AC_SUBST(LIBCANBERRA_GTK_CFLAGS)
     AC_SUBST(LIBCANBERRA_GTK_LIBS)
@@ -104,7 +79,7 @@ AM_CONDITIONAL(HAVE_LIBCANBERRA_GTK, test "x$CANBERRA_GTK" = "x1")
 AM_CONDITIONAL(HAVE_TYPING_BREAK, test "x$TYPING_BREAK" = xtyping-break)
 
 dnl app indicator
-APPINDICATOR_PKG=appindicator$APPINDICATOR_API_VERSION-0.1
+APPINDICATOR_PKG=appindicator3-0.1
 
 AC_ARG_ENABLE(appindicator,
                         AS_HELP_STRING([--enable-appindicator[=@<:@no/auto/yes@:>@]],[Build support for application indicators ]),
@@ -149,9 +124,9 @@ dnl Check that we meet the  dependencies
 dnl ==============================================
 
 PKG_CHECK_MODULES(GMODULE,gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""])
-COMMON_MODULES="gtk+-$GTK_API_VERSION >= $GTK_REQUIRED dnl
+COMMON_MODULES="gtk+-3.0 >= $GTK_REQUIRED dnl
  $GMODULE_ADD dnl
- glib-2.0 >= 2.36 dnl
+ glib-2.0 >= $GLIB_REQUIRED dnl
  gthread-2.0 dnl
  gio-2.0 dnl
  gio-unix-2.0 dnl
@@ -159,31 +134,26 @@ COMMON_MODULES="gtk+-$GTK_API_VERSION >= $GTK_REQUIRED dnl
  mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED"
 PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
 PKG_CHECK_MODULES(MATECC, $COMMON_MODULES libmate-menu >= 1.1.0)
-
-if test "$GTK_API_VERSION" = "3.0"; then
-  PKG_CHECK_MODULES(MATECC_SHELL, $COMMON_MODULES libmate-menu)
-else
-  PKG_CHECK_MODULES(MATECC_SHELL, $COMMON_MODULES libmate-menu unique-$LIBUNIQUE_API_VERSION)
-fi
+PKG_CHECK_MODULES(MATECC_SHELL, $COMMON_MODULES libmate-menu)
 
 PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-1)
-PKG_CHECK_MODULES(MATE_DESKTOP, mate-desktop-2.0 >= MATE_DESKTOP_REQUIRED)
+PKG_CHECK_MODULES(MATE_DESKTOP, mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED)
 PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0)
-PKG_CHECK_MODULES(MARCO, libmarco-private >= 1.13.1)
-PKG_CHECK_MODULES(TYPING, $GMODULE_ADD glib-2.0 > 2.36 gio-2.0 gtk+-$GTK_API_VERSION)
-PKG_CHECK_MODULES(GSD_DBUS, mate-settings-daemon >= 1.13.1)
+PKG_CHECK_MODULES(MARCO, libmarco-private >= $MARCO_REQUIRED)
+PKG_CHECK_MODULES(TYPING, $GMODULE_ADD glib-2.0 >= $GLIB_REQUIRED gio-2.0 gtk+-3.0 >= $GTK_REQUIRED)
+PKG_CHECK_MODULES(GSD_DBUS, mate-settings-daemon >= $MSD_REQUIRED)
 PKG_CHECK_MODULES(GIO, gio-2.0)
 
 PKG_CHECK_MODULES([DCONF], [dconf >= 0.13.4])
 AC_SUBST(DCONF_CFLAGS)
 AC_SUBST(DCONF_LIBS)
 
-gtk_lib_dir=`$PKG_CONFIG --variable libdir gtk+-$GTK_API_VERSION`
-gtk_binary_version=`$PKG_CONFIG --variable gtk_binary_version gtk+-$GTK_API_VERSION`
-GTK_ENGINE_DIR="$gtk_lib_dir/gtk-$GTK_API_VERSION/$gtk_binary_version/$ENGINES_FOLDER"
+gtk_lib_dir=`$PKG_CONFIG --variable libdir gtk+-3.0`
+gtk_binary_version=`$PKG_CONFIG --variable gtk_binary_version gtk+-3.0`
+GTK_ENGINE_DIR="$gtk_lib_dir/gtk-3.0/$gtk_binary_version/$ENGINES_FOLDER"
 AC_SUBST(GTK_ENGINE_DIR)
 
-PKG_CHECK_MODULES(GLIB, glib-2.0 $GMODULE_ADD)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED $GMODULE_ADD)
 
 dnl
 dnl Check dependencies of libmate-slab
@@ -226,14 +196,11 @@ PKG_CHECK_MODULES(XINPUT, xi >= 1.5)
 
 CAPPLET_LIBS="$CAPPLET_LIBS $XINPUT_LIBS"
 
-dnl ==============
-dnl gswitchit
-dnl ==============
-PKG_CHECK_MODULES(LIBMATEKBD, [libmatekbd >= 1.1.0 libxklavier >= 4.0])
+PKG_CHECK_MODULES(LIBMATEKBD, [libmatekbd >= $MATEKBD_REQUIRED libxklavier >= 5.2])
 AC_SUBST(LIBMATEKBD_CFLAGS)
 AC_SUBST(LIBMATEKBD_LIBS)
 
-PKG_CHECK_MODULES(LIBMATEKBDUI, [libmatekbdui >= 1.1.0])
+PKG_CHECK_MODULES(LIBMATEKBDUI, [libmatekbdui >= $MATEKBD_REQUIRED])
 AC_SUBST(LIBMATEKBDUI_CFLAGS)
 AC_SUBST(LIBMATEKBDUI_LIBS)
 
@@ -342,7 +309,6 @@ dnl ---------------------------------------------------------------------------
 echo "
               mate-control-center
 
-        GTK+ API version:      ${GTK_API_VERSION}
         Appindicator:          ${enable_appindicator}
         Libmate-slab:          ${have_libmateslab}
 "