diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-05-21 20:30:28 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-05-21 20:30:28 +0200 |
| commit | c89b725978616a24e066e6b01030bdd3fc0ab5c0 (patch) | |
| tree | c869c538c6d0b7b7c702ef7c24c4c59a89a973b2 /package/libglib2 | |
| parent | 319a4751c4a3a0209f628a7470a6d8e400d3479d (diff) | |
| parent | 52e600ebec9cb571edee8f791da851035ae6b969 (diff) | |
| download | buildroot-novena-c89b725978616a24e066e6b01030bdd3fc0ab5c0.tar.gz buildroot-novena-c89b725978616a24e066e6b01030bdd3fc0ab5c0.zip | |
Merge branch '2010-05-15-fixes' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/libglib2')
| -rw-r--r-- | package/libglib2/Config.in | 4 | ||||
| -rw-r--r-- | package/libglib2/libglib2.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in index d947eb67f..cc1d6e27b 100644 --- a/package/libglib2/Config.in +++ b/package/libglib2/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_LIBGLIB2 bool "libglib2" - select BR2_PACKAGE_GETTEXT - select BR2_PACKAGE_LIBINTL + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT + select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help Low-level core library that forms the basis of GTK+ and GNOME. diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 72a139645..43b1a8900 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -55,7 +55,7 @@ HOST_LIBGLIB2_CONF_OPT = \ --disable-gtk-doc \ --enable-debug=no \ -LIBGLIB2_DEPENDENCIES = gettext libintl host-pkg-config host-libglib2 +LIBGLIB2_DEPENDENCIES = host-pkg-config host-libglib2 $(if $(BR2_NEEDS_GETTEXT),gettext libintl) HOST_LIBGLIB2_DEPENDENCIES = host-pkg-config |