diff options
| author | Andres G. Aragoneses <knocte@gmail.com> | 2012-12-10 19:24:48 +0000 |
|---|---|---|
| committer | Andres G. Aragoneses <knocte@gmail.com> | 2012-12-10 19:24:48 +0000 |
| commit | 5f7dfb1569c46d3a37ee2c03742d91c3c4ff2e7d (patch) | |
| tree | aa87eb9336f54ed1466499d8d5479344aef2db96 /build/m4 | |
| parent | 76b6f6d515f5b3e2ec1c5b34ad34958ee26f343b (diff) | |
configure: earlier check for glib (bgo#686671)
The macros AM_PATH_GLIB_2_0 and AM_GLIB_GNU_GETTEXT come with glib,
so autoconf is not smart enough to figure out the precedence of
an earlier PKG_CHECK_MODULES(GLIB...), so we now use m4_pattern_allow
to white-list them.
Similar fix to the one for bgo#604416:
http://git.gnome.org/browse/banshee/commit/?id=671eb0302fe2c0dfde2674696396d3effea3746e
Diffstat (limited to 'build/m4')
| -rw-r--r-- | build/m4/banshee/gio.m4 | 4 | ||||
| -rw-r--r-- | build/m4/banshee/libbanshee.m4 | 2 | ||||
| -rw-r--r-- | build/m4/shamrock/i18n.m4 | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/build/m4/banshee/gio.m4 b/build/m4/banshee/gio.m4 index 269517a85..64bde9715 100644 --- a/build/m4/banshee/gio.m4 +++ b/build/m4/banshee/gio.m4 @@ -26,10 +26,6 @@ AC_DEFUN([BANSHEE_CHECK_GIO_SHARP], done AC_SUBST(GIOSHARP_ASSEMBLIES) - PKG_CHECK_MODULES(GLIB_2_22, - glib-2.0 >= 2.22, - enable_gio="$enable_gio", enable_gio=no) - if test "x$enable_gio_hardware" = "xyes"; then PKG_CHECK_MODULES(GUDEV_SHARP, gudev-sharp-1.0 >= 0.1, diff --git a/build/m4/banshee/libbanshee.m4 b/build/m4/banshee/libbanshee.m4 index 9c9da1019..fb2422c7d 100644 --- a/build/m4/banshee/libbanshee.m4 +++ b/build/m4/banshee/libbanshee.m4 @@ -5,6 +5,8 @@ AC_DEFUN([BANSHEE_CHECK_LIBBANSHEE], AC_HEADER_STDC + # needed so autoconf doesn't complain before checking the existence of glib-2.0 in configure.ac + m4_pattern_allow([AM_PATH_GLIB_2_0]) AM_PATH_GLIB_2_0 LIBBANSHEE_LIBS="" diff --git a/build/m4/shamrock/i18n.m4 b/build/m4/shamrock/i18n.m4 index e63264716..a10faa225 100644 --- a/build/m4/shamrock/i18n.m4 +++ b/build/m4/shamrock/i18n.m4 @@ -4,7 +4,11 @@ AC_DEFUN([SHAMROCK_CONFIGURE_I18N], GETTEXT_PACKAGE=$1 AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package]) + + # needed so autoconf doesn't complain before checking the existence of glib-2.0 in configure.ac + m4_pattern_allow([AM_GLIB_GNU_GETTEXT]) AM_GLIB_GNU_GETTEXT + AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS']) ]) |