mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-31 16:50:58 +00:00
Hack to disable locales where not supported.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@15573 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
0b49439a6b
commit
8834609a23
3 changed files with 10 additions and 2 deletions
|
@ -184,7 +184,11 @@ GSDomainFromDefaultLocale(void)
|
||||||
|
|
||||||
/* FIXME: Get currency format from localeconv */
|
/* FIXME: Get currency format from localeconv */
|
||||||
|
|
||||||
|
#ifdef LC_MESSAGES
|
||||||
str1 = GSSetLocale(LC_MESSAGES, nil);
|
str1 = GSSetLocale(LC_MESSAGES, nil);
|
||||||
|
#else
|
||||||
|
str1 = nil;
|
||||||
|
#endif
|
||||||
if (str1 != nil)
|
if (str1 != nil)
|
||||||
{
|
{
|
||||||
[dict setObject: str1 forKey: NSLocale];
|
[dict setObject: str1 forKey: NSLocale];
|
||||||
|
|
|
@ -438,7 +438,9 @@ static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */
|
||||||
NSString *locale = nil;
|
NSString *locale = nil;
|
||||||
|
|
||||||
#ifdef HAVE_LOCALE_H
|
#ifdef HAVE_LOCALE_H
|
||||||
|
#ifdef LC_MESSAGES
|
||||||
locale = GSSetLocale(LC_MESSAGES, nil);
|
locale = GSSetLocale(LC_MESSAGES, nil);
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
if (locale == nil)
|
if (locale == nil)
|
||||||
{
|
{
|
||||||
|
@ -485,7 +487,9 @@ static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */
|
||||||
NSString *locale = nil;
|
NSString *locale = nil;
|
||||||
|
|
||||||
#ifdef HAVE_LOCALE_H
|
#ifdef HAVE_LOCALE_H
|
||||||
|
#ifdef LC_MESSAGES
|
||||||
locale = GSSetLocale(LC_MESSAGES, nil);
|
locale = GSSetLocale(LC_MESSAGES, nil);
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
[classLock lock];
|
[classLock lock];
|
||||||
if (userLanguages != nil)
|
if (userLanguages != nil)
|
||||||
|
|
4
configure
vendored
4
configure
vendored
|
@ -2656,8 +2656,8 @@ fi
|
||||||
# The following one is so that headers of custom libraries into
|
# The following one is so that headers of custom libraries into
|
||||||
# $GNUSTEP_HDIR are used before the standard ones
|
# $GNUSTEP_HDIR are used before the standard ones
|
||||||
#
|
#
|
||||||
CPPFLAGS="$CPPFLAGS -I$GNUSTEP_HDIR"
|
CPPFLAGS="$CPPFLAGS -I $GNUSTEP_HDIR"
|
||||||
LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR"
|
LDFLAGS="$LDFLAGS -L $GNUSTEP_LDIR/$LIBRARY_COMBO -L $GNUSTEP_LDIR"
|
||||||
|
|
||||||
#--------------------------------------------------------------------
|
#--------------------------------------------------------------------
|
||||||
# Check if Objective-C is installed
|
# Check if Objective-C is installed
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue