Renamed header file, library name, to avoid clashing with another library.

20 files changed, 57 insertions, 52 deletions

diff --git a/unicode/ChangeLog b/unicode/ChangeLog
index b0ef40a..94bb5d5 100644
--- a/unicode/ChangeLog
+++ b/unicode/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-27  Sam Varshavchik  <mrsam@courier-mta.com>
+
+	* courier-unicode: Rename unicode.h, library name, to avoid name
+	clashing with some old, forgotten, Gnome library.
+
 2015-01-19  Sam Varshavchik  <mrsam@courier-mta.com>
 
 	* all: rebased against Unicode 7. Added unicode_script(), tr24
diff --git a/unicode/Makefile.am b/unicode/Makefile.am
index e9a7179..bdb5b1a 100644
--- a/unicode/Makefile.am
+++ b/unicode/Makefile.am
@@ -47,11 +47,11 @@ update-www-htmlent:
 	@SHELL@ $(srcdir)/update.sh xhtml-symbol.ent http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent
 	@SHELL@ $(srcdir)/update.sh xhtml-special.ent http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent
 
-lib_LTLIBRARIES=libunicode.la
-include_HEADERS=unicode.h
+lib_LTLIBRARIES=libcourier-unicode.la
+include_HEADERS=courier-unicode.h
 man_MANS=$(srcdir)/man/courier-unicode.7 $(srcdir)/man/unicode[\:][\:]iconvert[\:][\:]convert.3 $(srcdir)/man/unicode[\:][\:]iconvert[\:][\:]convert_tocase.3 $(srcdir)/man/unicode[\:][\:]iconvert[\:][\:]fromu.3 $(srcdir)/man/unicode[\:][\:]iconvert[\:][\:]tou.3 $(srcdir)/man/unicode[\:][\:]iso_8859_1.3 $(srcdir)/man/unicode[\:][\:]linebreak_callback_base.3 $(srcdir)/man/unicode[\:][\:]linebreak_callback_save_buf.3 $(srcdir)/man/unicode[\:][\:]linebreak_iter.3 $(srcdir)/man/unicode[\:][\:]linebreakc_callback_base.3 $(srcdir)/man/unicode[\:][\:]linebreakc_iter.3 $(srcdir)/man/unicode[\:][\:]ucs_2.3 $(srcdir)/man/unicode[\:][\:]ucs_4.3 $(srcdir)/man/unicode[\:][\:]utf_8.3 $(srcdir)/man/unicode[\:][\:]wordbreak_callback_base.3 $(srcdir)/man/unicode_convert.3 $(srcdir)/man/unicode_convert_deinit.3 $(srcdir)/man/unicode_convert_fromu_init.3 $(srcdir)/man/unicode_convert_fromu_tobuf.3 $(srcdir)/man/unicode_convert_fromutf8.3 $(srcdir)/man/unicode_convert_init.3 $(srcdir)/man/unicode_convert_tobuf.3 $(srcdir)/man/unicode_convert_tocase.3 $(srcdir)/man/unicode_convert_tocbuf_fromutf8_init.3 $(srcdir)/man/unicode_convert_tocbuf_init.3 $(srcdir)/man/unicode_convert_tocbuf_toutf8_init.3 $(srcdir)/man/unicode_convert_tou_init.3 $(srcdir)/man/unicode_convert_tou_tobuf.3 $(srcdir)/man/unicode_convert_toutf8.3 $(srcdir)/man/unicode_convert_uc.3 $(srcdir)/man/unicode_default_chset.3 $(srcdir)/man/unicode_grapheme_break.3 $(srcdir)/man/unicode_html40ent_lookup.3 $(srcdir)/man/unicode_isspace.3 $(srcdir)/man/unicode_lb_end.3 $(srcdir)/man/unicode_lb_init.3 $(srcdir)/man/unicode_lb_next.3 $(srcdir)/man/unicode_lb_next_cnt.3 $(srcdir)/man/unicode_lb_set_opts.3 $(srcdir)/man/unicode_lbc_end.3 $(srcdir)/man/unicode_lbc_init.3 $(srcdir)/man/unicode_lbc_next.3 $(srcdir)/man/unicode_lbc_next_cnt.3 $(srcdir)/man/unicode_lbc_set_opts.3 $(srcdir)/man/unicode_lc.3 $(srcdir)/man/unicode_script.3 $(srcdir)/man/unicode_tc.3 $(srcdir)/man/unicode_u_ucs2_native.3 $(srcdir)/man/unicode_u_ucs4_native.3 $(srcdir)/man/unicode_uc.3 $(srcdir)/man/unicode_wb_end.3 $(srcdir)/man/unicode_wb_init.3 $(srcdir)/man/unicode_wb_next.3 $(srcdir)/man/unicode_wb_next_cnt.3 $(srcdir)/man/unicode_wbscan_end.3 $(srcdir)/man/unicode_wbscan_init.3 $(srcdir)/man/unicode_wbscan_next.3
 
-libunicode_la_SOURCES=unicode.h unicode.c unicodebuf.c \
+libcourier_unicode_la_SOURCES=courier-unicode.h unicode.c unicodebuf.c \
 			unicodecpp.C \
 			unicode_ultcase.c \
 			unicode_ultcasetab.c \
@@ -64,7 +64,7 @@ libunicode_la_SOURCES=unicode.h unicode.c unicodebuf.c \
 			unicode_wordbreak.c wordbreaktab.h scriptstab.h \
 			wordbreaktab_internal.h \
 			unicode_scripts.c
-libunicode_la_LDFLAGS=-version-info 1:0:0
+libcourier_unicode_la_LDFLAGS=-version-info 1:0:0
 
 EXTRA_DIST=$(noinst_SCRIPTS) $(man_MANS) $(PACKAGE).spec
 
@@ -98,33 +98,33 @@ unicode_htmlent.h: xhtml-lat1.ent xhtml-special.ent xhtml-symbol.ent mkhtmlent.p
 endif
 
 unicodetest_SOURCES=unicodetest.c
-unicodetest_DEPENDENCIES=libunicode.la
-unicodetest_LDADD=libunicode.la
+unicodetest_DEPENDENCIES=libcourier-unicode.la
+unicodetest_LDADD=libcourier-unicode.la
 unicodetest_LDFLAGS=-static
 
 graphemetest_SOURCES=graphemetest.c
-graphemetest_DEPENDENCIES=libunicode.la
-graphemetest_LDADD=libunicode.la
+graphemetest_DEPENDENCIES=libcourier-unicode.la
+graphemetest_LDADD=libcourier-unicode.la
 graphemetest_LDFLAGS=-static
 
 linebreaktest_SOURCES=linebreaktest.C
-linebreaktest_DEPENDENCIES=libunicode.la
-linebreaktest_LDADD=libunicode.la
+linebreaktest_DEPENDENCIES=libcourier-unicode.la
+linebreaktest_LDADD=libcourier-unicode.la
 linebreaktest_LDFLAGS=-static
 
 wordbreaktest_SOURCES=wordbreaktest.C
-wordbreaktest_DEPENDENCIES=libunicode.la
-wordbreaktest_LDADD=libunicode.la
+wordbreaktest_DEPENDENCIES=libcourier-unicode.la
+wordbreaktest_LDADD=libcourier-unicode.la
 wordbreaktest_LDFLAGS=-static
 
 enttest_SOURCES=enttest.c
-enttest_DEPENDENCIES=libunicode.la
-enttest_LDADD=libunicode.la
+enttest_DEPENDENCIES=libcourier-unicode.la
+enttest_LDADD=libcourier-unicode.la
 enttest_LDFLAGS=-static
 
 scripttest_SOURCES=scripttest.c
-scripttest_DEPENDENCIES=libunicode.la
-scripttest_LDADD=libunicode.la
+scripttest_DEPENDENCIES=libcourier-unicode.la
+scripttest_LDADD=libcourier-unicode.la
 scripttest_LDFLAGS=-static
 
 check-am: unicodetest
diff --git a/unicode/book.xml b/unicode/book.xml
index 6bbf691..9e39029 100644
--- a/unicode/book.xml
+++ b/unicode/book.xml
@@ -91,7 +91,7 @@ See COPYING for distribution information.
     </para>
 
     <para>
-      To use the library, <quote>#include &lt;unicode.h&gt;</quote> and link
+      To use the library, <quote>#include &lt;courier-unicode.h&gt;</quote> and link
       with <literal>-lunicode</literal>.
       The starting point is
       <link linkend="courier-unicode">
@@ -126,7 +126,7 @@ See COPYING for distribution information.
 
 	<refsynopsisdiv>
 	  <programlisting>
-#include &lt;unicode.h&gt;</programlisting>
+#include &lt;courier-unicode.h&gt;</programlisting>
 	</refsynopsisdiv>
 	<refsect1>
 	  <title>DESCRIPTION</title>
@@ -142,7 +142,7 @@ See COPYING for distribution information.
 	      text in a given character set to unicode. Any character set
 	      displayed by <command>iconv --list</command> can be specified
 	      for the corresponding character set parameter. Additionally,
-	      <filename>unicode.h</filename> defines a special character
+	      <filename>courier-unicode.h</filename> defines a special character
 	      string <literal>unicode_x_imap_modutf7</literal> that specifies
 	      the pseudo-character set for the modified-UTF7
 	      encoding used in IMAP. This string can also be appended by
@@ -239,7 +239,7 @@ See COPYING for distribution information.
 
 	<refsynopsisdiv>
 	  <funcsynopsis>
-	    <funcsynopsisinfo>#include &lt;unicode.h&gt;
+	    <funcsynopsisinfo>#include &lt;courier-unicode.h&gt;
 
 	    extern const char unicode_u_ucs4_native[];
 
@@ -615,7 +615,7 @@ See COPYING for distribution information.
 
 	<refsynopsisdiv>
 	  <funcsynopsis>
-	    <funcsynopsisinfo>#include &lt;unicode.h&gt;</funcsynopsisinfo>
+	    <funcsynopsisinfo>#include &lt;courier-unicode.h&gt;</funcsynopsisinfo>
 	    <funcprototype>
               <funcdef>const char *<function>unicode_default_chset</function></funcdef>
 	      <void />
@@ -660,7 +660,7 @@ See COPYING for distribution information.
 
 	<refsynopsisdiv>
 	  <funcsynopsis>
-	    <funcsynopsisinfo>#include &lt;unicode.h&gt;</funcsynopsisinfo>
+	    <funcsynopsisinfo>#include &lt;courier-unicode.h&gt;</funcsynopsisinfo>
 	    <funcprototype>
               <funcdef>unicode_char <function>unicode_html40ent_lookup</function></funcdef>
               <paramdef>const char *<parameter>entity</parameter></paramdef>
@@ -712,7 +712,7 @@ See COPYING for distribution information.
 
 	<refsynopsisdiv>
 	  <funcsynopsis>
-	    <funcsynopsisinfo>#include &lt;unicode.h&gt;</funcsynopsisinfo>
+	    <funcsynopsisinfo>#include &lt;courier-unicode.h&gt;</funcsynopsisinfo>
 	    <funcprototype>
               <funcdef>int <function>unicode_isspace</function></funcdef>
               <paramdef>unicode_char <parameter>c</parameter></paramdef>
@@ -762,7 +762,7 @@ See COPYING for distribution information.
 
 	<refsynopsisdiv>
 	  <funcsynopsis>
-	    <funcsynopsisinfo>#include &lt;unicode.h&gt;</funcsynopsisinfo>
+	    <funcsynopsisinfo>#include &lt;courier-unicode.h&gt;</funcsynopsisinfo>
 	    <funcprototype>
               <funcdef>int <function>unicode_grapheme_break</function></funcdef>
               <paramdef>unicode_char <parameter>a</parameter></paramdef>
@@ -816,7 +816,7 @@ See COPYING for distribution information.
 
 	<refsynopsisdiv>
 	  <funcsynopsis>
-	    <funcsynopsisinfo>#include &lt;unicode.h&gt;</funcsynopsisinfo>
+	    <funcsynopsisinfo>#include &lt;courier-unicode.h&gt;</funcsynopsisinfo>
 	    <funcprototype>
               <funcdef>unicode_script_t <function>unicode_script</function></funcdef>
               <paramdef>unicode_char <parameter>ch</parameter></paramdef>
@@ -872,7 +872,7 @@ See COPYING for distribution information.
 
 	<refsynopsisdiv>
 	  <funcsynopsis>
-	    <funcsynopsisinfo>#include &lt;unicode.h&gt;</funcsynopsisinfo>
+	    <funcsynopsisinfo>#include &lt;courier-unicode.h&gt;</funcsynopsisinfo>
 	    <funcprototype>
               <funcdef>unicode_lb_info_t <function>unicode_lb_init</function></funcdef>
               <paramdef>int (*<parameter>cb_func</parameter>)(int, void *)</paramdef>
@@ -1196,7 +1196,7 @@ See COPYING for distribution information.
 
 	<refsynopsisdiv>
 	  <funcsynopsis>
-	    <funcsynopsisinfo>#include &lt;unicode.h&gt;</funcsynopsisinfo>
+	    <funcsynopsisinfo>#include &lt;courier-unicode.h&gt;</funcsynopsisinfo>
 	    <funcprototype>
               <funcdef>unicode_wb_info_t <function>unicode_wb_init</function></funcdef>
               <paramdef>int (*<parameter>cb_func</parameter>)(int, void *)</paramdef>
@@ -1406,7 +1406,7 @@ See COPYING for distribution information.
 
 	<refsynopsisdiv>
 	  <funcsynopsis>
-	    <funcsynopsisinfo>#include &lt;unicode.h&gt;</funcsynopsisinfo>
+	    <funcsynopsisinfo>#include &lt;courier-unicode.h&gt;</funcsynopsisinfo>
 	    <funcprototype>
               <funcdef>unicode_char <function>unicode_uc</function></funcdef>
               <paramdef>unicode_char <parameter>c</parameter></paramdef>
@@ -1522,7 +1522,7 @@ See COPYING for distribution information.
 
 	<refsynopsisdiv>
 	  <funcsynopsis>
-	    <funcsynopsisinfo>#include &lt;unicode.h&gt;
+	    <funcsynopsisinfo>#include &lt;courier-unicode.h&gt;
 
 extern const char unicode::ucs_4[];
 extern const char unicode::ucs_2[];
@@ -1661,7 +1661,7 @@ extern const char unicode::iso_8859_1[];</funcsynopsisinfo>
 
 	<refsynopsisdiv>
 	  <funcsynopsis>
-	    <funcsynopsisinfo>#include &lt;unicode.h&gt;</funcsynopsisinfo>
+	    <funcsynopsisinfo>#include &lt;courier-unicode.h&gt;</funcsynopsisinfo>
 
 	    <funcprototype>
               <funcdef>std::string <function>unicode::iconvert::convert_tocase</function></funcdef>
@@ -1751,7 +1751,7 @@ extern const char unicode::iso_8859_1[];</funcsynopsisinfo>
 
 	<refsynopsisdiv>
 	  <funcsynopsis>
-	    <funcsynopsisinfo>#include &lt;unicode.h&gt;</funcsynopsisinfo>
+	    <funcsynopsisinfo>#include &lt;courier-unicode.h&gt;</funcsynopsisinfo>
 
 	    <funcprototype>
               <funcdef>output_iter_t <function>unicode::iconvert::fromu::convert</function></funcdef>
@@ -1848,7 +1848,7 @@ extern const char unicode::iso_8859_1[];</funcsynopsisinfo>
 
 	<refsynopsisdiv>
 	  <funcsynopsis>
-	    <funcsynopsisinfo>#include &lt;unicode.h&gt;</funcsynopsisinfo>
+	    <funcsynopsisinfo>#include &lt;courier-unicode.h&gt;</funcsynopsisinfo>
 
 	    <funcprototype>
               <funcdef>output_iter_t <function>convert</function></funcdef>
@@ -1951,7 +1951,7 @@ extern const char unicode::iso_8859_1[];</funcsynopsisinfo>
 
 	<refsynopsisdiv>
 	  <programlisting>
-#include &lt;unicode.h&gt;
+#include &lt;courier-unicode.h&gt;
 
 class linebreak : public unicode::linebreak_callback_base {
 
@@ -2148,7 +2148,7 @@ std::copy(beg_iter, end_iter, std::back_insert_iterator&lt;std::vector&lt;int&gt
 
 	<refsynopsisdiv>
 	  <programlisting>
-#include &lt;unicode.h&gt;
+#include &lt;courier-unicode.h&gt;
 
 class wordbreak : public unicode::wordbreak_callback_base {
 
diff --git a/unicode/configure.ac b/unicode/configure.ac
index 5f42966..d384529 100644
--- a/unicode/configure.ac
+++ b/unicode/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([courier-unicode], [1.1], [courier-users@lists.sourceforge.net])
+AC_INIT([courier-unicode], [1.2], [courier-users@lists.sourceforge.net])
 
 >confdefs.h  # Kill PACKAGE_ macros
 
diff --git a/unicode/unicode.h b/unicode/courier-unicode.h
index a857fc3..d6cc948 100644
--- a/unicode/unicode.h
+++ b/unicode/courier-unicode.h
@@ -1,5 +1,5 @@
-#ifndef	unicode_h
-#define	unicode_h
+#ifndef	courier_unicode_h
+#define	courier_unicode_h
 
 /*
 ** Copyright 2000-2015 Double Precision, Inc.
diff --git a/unicode/enttest.c b/unicode/enttest.c
index cf64390..0424272 100644
--- a/unicode/enttest.c
+++ b/unicode/enttest.c
@@ -1,5 +1,5 @@
 #include	"unicode_config.h"
-#include	"unicode.h"
+#include	"courier-unicode.h"
 
 #include	<string.h>
 #include	<stdio.h>
diff --git a/unicode/graphemetest.c b/unicode/graphemetest.c
index 58bc184..00d65f2 100644
--- a/unicode/graphemetest.c
+++ b/unicode/graphemetest.c
@@ -5,7 +5,7 @@
 */
 
 #include	"unicode_config.h"
-#include	"unicode.h"
+#include	"courier-unicode.h"
 #include	<string.h>
 #include	<stdlib.h>
 #include	<stdio.h>
diff --git a/unicode/scripttest.c b/unicode/scripttest.c
index cdd182e..f4c64e5 100644
--- a/unicode/scripttest.c
+++ b/unicode/scripttest.c
@@ -5,7 +5,7 @@
 */
 
 #include	"unicode_config.h"
-#include	"unicode.h"
+#include	"courier-unicode.h"
 #include	<string.h>
 #include	<stdlib.h>
 #include	<stdio.h>
diff --git a/unicode/unicode.c b/unicode/unicode.c
index ed909fe..2dda2f2 100644
--- a/unicode/unicode.c
+++ b/unicode/unicode.c
@@ -5,7 +5,7 @@
 */
 
 #include	"unicode_config.h"
-#include	"unicode.h"
+#include	"courier-unicode.h"
 #include	<string.h>
 #include	<ctype.h>
 #include	<stdlib.h>
diff --git a/unicode/unicode_graphemebreak.c b/unicode/unicode_graphemebreak.c
index 57ce9c7..7df3164 100644
--- a/unicode/unicode_graphemebreak.c
+++ b/unicode/unicode_graphemebreak.c
@@ -5,7 +5,7 @@
 */
 
 #include	"unicode_config.h"
-#include	"unicode.h"
+#include	"courier-unicode.h"
 #include	<unistd.h>
 #include	<stdint.h>
 #include	<stdlib.h>
diff --git a/unicode/unicode_htmlent.c b/unicode/unicode_htmlent.c
index 549d069..c98f43d 100644
--- a/unicode/unicode_htmlent.c
+++ b/unicode/unicode_htmlent.c
@@ -5,7 +5,7 @@
 */
 
 #include	"unicode_config.h"
-#include	"unicode.h"
+#include	"courier-unicode.h"
 
 #include <stdlib.h>
 
diff --git a/unicode/unicode_linebreak.c b/unicode/unicode_linebreak.c
index 736aee0..f94f8de 100644
--- a/unicode/unicode_linebreak.c
+++ b/unicode/unicode_linebreak.c
@@ -5,7 +5,7 @@
 */
 
 #include	"unicode_config.h"
-#include	"unicode.h"
+#include	"courier-unicode.h"
 
 #include <unistd.h>
 #include <stdint.h>
diff --git a/unicode/unicode_scripts.c b/unicode/unicode_scripts.c
index 31aa4d8..6d52b40 100644
--- a/unicode/unicode_scripts.c
+++ b/unicode/unicode_scripts.c
@@ -5,7 +5,7 @@
 */
 
 #include	"unicode_config.h"
-#include	"unicode.h"
+#include	"courier-unicode.h"
 #include "scriptstab.h"
 
 unicode_script_t unicode_script(unicode_char a)
diff --git a/unicode/unicode_tablookup.c b/unicode/unicode_tablookup.c
index c61526d..4674da2 100644
--- a/unicode/unicode_tablookup.c
+++ b/unicode/unicode_tablookup.c
@@ -5,7 +5,7 @@
 */
 
 #include	"unicode_config.h"
-#include	"unicode.h"
+#include	"courier-unicode.h"
 
 #define BLOCK_SIZE	256
 
diff --git a/unicode/unicode_ultcase.c b/unicode/unicode_ultcase.c
index e0c339e..44da797 100644
--- a/unicode/unicode_ultcase.c
+++ b/unicode/unicode_ultcase.c
@@ -5,7 +5,7 @@
 */
 
 #include "unicode_config.h"
-#include "unicode.h"
+#include "courier-unicode.h"
 
 extern const unsigned unicode_case_hash;
 extern const unicode_char unicode_case_tab[][4];
diff --git a/unicode/unicode_ultcasetab.c b/unicode/unicode_ultcasetab.c
index 701d131..39856ad 100644
--- a/unicode/unicode_ultcasetab.c
+++ b/unicode/unicode_ultcasetab.c
@@ -4,7 +4,7 @@
 **
 */
 
-#include "unicode.h"
+#include "courier-unicode.h"
 
 const unsigned unicode_case_hash=2048;
 /* unicode_case_maxbucket=5*/
diff --git a/unicode/unicode_wcwidth.c b/unicode/unicode_wcwidth.c
index 372f7a7..4fbfd1a 100644
--- a/unicode/unicode_wcwidth.c
+++ b/unicode/unicode_wcwidth.c
@@ -1,5 +1,5 @@
 #include "unicode_config.h"
-#include "unicode.h"
+#include "courier-unicode.h"
 
 #include "eastasianwidth.h"
 #include "linebreaktab_internal.h"
diff --git a/unicode/unicode_wordbreak.c b/unicode/unicode_wordbreak.c
index 0bb2b70..b4c4f89 100644
--- a/unicode/unicode_wordbreak.c
+++ b/unicode/unicode_wordbreak.c
@@ -5,7 +5,7 @@
 */
 
 #include	"unicode_config.h"
-#include	"unicode.h"
+#include	"courier-unicode.h"
 
 #include <unistd.h>
 #include <stdint.h>
diff --git a/unicode/unicodebuf.c b/unicode/unicodebuf.c
index 66687c3..a221e3b 100644
--- a/unicode/unicodebuf.c
+++ b/unicode/unicodebuf.c
@@ -5,7 +5,7 @@
 */
 
 #include	"unicode_config.h"
-#include	"unicode.h"
+#include	"courier-unicode.h"
 #include	<stdlib.h>
 #include	<string.h>
 
diff --git a/unicode/unicodetest.c b/unicode/unicodetest.c
index 941b79b..7048f51 100644
--- a/unicode/unicodetest.c
+++ b/unicode/unicodetest.c
@@ -5,7 +5,7 @@
 */
 
 #include	"unicode_config.h"
-#include	"unicode.h"
+#include	"courier-unicode.h"
 #include	<string.h>
 #include	<stdlib.h>
 #include	<stdio.h>