[file-roller] simplify the nautilus-extension check

[Paolo Bacchilega <paobac src gnome org>]

commit 6caa0e1a2a90fcd97f24bca277076f7985d25f6b
Author: Saleem Abdulrasool <compnerd compnerd org>
Date:   Sun Jan 2 13:13:13 2011 -0800

    simplify the nautilus-extension check
    
    This was simply checking the version manually.  The plugin can be disabled by
    passing the --disable-nautilus-plugin option rather than implicitly building it
    it if nautilus is present.

 configure.ac |   41 +++++++++++++++++++++--------------------
 1 files changed, 21 insertions(+), 20 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f47fc8a..42e9387 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,22 +64,28 @@ PKG_CHECK_MODULES(FR,			\
 AC_SUBST(FR_CFLAGS)
 AC_SUBST(FR_LIBS)
 
-NAUTILUS_CFLAGS=""
-NAUTILUS_LIBS=""
-build_nautilus_actions=no
-AC_ARG_ENABLE(nautilus_actions,AS_HELP_STRING([--disable-nautilus-actions],[don't build the nautilus context menu actions]),)
-
-if test x"$enable_nautilus_actions" != xno; then
-	if pkg-config --atleast-version=$NAUTILUS_REQUIRED libnautilus-extension; then
-		NAUTILUS_CFLAGS=`pkg-config --cflags libnautilus-extension glib-2.0 gio-2.0`
-		NAUTILUS_LIBS=`pkg-config --libs libnautilus-extension glib-2.0 gio-2.0`
-		build_nautilus_actions=yes
-	fi
+dnl ******************************
+
+AC_ARG_ENABLE([nautilus_actions],
+	      AS_HELP_STRING([--disable-nautilus-actions],
+			     [do not build the nautilus context menu actions]))
+
+if test x"$enable_nautilus_actions" != x"no" ; then
+	PKG_CHECK_MODULES(NAUTILUS,					\
+			  libnautilus-extension >= $NAUTILUS_REQUIRED	\
+			  glib-2.0					\
+			  gio-2.0)
+	AC_SUBST(NAUTILUS_CFLAGS)
+	AC_SUBST(NAUTILUS_LIBS)
 fi
-AM_CONDITIONAL(ENABLE_NAUTILUS_ACTIONS, test "x$build_nautilus_actions" = xyes)
-AC_SUBST(NAUTILUS_CFLAGS)
-AC_SUBST(NAUTILUS_LIBS)
 
+AM_CONDITIONAL(ENABLE_NAUTILUS_ACTIONS, test x"$enable_nautilus_actions" != x"no")
+
+
+NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
+AC_SUBST(NAUTILUS_EXTENSION_DIR)
+
+dnl ******************************
 
 dnl Checks for mkdtemp function
 
@@ -128,11 +134,6 @@ AC_SUBST(DISABLE_DEPRECATED)
 
 dnl ******************************
 
-NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
-AC_SUBST(NAUTILUS_EXTENSION_DIR)
-
-dnl ******************************
-
 AC_CONFIG_FILES([Makefile
 		 file-roller.spec
 		 data/Makefile
@@ -166,7 +167,7 @@ Configuration:
 	Source code location:   ${srcdir}
 	Compiler:               ${CC}
 	Internal mkdtemp:       ${mkdtemp_missing}
-	Nautilus support:       ${build_nautilus_actions}
+	Nautilus support:       ${enable_nautilus_actions}
 	PackageKit support:     ${enable_packagekit}
 	Run in place            ${enable_run_in_place}
 "