[banshee] configure: clearer check for AM_GCONF_SOURCE_2 macro

[AndrÃs Aragoneses <aaragoneses src gnome org>]

commit 671eb0302fe2c0dfde2674696396d3effea3746e
Author: Andres G. Aragoneses <knocte gmail com>
Date:   Sun Nov 27 11:58:53 2011 +0000

    configure: clearer check for AM_GCONF_SOURCE_2 macro
    
    The AM_GCONF_SOURCE_2 macro was used in the configure
    phase without adding a previous check for the package
    that contains it (called 'gconf2-devel' in most distros).
    
    This was causing either autoconf complaining for not
    finding it (which is solved by using m4_pattern_allow)
    before a PKG_CHECK_MODULES() can be run when autogen.sh
    was called and the 'configure' script was not generated
    yet, or by the configure script itself if the call to
    PKG_CHECK_MODULES(LIBGCONF, gconf-2.0) was not done
    before the call to the macro.
    
    This change comes with the extra of wrapping all gconf
    configure-checking logic into a banshee m4 macro like
    it is done for other dependencies.
    
    Fixes bgo#604416

 build/m4/banshee/gconf.m4 |   12 ++++++++++++
 configure.ac              |    3 +--
 2 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/build/m4/banshee/gconf.m4 b/build/m4/banshee/gconf.m4
new file mode 100644
index 0000000..16239db
--- /dev/null
+++ b/build/m4/banshee/gconf.m4
@@ -0,0 +1,12 @@
+AC_DEFUN([BANSHEE_CHECK_GCONF],
+[
+	AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+
+	# libgconf check needed because its -devel pkg should contain AM_GCONF_SOURCE_2 macro, see bgo#604416
+	PKG_CHECK_MODULES(LIBGCONF, gconf-2.0)
+
+	# needed so autoconf doesn't complain before checking the existence of libgconf2-devel above
+	m4_pattern_allow([AM_GCONF_SOURCE_2])
+
+	AM_GCONF_SOURCE_2
+])
diff --git a/configure.ac b/configure.ac
index 7740219..eccd651 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,8 +138,7 @@ dnl GNOME (optional)
 AC_ARG_ENABLE(gnome, AC_HELP_STRING([--disable-gnome], [Disable GNOME support]), , enable_gnome="yes")
 if test "x$enable_gnome" = "xyes"; then
 	BANSHEE_CHECK_GNOME_SHARP
-	AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
-	AM_GCONF_SOURCE_2
+	BANSHEE_CHECK_GCONF
 	AM_CONDITIONAL(ENABLE_GNOME, true)
 else
 	AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, false)