1 files changed, 7 insertions, 28 deletions
diff --git a/configure.ac b/configure.ac
index 15f6921..3764045 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,31 +84,10 @@ dnl ---------------------------------------------------------------------------
 dnl Requirements for the themes
 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=2.24.0
- LIBWNCK_API_VERSION=1.0
- LIBCANBERRA_API_VERSION=
- ;;
- 3.0) GTK_API_VERSION=3.0
- GTK_REQUIRED=3.0.0
- LIBWNCK_API_VERSION=3.0
- LIBCANBERRA_API_VERSION=3
- ;;
-esac
+GTK_REQUIRED=3.14.0
 
 PKG_CHECK_MODULES(THEME,
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
+ gtk+-3.0 >= $GTK_REQUIRED
 )
 AC_SUBST(THEME_CFLAGS)
 AC_SUBST(THEME_LIBS)
@@ -121,14 +100,14 @@ REQ_DBUS_VERSION=0.78
 REQ_LIBCANBERRA_GTK_VERSION=0.4
 PKG_CHECK_MODULES(GMODULE,gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""])
 pkg_modules="
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED, \
+ gtk+-3.0 >= $GTK_REQUIRED, \
 glib-2.0 >= $REQ_GLIB_VERSION, \
 gio-2.0 >= $REQ_GLIB_VERSION, \
 $GMODULE_ADD \
 dbus-1 >= $REQ_DBUS_VERSION, \
 dbus-glib-1 >= $REQ_DBUS_VERSION, \
- libcanberra-gtk$LIBCANBERRA_API_VERSION >= $REQ_LIBCANBERRA_GTK_VERSION, \
- libwnck-$LIBWNCK_API_VERSION \
+ libcanberra-gtk3 >= $REQ_LIBCANBERRA_GTK_VERSION, \
+ libwnck-3.0 \
 x11 \
 "
 PKG_CHECK_MODULES(NOTIFICATION_DAEMON, $pkg_modules)
@@ -138,12 +117,12 @@ AC_SUBST(NOTIFICATION_DAEMON_LIBS)
 dnl ---------------------------------------------------------------------------
 dnl Requirements for the setup tool
 dnl ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(NOTIFICATION_CAPPLET, glib-2.0 >= $REQ_GLIB_VERSION gio-2.0 >= $REQ_GLIB_VERSION gtk+-$GTK_API_VERSION >= $GTK_REQUIRED libnotify dbus-1 dbus-glib-1)
+PKG_CHECK_MODULES(NOTIFICATION_CAPPLET, glib-2.0 >= $REQ_GLIB_VERSION gio-2.0 >= $REQ_GLIB_VERSION gtk+-3.0 >= $GTK_REQUIRED libnotify dbus-1 dbus-glib-1)
 AC_SUBST(NOTIFICATION_CAPPLET_CFLAGS)
 AC_SUBST(NOTIFICATION_CAPPLET_LIBS)
 
 gdk_modules="
- gdk-$GTK_API_VERSION >= $GTK_REQUIRED, \
+ gdk-3.0 >= $GTK_REQUIRED, \
 gdk-pixbuf-2.0 >= 2.22.0 \
 "
 PKG_CHECK_MODULES(GDK, $gdk_modules, have_gdk=yes,