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

and require caja >= 1.17.1

1 files changed, 6 insertions, 38 deletions

diff --git a/configure.ac b/configure.ac
index c98a465..1174f01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(mate-user-share, 1.16.0)
+AC_INIT(mate-user-share, 1.17.0)
 
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -62,44 +62,16 @@ else
 fi
 AM_CONDITIONAL(USE_BLUETOOTH, [test "$enable_bluetooth" = "yes"])
 
-dnl ==========================================================================
-
-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_VERSION=2.24.0
-       CANBERRA_API_VERSION=
-       UNIQUE_API_VERSION=1.0
-       ;;
-  3.0) GTK_API_VERSION=3.0
-       GTK_REQUIRED_VERSION=3.0.0
-       CANBERRA_API_VERSION=3
-       ;;
-esac
-
-AC_SUBST(GTK_API_VERSION)
+GLIB_REQUIRED_VERSION=2.36.0
+GTK_REQUIRED_VERSION=3.14.0
 
 dnl ==========================================================================
 
-PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-$GTK_API_VERSION gtk+-$GTK_API_VERSION dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk$CANBERRA_API_VERSION $BLUETOOTH_PKG)
+PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 gdk-x11-3.0 gtk+-3.0 >= $GTK_REQUIRED_VERSION dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk3 $BLUETOOTH_PKG)
 AC_SUBST(USER_SHARE_CFLAGS)
 AC_SUBST(USER_SHARE_LIBS)
 
-if test "$GTK_REQUIRED_VERSION" = "3.0.0"; then
-	PKG_CHECK_MODULES(USER_SHARE_CONFIG, glib-2.0 >= 2.15.2 gio-2.0 >= 2.25.0 gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION)
-else
-	PKG_CHECK_MODULES(USER_SHARE_CONFIG, glib-2.0 >= 2.15.2 gio-2.0 >= 2.25.0 gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION unique-$UNIQUE_API_VERSION)
-fi
-
+PKG_CHECK_MODULES(USER_SHARE_CONFIG, glib-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 gtk+-3.0 >= $GTK_REQUIRED_VERSION)
 AC_SUBST(USER_SHARE_CONFIG_CFLAGS)
 AC_SUBST(USER_SHARE_CONFIG_LIBS)
 	
@@ -144,7 +116,6 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],"$GETTEXT_PACKAGE", [The gettext package])
 
 AM_GLIB_GNU_GETTEXT
 
-	
 dnl ==========================================================================
 dnl Check for SELinux
 
@@ -155,8 +126,6 @@ AC_SUBST(SELINUX_LIBS)
 dnl ==========================================================================
 dnl Check for the HTTPD modules path
 
-
-
 AC_ARG_WITH([modules-path],
 	    [AS_HELP_STRING([--with-modules-path],[Path where the httpd modules are located (default: /etc/httpd/modules/)])],
 	    [with_modules_path=$withval])
@@ -173,7 +142,7 @@ AC_ARG_WITH(cajadir,
 	    [ac_with_cajadir=""])
 
 PKG_CHECK_MODULES(EXTENSION,
-		   libcaja-extension $BLUETOOTH_PKG)
+		   libcaja-extension >= 1.17.1 $BLUETOOTH_PKG)
 if test "${ac_with_cajadir}" = ""; then
 	ac_with_cajadir=`pkg-config --variable=extensiondir libcaja-extension`
 fi
@@ -255,7 +224,6 @@ AC_MSG_NOTICE([mate-user-share was configured with the following options:])
 AC_MSG_NOTICE([** httpd location: $HTTP])
 AC_MSG_NOTICE([** httpd modules path: $MODULES_PATH])
 AC_MSG_NOTICE([** caja extension path: $ac_with_cajadir])
-AC_MSG_NOTICE([** GTK version: $GTK_API_VERSION])
 
 echo "
 Do note Apache >= 2.2 and mod_dnssd 0.6 are required to use mate-user-share.