[file-roller] require gtk+ 3.0

[Paolo Bacchilega <paobac src gnome org>]

commit 360487b59f232fe3d84a0338f700632a3301069f
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Mon Oct 4 09:53:27 2010 +0200

    require gtk+ 3.0

 Makefile.am              |    3 +-
 configure.ac             |   36 +---
 src/commands/Makefile.in |  574 ----------------------------------------------
 3 files changed, 10 insertions(+), 603 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 6b4090d..674d002 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
-## Process this file with automake to produce Makefile.in.
+ACLOCAL_AMFLAGS=-I m4
+
 if ENABLE_NAUTILUS_ACTIONS
 NAUTILUS = nautilus
 else
diff --git a/configure.ac b/configure.ac
index 96bf154..ee01ef2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,6 +8,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADER([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 
 GNOME_COMMON_INIT
 AC_PROG_CC
@@ -27,28 +28,9 @@ dnl ==========================================================================
 
 GLIB_REQUIRED=2.25.5
 GIO_REQUIRED=2.25.5
-GCONF_REQUIRED=2.6.0
+GTK_REQUIRED=2.91.1
 NAUTILUS_REQUIRED=2.22.2
 
-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.21.4
-       ;;
-  3.0) GTK_API_VERSION=3.0
-       GTK_REQUIRED=2.90.0
-       ;;
-esac
-
 AC_SUBST(GLIB_REQUIRED)
 AC_SUBST(GIO_REQUIRED)
 AC_SUBST(GTK_REQUIRED)
@@ -56,7 +38,7 @@ AC_SUBST(NAUTILUS_REQUIRED)
 
 dnl ===========================================================================
 
-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])
 
@@ -74,16 +56,14 @@ AM_CONDITIONAL(RUN_IN_PLACE, test "x$enable_run_in_place" != xno)
 
 dnl ===========================================================================
 
-PKG_CHECK_MODULES(FR,					\
-	glib-2.0 >= $GLIB_REQUIRED			\
-	gthread-2.0					\
-	gio-unix-2.0 >= $GIO_REQUIRED			\
-	gtk+-$GTK_API_VERSION >= $GTK_REQUIRED		\
-	gconf-2.0 >= $GCONF_REQUIRED)
+PKG_CHECK_MODULES(FR,			\
+	glib-2.0 >= $GLIB_REQUIRED	\
+	gthread-2.0			\
+	gio-unix-2.0			\
+	gtk+-3.0 >= $GTK_REQUIRED)
 AC_SUBST(FR_CFLAGS)
 AC_SUBST(FR_LIBS)
 
-
 NAUTILUS_CFLAGS=""
 NAUTILUS_LIBS=""
 build_nautilus_actions=no