--- a/configure +++ a/configure @@ -11770,7 +11770,7 @@ courierlogger=$authsbindir/courierlogger$EXEEXT save_LIBS="$LIBS" -LIBS="-lunicode" +LIBS="-lcourier-unicode" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ --- a/configure.ac +++ a/configure.ac @@ -111,10 +111,10 @@ courierlogger=$authsbindir/courierlogger$EXEEXT AC_SUBST(courierlogger) save_LIBS="$LIBS" -LIBS="-lunicode" +LIBS="-lcourier-unicode" AC_LINK_IFELSE( [AC_LANG_PROGRAM([ -#include +#include ],[ unicode_default_chset(); ])],[:],[AC_MSG_ERROR([The Courier Unicode Library appears not to be installed. You may need to install a separate development subpackage, in addition to the main package])]) --- a/libs/imap/Makefile.am +++ a/libs/imap/Makefile.am @@ -53,7 +53,7 @@ libimapd_la_SOURCES=mainloop.c imaptoken.c imaptoken.h imapwrite.c \ imapwrite.h capability.c externalauth.c smap.c smapsnapshot.c libimapd_la_LIBADD= ../rfc2045/librfc2045.la ../maildir/libmaildir.la \ ../rfc822/librfc822.la ../liblock/liblock.la ../numlib/libnumlib.la \ - -lunicode + -lcourier-unicode libimapd_la_LDFLAGS=-static imaplogin_SOURCES=imaplogin.c authenticate_auth.c proxy.c proxy.h --- a/libs/imap/Makefile.in +++ a/libs/imap/Makefile.in @@ -423,7 +423,7 @@ libimapd_la_SOURCES = mainloop.c imaptoken.c imaptoken.h imapwrite.c \ libimapd_la_LIBADD = ../rfc2045/librfc2045.la ../maildir/libmaildir.la \ ../rfc822/librfc822.la ../liblock/liblock.la ../numlib/libnumlib.la \ - -lunicode + -lcourier-unicode libimapd_la_LDFLAGS = -static imaplogin_SOURCES = imaplogin.c authenticate_auth.c proxy.c proxy.h --- a/libs/imap/imapd.c +++ a/libs/imap/imapd.c @@ -85,7 +85,7 @@ #include "maildir/maildirinfo.h" #include "maildir/loginexec.h" -#include +#include #include "maildir/maildirkeywords.h" #include "courierauth.h" --- a/libs/imap/mailboxlist.c +++ a/libs/imap/mailboxlist.c @@ -64,7 +64,7 @@ #include "maildir/maildiraclt.h" #include "maildir/maildirnewshared.h" #include "maildir/maildirinfo.h" -#include +#include #include "courierauth.h" --- a/libs/imap/search.c +++ a/libs/imap/search.c @@ -22,7 +22,7 @@ #include "rfc822/rfc822hdr.h" #include "rfc822/rfc2047.h" #include "rfc2045/rfc2045.h" -#include +#include #include "numlib/numlib.h" #include "searchinfo.h" #include "imapwrite.h" --- a/libs/imap/searchinfo.c +++ a/libs/imap/searchinfo.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include "searchinfo.h" #include "imapwrite.h" #include "imaptoken.h" --- a/libs/imap/smap.c +++ a/libs/imap/smap.c @@ -59,7 +59,7 @@ #include "maildir/maildiraclt.h" #include "maildir/maildirnewshared.h" #include "maildir/maildirinfo.h" -#include +#include #include "rfc2045/rfc2045.h" #include "rfc822/rfc822.h" --- a/libs/imap/thread.c +++ a/libs/imap/thread.c @@ -17,7 +17,7 @@ #include "rfc822/rfc822.h" #include "rfc822/rfc2047.h" #include "rfc822/imaprefs.h" -#include +#include static void thread_os_callback(struct searchinfo *, struct searchinfo *, int, unsigned long, void *); --- a/libs/maildir/Makefile.am +++ a/libs/maildir/Makefile.am @@ -62,12 +62,12 @@ maildirmake_DEPENDENCIES=libmaildir.la \ ../rfc822/librfc822.la maildirmake_LDADD=libmaildir.la \ ../numlib/libnumlib.la \ - ../rfc822/librfc822.la -lunicode + ../rfc822/librfc822.la -lcourier-unicode maildirmake_LDFLAGS=-static testmaildirfilter_SOURCES=maildirfiltertypelist.h testmaildirfilter.c testmaildirfilter_DEPENDENCIES=libmaildir.la ../numlib/libnumlib.la -testmaildirfilter_LDADD=libmaildir.la ../numlib/libnumlib.la -lunicode @LIBPCRE@ +testmaildirfilter_LDADD=libmaildir.la ../numlib/libnumlib.la -lcourier-unicode @LIBPCRE@ testmaildirfilter_LDFLAGS=-static maildirkwtest_SOURCES=maildirkwtest.c @@ -97,7 +97,7 @@ maildiraclttest_DEPENDENCIES=libmaildir.la ../liblock/liblock.la \ maildiraclttest_LDFLAGS=-static testmaildirsearch_SOURCES=testmaildirsearch.c -testmaildirsearch_LDADD=libmaildir.la -lunicode +testmaildirsearch_LDADD=libmaildir.la -lcourier-unicode testmaildirsearch_DEPENDENCIES=libmaildir.la EXTRA_DIST=README.maildirquota.html README.maildirquota.txt \ --- a/libs/maildir/Makefile.in +++ a/libs/maildir/Makefile.in @@ -455,12 +455,12 @@ maildirmake_DEPENDENCIES = libmaildir.la \ maildirmake_LDADD = libmaildir.la \ ../numlib/libnumlib.la \ - ../rfc822/librfc822.la -lunicode + ../rfc822/librfc822.la -lcourier-unicode maildirmake_LDFLAGS = -static testmaildirfilter_SOURCES = maildirfiltertypelist.h testmaildirfilter.c testmaildirfilter_DEPENDENCIES = libmaildir.la ../numlib/libnumlib.la -testmaildirfilter_LDADD = libmaildir.la ../numlib/libnumlib.la -lunicode @LIBPCRE@ +testmaildirfilter_LDADD = libmaildir.la ../numlib/libnumlib.la -lcourier-unicode @LIBPCRE@ testmaildirfilter_LDFLAGS = -static maildirkwtest_SOURCES = maildirkwtest.c maildirkwtest_LDADD = libmaildir.la @@ -491,7 +491,7 @@ maildiraclttest_DEPENDENCIES = libmaildir.la ../liblock/liblock.la \ maildiraclttest_LDFLAGS = -static testmaildirsearch_SOURCES = testmaildirsearch.c -testmaildirsearch_LDADD = libmaildir.la -lunicode +testmaildirsearch_LDADD = libmaildir.la -lcourier-unicode testmaildirsearch_DEPENDENCIES = libmaildir.la EXTRA_DIST = README.maildirquota.html README.maildirquota.txt \ README.imapkeywords.html \ --- a/libs/maildir/maildirfilter.c +++ a/libs/maildir/maildirfilter.c @@ -11,7 +11,7 @@ #include "autoresponse.h" #include "numlib/numlib.h" -#include +#include #include #include #include --- a/libs/maildir/maildirinfo.c +++ a/libs/maildir/maildirinfo.c @@ -37,7 +37,7 @@ #include "maildirmisc.h" #include "maildirnewshared.h" -#include +#include void maildir_info_destroy(struct maildir_info *info) { --- a/libs/maildir/maildirmake.c +++ a/libs/maildir/maildirmake.c @@ -27,7 +27,7 @@ #include "maildirmisc.h" #include "maildirsharedrc.h" #include "maildirquota.h" -#include +#include static void usage() { --- a/libs/maildir/maildirsearch.h +++ a/libs/maildir/maildirsearch.h @@ -36,7 +36,7 @@ #include "config.h" -#include +#include #include #include --- a/libs/rfc2045/Makefile.am +++ a/libs/rfc2045/Makefile.am @@ -32,22 +32,22 @@ librfc2045_la_SOURCES=rfc2045.c rfc2045.h rfc2045src.h \ reformime_SOURCES=reformime.c reformime_DEPENDENCIES = librfc2045.la ../rfc822/libencode.la ../rfc822/librfc822.la \ ../numlib/libnumlib.la -reformime_LDADD = $(reformime_DEPENDENCIES) -lunicode +reformime_LDADD = $(reformime_DEPENDENCIES) -lcourier-unicode reformime_LDFLAGS=-static makemime_SOURCES=makemime.c makemime_DEPENDENCIES= ../rfc822/libencode.la ../rfc822/librfc822.la librfc2045.la ../numlib/libnumlib.la -makemime_LDADD = $(makemime_DEPENDENCIES) -lunicode +makemime_LDADD = $(makemime_DEPENDENCIES) -lcourier-unicode makemime_LDFLAGS=-static headercheck_SOURCES=headercheck.c headercheck_DEPENDENCIES=librfc2045.la ../rfc822/librfc822.la ../numlib/libnumlib.la -headercheck_LDADD=$(headercheck_DEPENDENCIES) -lunicode +headercheck_LDADD=$(headercheck_DEPENDENCIES) -lcourier-unicode headercheck_LDFLAGS=-static testrfc3676parser_SOURCES=testrfc3676parser.c testrfc3676parser_DEPENDENCIES=librfc2045.la -testrfc3676parser_LDADD=$(testrfc3676parser_DEPENDENCIES) -lunicode +testrfc3676parser_LDADD=$(testrfc3676parser_DEPENDENCIES) -lcourier-unicode if HAVE_SGML reformime.html: reformime.sgml ../docbook/sgml2html --- a/libs/rfc2045/Makefile.in +++ a/libs/rfc2045/Makefile.in @@ -393,19 +393,19 @@ reformime_SOURCES = reformime.c reformime_DEPENDENCIES = librfc2045.la ../rfc822/libencode.la ../rfc822/librfc822.la \ ../numlib/libnumlib.la -reformime_LDADD = $(reformime_DEPENDENCIES) -lunicode +reformime_LDADD = $(reformime_DEPENDENCIES) -lcourier-unicode reformime_LDFLAGS = -static makemime_SOURCES = makemime.c makemime_DEPENDENCIES = ../rfc822/libencode.la ../rfc822/librfc822.la librfc2045.la ../numlib/libnumlib.la -makemime_LDADD = $(makemime_DEPENDENCIES) -lunicode +makemime_LDADD = $(makemime_DEPENDENCIES) -lcourier-unicode makemime_LDFLAGS = -static headercheck_SOURCES = headercheck.c headercheck_DEPENDENCIES = librfc2045.la ../rfc822/librfc822.la ../numlib/libnumlib.la -headercheck_LDADD = $(headercheck_DEPENDENCIES) -lunicode +headercheck_LDADD = $(headercheck_DEPENDENCIES) -lcourier-unicode headercheck_LDFLAGS = -static testrfc3676parser_SOURCES = testrfc3676parser.c testrfc3676parser_DEPENDENCIES = librfc2045.la -testrfc3676parser_LDADD = $(testrfc3676parser_DEPENDENCIES) -lunicode +testrfc3676parser_LDADD = $(testrfc3676parser_DEPENDENCIES) -lcourier-unicode @HAVE_LIBIDN_FALSE@TESTSUITE = testsuite.txt.noidn @HAVE_LIBIDN_TRUE@TESTSUITE = testsuite.txt.idn all: $(BUILT_SOURCES) rfc2045_config.h --- a/libs/rfc2045/reformime.c +++ a/libs/rfc2045/reformime.c @@ -31,7 +31,7 @@ #include "rfc822/rfc822.h" #include "rfc822/rfc2047.h" #include "rfc2045charset.h" -#include +#include #if HAVE_UNISTD_H #include --- a/libs/rfc2045/rfc2045decodemimesectionu.c +++ a/libs/rfc2045/rfc2045decodemimesectionu.c @@ -5,7 +5,7 @@ #include "rfc2045_config.h" #include "rfc2045.h" -#include +#include #include #include #include --- a/libs/rfc2045/rfc2045reply.c +++ a/libs/rfc2045/rfc2045reply.c @@ -10,7 +10,7 @@ #include "rfc822/rfc2047.h" #include "rfc2045charset.h" #include "rfc822/rfc822.h" -#include +#include #include #include #include --- a/libs/rfc2045/rfc2231.c +++ a/libs/rfc2045/rfc2231.c @@ -15,7 +15,7 @@ #include #include "rfc2045.h" #include "rfc822/rfc822.h" -#include +#include /* ** Deallocate a link list of rfc2231param structures. --- a/libs/rfc2045/rfc3676parser.h +++ a/libs/rfc2045/rfc3676parser.h @@ -9,7 +9,7 @@ */ #include "rfc2045/rfc2045_config.h" -#include +#include #include #include --- a/libs/rfc822/Makefile.am +++ a/libs/rfc822/Makefile.am @@ -24,12 +24,12 @@ noinst_DATA=$(BUILT_SOURCES) noinst_PROGRAMS=testsuite reftest testsuite_SOURCES=testsuite.c testsuite_DEPENDENCIES=librfc822.la -testsuite_LDADD=librfc822.la -lunicode +testsuite_LDADD=librfc822.la -lcourier-unicode testsuite_LDFLAGS=-static reftest_SOURCES=reftest.c imaprefs.h reftest_DEPENDENCIES=librfc822.la -reftest_LDADD=librfc822.la -lunicode +reftest_LDADD=librfc822.la -lcourier-unicode reftest_LDFLAGS=-static EXTRA_DIST=testsuite.txt reftest.txt $(BUILT_SOURCES) --- a/libs/rfc822/Makefile.in +++ a/libs/rfc822/Makefile.in @@ -349,11 +349,11 @@ BUILT_SOURCES = rfc822.3 rfc822.html noinst_DATA = $(BUILT_SOURCES) testsuite_SOURCES = testsuite.c testsuite_DEPENDENCIES = librfc822.la -testsuite_LDADD = librfc822.la -lunicode +testsuite_LDADD = librfc822.la -lcourier-unicode testsuite_LDFLAGS = -static reftest_SOURCES = reftest.c imaprefs.h reftest_DEPENDENCIES = librfc822.la -reftest_LDADD = librfc822.la -lunicode +reftest_LDADD = librfc822.la -lcourier-unicode reftest_LDFLAGS = -static EXTRA_DIST = testsuite.txt reftest.txt $(BUILT_SOURCES) all: $(BUILT_SOURCES) config.h --- a/libs/rfc822/encodeautodetect.c +++ a/libs/rfc822/encodeautodetect.c @@ -8,7 +8,7 @@ #include "encode.h" #include #include -#include +#include static const char *libmail_encode_autodetect(int use7bit, int (*func)(void *), void *arg, --- a/libs/rfc822/rfc2047.c +++ a/libs/rfc822/rfc2047.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include "rfc822hdr.h" #include "rfc2047.h" --- a/libs/rfc822/rfc2047u.c +++ a/libs/rfc822/rfc2047u.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include "rfc822hdr.h" #include "rfc2047.h"