mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-23 17:10:48 +00:00
Fix setup of HAVE_ICU
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@31567 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm
parent
4faf3c4eda
commit
544670fc15
7 changed files with 16694 additions and 2810 deletions
|
|
@ -1,3 +1,12 @@
|
|||
2010-10-27 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* configure.ac: Fix definition of HAVE_ICU
|
||||
* configure:
|
||||
* Headers/Additions/GNUstepBase/config.h.in: regenerate
|
||||
* Headers/Additions/GNUstepBase/GSMime.h
|
||||
* Source/Additions/GSMime.m: wrap long lines
|
||||
* Source/NSLocale.m: Use HAVE_ICU
|
||||
|
||||
2010-10-26 Niels Grewe <niels.grewe@halbordnung.de>
|
||||
|
||||
* Source/NSLocale.m: Fix -displayNameForKey:value: to interact properly
|
||||
|
|
|
|||
|
|
@ -355,9 +355,9 @@ typedef enum {
|
|||
- (void) setPort: (NSString*)s;
|
||||
|
||||
/** Set the username for authentication to the SMTP server.
|
||||
* If this is not set (or is set to nil) then the GSMimeSMTPClientUsername user
|
||||
* default is used. If the username is nil or an empty string then authentication
|
||||
* is not attempted.
|
||||
* If this is not set (or is set to nil) then the GSMimeSMTPClientUsername
|
||||
* user default is used. If the username is nil or an empty string then
|
||||
* authentication is not attempted.
|
||||
*/
|
||||
- (void) setUsername: (NSString*)s;
|
||||
|
||||
|
|
|
|||
|
|
@ -277,6 +277,9 @@
|
|||
/* Define if you have this function */
|
||||
#undef HAVE_ICONV
|
||||
|
||||
/* Define if using International Components for Unicode */
|
||||
#undef HAVE_ICU
|
||||
|
||||
/* Define to 1 if you have the `inet_aton' function. */
|
||||
#undef HAVE_INET_ATON
|
||||
|
||||
|
|
@ -666,9 +669,6 @@
|
|||
/* Define to the one symbol short name of this package. */
|
||||
#undef PACKAGE_TARNAME
|
||||
|
||||
/* Define to the home page for this package. */
|
||||
#undef PACKAGE_URL
|
||||
|
||||
/* Define to the version of this package. */
|
||||
#undef PACKAGE_VERSION
|
||||
|
||||
|
|
|
|||
|
|
@ -6327,7 +6327,8 @@ GS_PRIVATE_INTERNAL(GSMimeSMTPClient)
|
|||
}
|
||||
while ([internal->queue count] > 0)
|
||||
{
|
||||
[[NSRunLoop currentRunLoop] runMode: NSDefaultRunLoopMode beforeDate: limit];
|
||||
[[NSRunLoop currentRunLoop] runMode: NSDefaultRunLoopMode
|
||||
beforeDate: limit];
|
||||
}
|
||||
return [internal->queue count] == 0 ? YES : NO;
|
||||
}
|
||||
|
|
@ -6529,7 +6530,8 @@ GS_PRIVATE_INTERNAL(GSMimeSMTPClient)
|
|||
{
|
||||
/* If we have no sender address ... use postmaster.
|
||||
*/
|
||||
from = [NSString stringWithFormat: @"postmaster@%@", [self _identity]];
|
||||
from = [NSString stringWithFormat: @"postmaster@%@",
|
||||
[self _identity]];
|
||||
}
|
||||
|
||||
tmp = [NSString stringWithFormat: @"MAIL FROM: %@\r\n", from];
|
||||
|
|
@ -6675,7 +6677,7 @@ GS_PRIVATE_INTERNAL(GSMimeSMTPClient)
|
|||
if (internal->rdata == nil)
|
||||
{
|
||||
internal->rdata = [[NSMutableData alloc] initWithBytes: buf
|
||||
length: length];
|
||||
length: length];
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -6999,7 +7001,8 @@ GS_PRIVATE_INTERNAL(GSMimeSMTPClient)
|
|||
NSDictionary *d;
|
||||
NSString *s;
|
||||
|
||||
s = [NSString stringWithFormat: @"Unexpected response form server while %@: %@",
|
||||
s = [NSString stringWithFormat:
|
||||
@"Unexpected response form server while %@: %@",
|
||||
[self stateDesc], r];
|
||||
|
||||
d = [NSDictionary dictionaryWithObjectsAndKeys:
|
||||
|
|
@ -7205,11 +7208,12 @@ GS_PRIVATE_INTERNAL(GSMimeSMTPClient)
|
|||
{
|
||||
[internal->timer invalidate];
|
||||
}
|
||||
internal->timer = [NSTimer scheduledTimerWithTimeInterval: s
|
||||
target: self
|
||||
selector: @selector(_timeout:)
|
||||
userInfo: nil
|
||||
repeats: NO];
|
||||
internal->timer
|
||||
= [NSTimer scheduledTimerWithTimeInterval: s
|
||||
target: self
|
||||
selector: @selector(_timeout:)
|
||||
userInfo: nil
|
||||
repeats: NO];
|
||||
}
|
||||
@end
|
||||
|
||||
|
|
|
|||
|
|
@ -78,25 +78,17 @@ static NSLocale *systemLocale = nil;
|
|||
static NSMutableDictionary *allLocales = nil;
|
||||
static NSRecursiveLock *classLock = nil;
|
||||
|
||||
#if !defined(HAVE_UCI)
|
||||
# if HAVE_UNICODE_ULOC_H
|
||||
# define HAVE_UCI 1
|
||||
# else
|
||||
# define HAVE_UCI 0
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#if HAVE_UNICODE_ULOC_H
|
||||
#if defined(HAVE_UNICODE_ULOC_H)
|
||||
# include <unicode/uloc.h>
|
||||
#endif
|
||||
#if HAVE_UNICODE_ULOCDATA_H
|
||||
#if defined(HAVE_UNICODE_ULOCDATA_H)
|
||||
# include <unicode/ulocdata.h>
|
||||
#endif
|
||||
#if HAVE_UNICODE_UCURR_H
|
||||
#if defined(HAVE_UNICODE_UCURR_H)
|
||||
# include <unicode/ucurr.h>
|
||||
#endif
|
||||
|
||||
#if HAVE_UCI
|
||||
#if defined(HAVE_ICU)
|
||||
//
|
||||
// ICU Component Keywords
|
||||
//
|
||||
|
|
|
|||
|
|
@ -2647,9 +2647,14 @@ AC_ARG_ENABLE(icu,
|
|||
if test $enable_icu = yes; then
|
||||
AC_CHECK_ICU(4.0, have_icu=yes, have_icu=no)
|
||||
if test "$have_icu" = "yes"; then
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_CHECK_HEADERS(unicode/uloc.h unicode/ulocdata.h unicode/ucurr.h)
|
||||
LIBS="$LIBS $ICU_LIBS"
|
||||
HAVE_ICU=1
|
||||
AC_DEFINE(HAVE_ICU,1,
|
||||
[Define if using International Components for Unicode])
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
fi
|
||||
AC_SUBST(HAVE_ICU)
|
||||
|
|
|
|||
Loading…
Reference in a new issue