The localization capplet is disabled until we remove the libicu

2004-01-08  Carlos Perelló Marín <carlos@gnome.org>

	* configure.in: The localization capplet is disabled until we remove
	the libicu dependency.

2004-01-05  Carlos Perelló Marín <carlos@gnome.org>

	* configure.in: Added a check for libicu and the needed lines to add
	the localization capplet.
	* capplets/Makefile.am: Added the localization dir.
	* capplets/localization: Added the localization capplet to change
	the locales.
	* po/POTFILES.in: Added new files from localization capplet.

ChangeLog

@@ -1,7 +1,21 @@
+2004-01-08  Carlos Perelló Marín <carlos@gnome.org>
+
+	* configure.in: The localization capplet is disabled until we remove
+	the libicu dependency.
+
 2004-01-08  Jody Goldberg <jody@gnome.org>
 
 	* configure.in : Damn, forgot to bump the version after to point release.
 
+2004-01-05  Carlos Perelló Marín <carlos@gnome.org>
+
+	* configure.in: Added a check for libicu and the needed lines to add
+	the localization capplet.
+	* capplets/Makefile.am: Added the localization dir.
+	* capplets/localization: Added the localization capplet to change
+	the locales.
+	* po/POTFILES.in: Added new files from localization capplet.
+
 2004-01-01  Rodney Dawes  <dobey@ximian.com>
 
 	* configure.in: Require GTK+ 2.3.0

capplets/Makefile.am

@@ -3,7 +3,7 @@ always_built_SUBDIRS =					\
 	default-applications desktop-links font		\
 	background keyboard mouse sound			\
 	file-types theme-switcher ui-properties		\
-	keybindings network windows
+	keybindings $(LOCALIZATION_CAPPLET) network windows
 
 if HAVE_RANDR
 randr_SUBDIRS = display

capplets/localization/.cvsignore

@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+localization.desktop

capplets/localization/Makefile.am

@@ -0,0 +1,25 @@
+bin_PROGRAMS = gnome-localization-properties
+
+gnome_localization_properties_SOURCES =	\
+	gnome-localization-properties.c
+
+gnome_localization_properties_LDADD =	\
+	$(GNOMECC_CAPPLETS_LIBS)	\
+	$(LOCALIZATION_CAPPLET_LIBS)
+
+@INTLTOOL_DESKTOP_RULE@
+
+gladedir   = $(GNOMECC_GLADE_DIR)
+glade_DATA = gnome-localization-properties.glade
+
+pixmapsdir   = $(GNOMECC_PIXMAPS_DIR)
+pixmaps_DATA = \
+	localization-capplet.png
+
+desktopdir = $(GNOMECC_DESKTOP_DIR)
+desktop_in_files = localization.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
+CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
+EXTRA_DIST = $(glade_DATA) $(pixmaps_DATA) $(desktop_in_files)

capplets/localization/localization.desktop.in

@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Language and Culture
+_Comment=Set your language and culture preferences
+Exec=gnome-localization-properties
+Icon=localization-capplet.png
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=GNOME;Application;Settings;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=control-center

configure.in

@@ -111,11 +111,29 @@ PKG_CHECK_MODULES(DISPLAY_CAPPLET, $COMMON_MODULES)
 
 DISPLAY_CAPPLET_LIBS="$DISPLAY_CAPPLET_LIBS $RANDR_LIBS"
 
-				   
 CAPPLET_LIBS="$CAPPLET_LIBS $x_libs"
 GNOMECC_LIBS="$GNOMECC_LIBS $x_libs"
 GNOME_SETTINGS_DAEMON_LIBS="$GNOME_SETTINGS_DAEMON_LIBS $x_libs"
 
+dnl
+dnl Check for libicu, needed for localization capplet
+dnl
+
+AC_ARG_ENABLE(localization-capplet, [  --enable-localization-capplet        Enables the localization capplet],, enable_localization_capplet=no)
+
+if test x$enable_localization_capplet = xyes; then 
+
+AC_CHECK_LIB(icuuc, u_cleanup_2_1, LOCALIZATION_CAPPLET_LIBS="-licui18n",
+  [AC_CHECK_HEADER(unicode/uloc.h, , AC_MSG_ERROR([[
+*** Couldn't find icu. Please download and install from
+*** http://oss.software.ibm.com/icu/ and try again.]]))])
+
+LOCALIZATION_CAPPLET=localization
+AC_SUBST(LOCALIZATION_CAPPLET_LIBS)
+AC_SUBST(LOCALIZATION_CAPPLET)
+
+fi
+
 AC_PATH_PROG(GCONFTOOL, gconftool-2)
 
 dnl
@@ -128,7 +146,6 @@ AC_CHECK_HEADER(X11/Xcursor/Xcursor.h, have_xcursor=yes
 				       :, [#include <X11/Xlib.h>])
 AM_CONDITIONAL(HAVE_XCURSOR, [test $have_xcursor=yes])
 
-
 dnl
 dnl Check for gtk+ with multihead support
 dnl
@@ -401,6 +418,7 @@ capplets/display/Makefile
 capplets/file-types/Makefile
 capplets/file-types/libuuid/Makefile
 capplets/font/Makefile
+capplets/localization/Makefile
 capplets/keybindings/Makefile
 capplets/keyboard/Makefile
 capplets/mouse/Makefile

po/POTFILES.in

@@ -56,6 +56,9 @@ capplets/keybindings/keybinding.desktop.in
 capplets/keyboard/gnome-keyboard-properties.c
 capplets/keyboard/gnome-keyboard-properties.glade
 capplets/keyboard/keyboard.desktop.in
+capplets/localization/gnome-localization-properties.c
+capplets/localization/gnome-localization-properties.glade
+capplets/localization/localization.desktop.in
 capplets/mouse/gnome-mouse-properties.c
 capplets/mouse/gnome-mouse-properties.glade
 capplets/mouse/gnome-settings-mouse.desktop.in