applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed the localization capplet references, it will wait until GNOME 2.7,

Browse source 
2004-02-03  Carlos Perelló Marín <carlos@gnome.org>

	* 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.
This commit is contained in:
Carlos Perelló Marín 2004-02-03 13:31:28 +00:00 • committed by Carlos Perelló Marín
parent 0723bcdf1c
commit 337413eb5f
3 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2004-02-03 Carlos Perelló Marín <carlos@gnome.org>
* 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 <leach@wam.umd.edu> 2004-01-18 Jason Leach <leach@wam.umd.edu>
* schemas/Makefile.am (install-data-local): builddir != srcdir fix. * schemas/Makefile.am (install-data-local): builddir != srcdir fix.

2
capplets/Makefile.am
View file

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

17
configure.in
View file

@ -115,23 +115,6 @@ CAPPLET_LIBS="$CAPPLET_LIBS $x_libs"
GNOMECC_LIBS="$GNOMECC_LIBS $x_libs" GNOMECC_LIBS="$GNOMECC_LIBS $x_libs"
GNOME_SETTINGS_DAEMON_LIBS="$GNOME_SETTINGS_DAEMON_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) AC_PATH_PROG(GCONFTOOL, gconftool-2)
dnl dnl