diff options
| author | Andres G. Aragoneses <knocte@gmail.com> | 2011-11-27 11:58:53 +0000 |
|---|---|---|
| committer | Andres G. Aragoneses <knocte@gmail.com> | 2011-11-27 11:58:53 +0000 |
| commit | 671eb0302fe2c0dfde2674696396d3effea3746e (patch) | |
| tree | 001b32cd96c1fbb7268621a7703fe269ede4dd3c /build | |
| parent | 0a39dfd2139cc2143a3393594aa6eed0269c68f1 (diff) | |
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
Diffstat (limited to 'build')
| -rw-r--r-- | build/m4/banshee/gconf.m4 | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/build/m4/banshee/gconf.m4 b/build/m4/banshee/gconf.m4 new file mode 100644 index 000000000..16239dbcd --- /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 +]) |