Reconfigure against the standalone unicode library.

4 files changed, 14 insertions, 14 deletions

diff --git a/rfc822/Makefile.am b/rfc822/Makefile.am
index cda7f9d..ec41e4c 100644
--- a/rfc822/Makefile.am
+++ b/rfc822/Makefile.am
@@ -23,13 +23,13 @@ noinst_DATA=$(BUILT_SOURCES)
 
 noinst_PROGRAMS=testsuite reftest
 testsuite_SOURCES=testsuite.c
-testsuite_DEPENDENCIES=librfc822.la ../unicode/libunicode.la
-testsuite_LDADD=librfc822.la ../unicode/libunicode.la
+testsuite_DEPENDENCIES=librfc822.la
+testsuite_LDADD=librfc822.la -lunicode
 testsuite_LDFLAGS=-static
 
 reftest_SOURCES=reftest.c imaprefs.h
-reftest_DEPENDENCIES=librfc822.la ../unicode/libunicode.la
-reftest_LDADD=librfc822.la ../unicode/libunicode.la
+reftest_DEPENDENCIES=librfc822.la
+reftest_LDADD=librfc822.la -lunicode
 reftest_LDFLAGS=-static
 
 EXTRA_DIST=testsuite.txt reftest.txt $(BUILT_SOURCES)
diff --git a/rfc822/encodeautodetect.c b/rfc822/encodeautodetect.c
index ad1ebc6..194c91b 100644
--- a/rfc822/encodeautodetect.c
+++ b/rfc822/encodeautodetect.c
@@ -8,7 +8,7 @@
 #include	"encode.h"
 #include	<string.h>
 #include	<stdlib.h>
-#include	"../unicode/unicode.h"
+#include	<unicode.h>
 
 static const char *libmail_encode_autodetect(int use7bit,
 					     int (*func)(void *), void *arg,
diff --git a/rfc822/rfc2047.c b/rfc822/rfc2047.c
index f80e862..872c557 100644
--- a/rfc822/rfc2047.c
+++ b/rfc822/rfc2047.c
@@ -9,10 +9,10 @@
 #include	<string.h>
 #include	<stdlib.h>
 #include	<errno.h>
+#include	<unicode.h>
 
 #include	"rfc822hdr.h"
 #include	"rfc2047.h"
-#include	"../unicode/unicode.h"
 #if LIBIDN
 #include <idna.h>
 #include <stringprep.h>
@@ -97,7 +97,7 @@ static char *rfc822_encode_domain_int(const char *pfix,
 char *rfc822_encode_domain(const char *address,
 			   const char *charset)
 {
-	char *p=libmail_u_convert_tobuf(address, charset, "utf-8", NULL);
+	char *p=unicode_convert_tobuf(address, charset, "utf-8", NULL);
 	char *cp, *q;
 
 	if (!p)
@@ -506,7 +506,7 @@ static int do_encode_words_method(const unicode_char *uc,
 				}
 		}
 
-		if ((rc=libmail_u_convert_fromu_tobuf(uc, j, charset,
+		if ((rc=unicode_convert_fromu_tobuf(uc, j, charset,
 						      &p, &psize,
 						      NULL)) != 0)
 			return rc;
@@ -555,7 +555,7 @@ static int do_encode_words(const unicode_char *uc,
 	** Convert from unicode
 	*/
 
-	if ((rc=libmail_u_convert_fromu_tobuf(uc, ucsize, charset,
+	if ((rc=unicode_convert_fromu_tobuf(uc, ucsize, charset,
 					      &p, &psize,
 					      NULL)) != 0)
 		return rc;
@@ -675,7 +675,7 @@ char *rfc2047_encode_str(const char *str, const char *charset,
 
 	/* Convert string to unicode */
 
-	if (libmail_u_convert_tou_tobuf(str, strlen(str), charset,
+	if (unicode_convert_tou_tobuf(str, strlen(str), charset,
 					&uc, &ucsize, &err))
 		return NULL;
 
diff --git a/rfc822/rfc2047u.c b/rfc822/rfc2047u.c
index c1bc48b..dc2244e 100644
--- a/rfc822/rfc2047u.c
+++ b/rfc822/rfc2047u.c
@@ -9,10 +9,10 @@
 #include	<string.h>
 #include	<stdlib.h>
 #include	<errno.h>
+#include	<unicode.h>
 
 #include	"rfc822hdr.h"
 #include	"rfc2047.h"
-#include	"../unicode/unicode.h"
 
 #if LIBIDN
 #include <idna.h>
@@ -93,7 +93,7 @@ static void rfc822_display_addr_cb(const char *chset,
 	memcpy(buf, content, cnt);
 	buf[cnt]=0;
 
-	ptr=libmail_u_convert_tobuf(buf, chset, s->chset, NULL);
+	ptr=unicode_convert_tobuf(buf, chset, s->chset, NULL);
 	free(buf);
 
 	if (ptr)
@@ -356,7 +356,7 @@ int rfc822_display_addr_str(const char *tok,
 			(*print_func)(p, strlen(p), ptr);
 		else
 		{
-			char *q=libmail_u_convert_tobuf(utf8_ptr,
+			char *q=unicode_convert_tobuf(utf8_ptr,
 							"utf-8",
 							chset, NULL);
 			if (q)
@@ -474,7 +474,7 @@ int rfc2047_print_unicodeaddr(const struct rfc822a *a,
 			if (strchr(RFC822_SPECIALS, nbuf.bufptr[i]))
 				break;
 
-		cpbuf=libmail_u_convert_tobuf(nbuf.bufptr, "utf-8", charset,
+		cpbuf=unicode_convert_tobuf(nbuf.bufptr, "utf-8", charset,
 					      NULL);
 
 		if (!cpbuf)