mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +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
35efefca29
commit
2517c185e1
3 changed files with 10 additions and 2 deletions
|
@ -184,7 +184,11 @@ GSDomainFromDefaultLocale(void)
|
|||
|
||||
/* FIXME: Get currency format from localeconv */
|
||||
|
||||
#ifdef LC_MESSAGES
|
||||
str1 = GSSetLocale(LC_MESSAGES, nil);
|
||||
#else
|
||||
str1 = nil;
|
||||
#endif
|
||||
if (str1 != nil)
|
||||
{
|
||||
[dict setObject: str1 forKey: NSLocale];
|
||||
|
|
|
@ -438,7 +438,9 @@ static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */
|
|||
NSString *locale = nil;
|
||||
|
||||
#ifdef HAVE_LOCALE_H
|
||||
#ifdef LC_MESSAGES
|
||||
locale = GSSetLocale(LC_MESSAGES, nil);
|
||||
#endif
|
||||
#endif
|
||||
if (locale == nil)
|
||||
{
|
||||
|
@ -485,7 +487,9 @@ static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */
|
|||
NSString *locale = nil;
|
||||
|
||||
#ifdef HAVE_LOCALE_H
|
||||
#ifdef LC_MESSAGES
|
||||
locale = GSSetLocale(LC_MESSAGES, nil);
|
||||
#endif
|
||||
#endif
|
||||
[classLock lock];
|
||||
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
|
||||
# $GNUSTEP_HDIR are used before the standard ones
|
||||
#
|
||||
CPPFLAGS="$CPPFLAGS -I$GNUSTEP_HDIR"
|
||||
LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR"
|
||||
CPPFLAGS="$CPPFLAGS -I $GNUSTEP_HDIR"
|
||||
LDFLAGS="$LDFLAGS -L $GNUSTEP_LDIR/$LIBRARY_COMBO -L $GNUSTEP_LDIR"
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Check if Objective-C is installed
|
||||
|
|
Loading…
Reference in a new issue