From 337413eb5f7f82901ec4c2e9d66d7aedf345d992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Perell=C3=B3=20Mar=C3=ADn?= Date: Tue, 3 Feb 2004 13:31:28 +0000 Subject: [PATCH] Removed the localization capplet references, it will wait until GNOME 2.7, MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2004-02-03 Carlos Perelló Marín * configure.in, capplets/Makefile.am: Removed the localization capplet references, it will wait until GNOME 2.7, it's too late for GNOME 2.6. --- ChangeLog | 5 +++++ capplets/Makefile.am | 2 +- configure.in | 17 ----------------- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b761aa2b..5efab62a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-02-03 Carlos Perelló Marín + + * configure.in, capplets/Makefile.am: Removed the localization capplet + references, it will wait until GNOME 2.7, it's too late for GNOME 2.6. + 2004-01-18 Jason Leach * schemas/Makefile.am (install-data-local): builddir != srcdir fix. diff --git a/capplets/Makefile.am b/capplets/Makefile.am index 29e03f26b..2495fc813 100644 --- a/capplets/Makefile.am +++ b/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 $(LOCALIZATION_CAPPLET) network windows + keybindings network windows if HAVE_RANDR randr_SUBDIRS = display diff --git a/configure.in b/configure.in index f89fbcdf0..8d665b1a2 100644 --- a/configure.in +++ b/configure.in @@ -115,23 +115,6 @@ 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