From 6756e24e976cd51bb41b2b2a2b92af2785a36d29 Mon Sep 17 00:00:00 2001
From: "\"Steven J. Hill\"" <sjhill@realitydiluted.com>
Date: Sun, 14 Jan 2007 03:10:46 +0000
Subject: Get rid of broken locale configuration option. I need to do a little
 more work on this.

---
 package/libglib2/Config.in   | 13 ++++---------
 package/libglib2/libglib2.mk |  4 ----
 2 files changed, 4 insertions(+), 13 deletions(-)

(limited to 'package')

diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in
index c327d8ab2..650d6aa02 100644
--- a/package/libglib2/Config.in
+++ b/package/libglib2/Config.in
@@ -1,16 +1,11 @@
 config BR2_PACKAGE_LIBGLIB2
 	bool "libglib2"
 	default n
-	help
-	  Low-level core library that forms the basis of GTK+ and GNOME.
-
-	  http://www.gtk.org/
-
-config BR2_PACKAGE_LIBGLIB2_LOCALE
-	bool "libglib2-locale"
-	default n
 	select BR2_ENABLE_LOCALE
+	select BR2_PACKAGE_GETTEXT
 	select BR2_PACKAGE_LIBINTL
 	select BR2_PACKAGE_PKGCONFIG
 	help
-	  Enable locale support for Glib library.
+	  Low-level core library that forms the basis of GTK+ and GNOME.
+
+	  http://www.gtk.org/
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index a2b26253b..d8b502cf5 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -146,11 +146,7 @@ $(TARGET_DIR)/lib/libglib-2.0.so.0.1200.6: $(STAGING_DIR)/lib/$(LIBGLIB2_BINARY)
 	$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libgthread-2.0.so.0.*
 	touch -c $(TARGET_DIR)/lib/libglib-2.0.so.0.1200.6
 
-ifeq ($(strip $(BR2_PACKAGE_LIBGLIB2_LOCAL)),y)
 libglib2: uclibc gettext libintl pkgconfig $(TARGET_DIR)/lib/libglib-2.0.so.0.1200.6
-else
-libglib2: uclibc $(TARGET_DIR)/lib/libglib-2.0.so.0.1200.6
-endif
 
 libglib2-clean:
 	rm -f $(TARGET_DIR)/usr/lib/libglib-2.0*
-- 
cgit v1.2.3