diff options
| author | Sam Varshavchik | 2014-01-12 13:26:54 -0500 |
|---|---|---|
| committer | Sam Varshavchik | 2014-01-12 13:26:54 -0500 |
| commit | 40ed34ef54ac459116e2a37b63955c75a18a9441 (patch) | |
| tree | b4239ed6454f45853de0be3c5a8266e310f7f0b1 /maildrop | |
| parent | a307e734a37763fc25778adffc2cd5c0d0390555 (diff) | |
| download | courier-libs-40ed34ef54ac459116e2a37b63955c75a18a9441.tar.bz2 | |
Reconfigure against the standalone unicode library.
Diffstat (limited to 'maildrop')
| -rw-r--r-- | maildrop/Makefile.am | 7 | ||||
| -rw-r--r-- | maildrop/mailbot.c | 10 |
2 files changed, 8 insertions, 9 deletions
diff --git a/maildrop/Makefile.am b/maildrop/Makefile.am index 662833b..d37d054 100644 --- a/maildrop/Makefile.am +++ b/maildrop/Makefile.am @@ -29,9 +29,8 @@ libmdcommon_la_SOURCES=alarm.C alarm.h alarmsleep.C alarmsleep.h alarmtimer.C \ libmdcommon_la_LIBADD=../maildir/libmaildir.la \ ../rfc2045/librfc2045.la \ ../rfc822/librfc822.la \ - ../unicode/libunicode.la \ ../numlib/libnumlib.la ../liblock/liblock.la \ - $(DBLIB) + $(DBLIB) -lunicode libmdcommon_la_LDFLAGS=-static @@ -60,10 +59,10 @@ noinst_PROGRAMS=maildrop reformail mailbot mailbot_SOURCES=mailbot.c mailbot_DEPENDENCIES=../rfc2045/librfc2045.la \ ../rfc822/librfc822.la ../liblock/liblock.la \ - ../numlib/libnumlib.la ../unicode/libunicode.la $(DBLIB) + ../numlib/libnumlib.la $(DBLIB) mailbot_LDADD=../rfc2045/librfc2045.la \ ../rfc822/librfc822.la ../liblock/liblock.la \ - ../numlib/libnumlib.la ../unicode/libunicode.la $(DBLIB) + ../numlib/libnumlib.la $(DBLIB) -lunicode mailbot_LDFLAGS = -static if HAVE_LIBIDN diff --git a/maildrop/mailbot.c b/maildrop/mailbot.c index dc8d43f..5fbb860 100644 --- a/maildrop/mailbot.c +++ b/maildrop/mailbot.c @@ -7,7 +7,7 @@ #include "dbobj.h" #include "liblock/config.h" #include "liblock/liblock.h" -#include "unicode/unicode.h" +#include <unicode.h> #include "numlib/numlib.h" #include <string.h> #include <stdlib.h> @@ -606,9 +606,9 @@ int main(int argc, char **argv) if (optarg && *optarg) { - char *p=libmail_u_convert_tobuf("", + char *p=unicode_convert_tobuf("", optarg, - libmail_u_ucs4_native, + unicode_u_ucs4_native, NULL); if (!p) @@ -887,9 +887,9 @@ int main(int argc, char **argv) char *p=NULL; if (charset) - p=libmail_u_convert_tobuf("", + p=unicode_convert_tobuf("", charset, - libmail_u_ucs4_native, + unicode_u_ucs4_native, NULL); if (!p) |