Remove checks for iconv - we now depend on g_iconv wrapper defined in

Sun Nov 12 18:36:38 2000  Owen Taylor  <otaylor@redhat.com>

	* configure.in (included_modules): Remove checks
	for iconv - we now depend on g_iconv wrapper defined
	in GLib.

	* modules/basic/basic.c: Use g_iconv_* not iconv().

	* pango/itemize.c pango/pango-context.c modules/thai/thai.c:
	Remove spurious iconv.h includes.

14 files changed, 103 insertions, 69 deletions

diff --git a/ChangeLog b/ChangeLog
index 863e1bac..abec0efd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Sun Nov 12 18:36:38 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in (included_modules): Remove checks
+	for iconv - we now depend on g_iconv wrapper defined
+	in GLib.
+
+	* modules/basic/basic.c: Use g_iconv_* not iconv().
+
+	* pango/itemize.c pango/pango-context.c modules/thai/thai.c: 
+	Remove spurious iconv.h includes.
+
 Sun Nov 12 16:07:06 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in pango/pango-utils.[ch] pango/Makefile.am
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 863e1bac..abec0efd 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,14 @@
+Sun Nov 12 18:36:38 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in (included_modules): Remove checks
+	for iconv - we now depend on g_iconv wrapper defined
+	in GLib.
+
+	* modules/basic/basic.c: Use g_iconv_* not iconv().
+
+	* pango/itemize.c pango/pango-context.c modules/thai/thai.c: 
+	Remove spurious iconv.h includes.
+
 Sun Nov 12 16:07:06 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in pango/pango-utils.[ch] pango/Makefile.am
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 863e1bac..abec0efd 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,14 @@
+Sun Nov 12 18:36:38 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in (included_modules): Remove checks
+	for iconv - we now depend on g_iconv wrapper defined
+	in GLib.
+
+	* modules/basic/basic.c: Use g_iconv_* not iconv().
+
+	* pango/itemize.c pango/pango-context.c modules/thai/thai.c: 
+	Remove spurious iconv.h includes.
+
 Sun Nov 12 16:07:06 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in pango/pango-utils.[ch] pango/Makefile.am
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 863e1bac..abec0efd 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,14 @@
+Sun Nov 12 18:36:38 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in (included_modules): Remove checks
+	for iconv - we now depend on g_iconv wrapper defined
+	in GLib.
+
+	* modules/basic/basic.c: Use g_iconv_* not iconv().
+
+	* pango/itemize.c pango/pango-context.c modules/thai/thai.c: 
+	Remove spurious iconv.h includes.
+
 Sun Nov 12 16:07:06 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in pango/pango-utils.[ch] pango/Makefile.am
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 863e1bac..abec0efd 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,14 @@
+Sun Nov 12 18:36:38 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in (included_modules): Remove checks
+	for iconv - we now depend on g_iconv wrapper defined
+	in GLib.
+
+	* modules/basic/basic.c: Use g_iconv_* not iconv().
+
+	* pango/itemize.c pango/pango-context.c modules/thai/thai.c: 
+	Remove spurious iconv.h includes.
+
 Sun Nov 12 16:07:06 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in pango/pango-utils.[ch] pango/Makefile.am
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 863e1bac..abec0efd 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,14 @@
+Sun Nov 12 18:36:38 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in (included_modules): Remove checks
+	for iconv - we now depend on g_iconv wrapper defined
+	in GLib.
+
+	* modules/basic/basic.c: Use g_iconv_* not iconv().
+
+	* pango/itemize.c pango/pango-context.c modules/thai/thai.c: 
+	Remove spurious iconv.h includes.
+
 Sun Nov 12 16:07:06 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in pango/pango-utils.[ch] pango/Makefile.am
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 863e1bac..abec0efd 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,14 @@
+Sun Nov 12 18:36:38 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in (included_modules): Remove checks
+	for iconv - we now depend on g_iconv wrapper defined
+	in GLib.
+
+	* modules/basic/basic.c: Use g_iconv_* not iconv().
+
+	* pango/itemize.c pango/pango-context.c modules/thai/thai.c: 
+	Remove spurious iconv.h includes.
+
 Sun Nov 12 16:07:06 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in pango/pango-utils.[ch] pango/Makefile.am
diff --git a/configure.in b/configure.in
index ccc3ceaa..5a4a6640 100644
--- a/configure.in
+++ b/configure.in
@@ -80,39 +80,6 @@ AC_SUBST(FRIBIDI_CFLAGS)
 AM_CONDITIONAL(HAVE_FRIBIDI, test x$have_fribidi = xyes)
 
 #
-# Checks for iconv
-#
-AC_ARG_WITH(libiconv, [ --with-libiconv     Use the libiconv library ],,with_libiconv=maybe)
-
-found_iconv=no
-
-if test "x$with_libiconv" != "xyes" ; then
-   # 
-   # Check in the C library 
-   #
-   AC_CHECK_FUNC(iconv_open, with_libiconv=no; found_iconv=yes)
-fi
-
-if test "x$with_libiconv" != "xno" ; then
-   #
-   # Check for libiconv
-   #
-   AC_CHECK_LIB(iconv, libiconv_open, with_libiconv=yes; found_iconv=yes)
-fi
-
-if test "x$found_iconv" = "xno" ; then
-   AC_MSG_ERROR([*** No iconv() implementation found in C library or libiconv])
-fi
-
-UNICODE_CFLAGS=
-UNICODE_LIBS=
-if test "x$with_libiconv" = "xyes" ; then
-  UNICODE_LIBS="-liconv"
-fi
-AC_SUBST(UNICODE_CFLAGS)
-AC_SUBST(UNICODE_LIBS)
-  
-#
 # Allow building some or all modules included
 #
 AC_ARG_WITH(included_modules, [ --with-included-modules=MODULE1,MODULE2,...     Build the given modules into Pango])
diff --git a/modules/basic/basic-x.c b/modules/basic/basic-x.c
index f044043b..06907bfb 100644
--- a/modules/basic/basic-x.c
+++ b/modules/basic/basic-x.c
@@ -19,8 +19,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <iconv.h>
-
 #include <glib.h>
 #include "pango.h"
 #include "pangox.h"
@@ -63,7 +61,7 @@ struct _MaskTable
 struct _CharCache 
 {
   MaskTable *mask_tables[256];
-  iconv_t converters[MAX_CHARSETS];
+  GIConv converters[MAX_CHARSETS];
 };
 
 static PangoGlyph conv_8bit (CharCache  *cache,
@@ -135,7 +133,7 @@ char_cache_new (void)
   result = g_new0 (CharCache, 1);
 
   for (i=0; i<MAX_CHARSETS; i++)
-    result->converters[i] = (iconv_t)-1;
+    result->converters[i] = (GIConv)-1;
 
   return result;
 }
@@ -155,8 +153,8 @@ char_cache_free (CharCache *cache)
       }
 
   for (i=0; i<MAX_CHARSETS; i++)
-    if (cache->converters[i] != (iconv_t)-1)
-      iconv_close (cache->converters[i]);
+    if (cache->converters[i] != (GIConv)-1)
+      g_iconv_close (cache->converters[i]);
   
   g_free (cache);
 }
@@ -244,14 +242,14 @@ set_glyph (PangoFont *font, PangoGlyphString *glyphs, int i, int offset, PangoGl
   glyphs->glyphs[i].geometry.width = logical_rect.width;
 }
 
-static iconv_t
+static GIConv
 find_converter (CharCache *cache, Charset *charset)
 {
-  iconv_t cd = cache->converters[charset->index];
-  if (cd == (iconv_t)-1)
+  GIConv cd = cache->converters[charset->index];
+  if (cd == (GIConv)-1)
     {
-      cd = iconv_open  (charset->id, "UTF-8");
-      g_assert (cd != (iconv_t)-1);
+      cd = g_iconv_open  (charset->id, "UTF-8");
+      g_assert (cd != (GIConv)-1);
       cache->converters[charset->index] = cd;
     }
 
@@ -263,7 +261,7 @@ conv_8bit (CharCache  *cache,
 	   Charset     *charset,
 	   const char *input)
 {
-  iconv_t cd;
+  GIConv cd;
   char outbuf;
   
   const char *inptr = input;
@@ -275,7 +273,7 @@ conv_8bit (CharCache  *cache,
   
   cd = find_converter (cache, charset);
 
-  iconv (cd, (const char **)&inptr, &inbytesleft, &outptr, &outbytesleft);
+  g_iconv (cd, (char **)&inptr, &inbytesleft, &outptr, &outbytesleft);
 
   return (guchar)outbuf;
 }
@@ -285,7 +283,7 @@ conv_euc (CharCache  *cache,
 	  Charset     *charset,
 	  const char *input)
 {
-  iconv_t cd;
+  GIConv cd;
   char outbuf[2];
 
   const char *inptr = input;
@@ -297,7 +295,7 @@ conv_euc (CharCache  *cache,
   
   cd = find_converter (cache, charset);
 
-  iconv (cd, &inptr, &inbytesleft, &outptr, &outbytesleft);
+  g_iconv (cd, (char **)&inptr, &inbytesleft, &outptr, &outbytesleft);
 
   if ((guchar)outbuf[0] < 128)
     return outbuf[0];
diff --git a/modules/basic/basic.c b/modules/basic/basic.c
index f044043b..06907bfb 100644
--- a/modules/basic/basic.c
+++ b/modules/basic/basic.c
@@ -19,8 +19,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <iconv.h>
-
 #include <glib.h>
 #include "pango.h"
 #include "pangox.h"
@@ -63,7 +61,7 @@ struct _MaskTable
 struct _CharCache 
 {
   MaskTable *mask_tables[256];
-  iconv_t converters[MAX_CHARSETS];
+  GIConv converters[MAX_CHARSETS];
 };
 
 static PangoGlyph conv_8bit (CharCache  *cache,
@@ -135,7 +133,7 @@ char_cache_new (void)
   result = g_new0 (CharCache, 1);
 
   for (i=0; i<MAX_CHARSETS; i++)
-    result->converters[i] = (iconv_t)-1;
+    result->converters[i] = (GIConv)-1;
 
   return result;
 }
@@ -155,8 +153,8 @@ char_cache_free (CharCache *cache)
       }
 
   for (i=0; i<MAX_CHARSETS; i++)
-    if (cache->converters[i] != (iconv_t)-1)
-      iconv_close (cache->converters[i]);
+    if (cache->converters[i] != (GIConv)-1)
+      g_iconv_close (cache->converters[i]);
   
   g_free (cache);
 }
@@ -244,14 +242,14 @@ set_glyph (PangoFont *font, PangoGlyphString *glyphs, int i, int offset, PangoGl
   glyphs->glyphs[i].geometry.width = logical_rect.width;
 }
 
-static iconv_t
+static GIConv
 find_converter (CharCache *cache, Charset *charset)
 {
-  iconv_t cd = cache->converters[charset->index];
-  if (cd == (iconv_t)-1)
+  GIConv cd = cache->converters[charset->index];
+  if (cd == (GIConv)-1)
     {
-      cd = iconv_open  (charset->id, "UTF-8");
-      g_assert (cd != (iconv_t)-1);
+      cd = g_iconv_open  (charset->id, "UTF-8");
+      g_assert (cd != (GIConv)-1);
       cache->converters[charset->index] = cd;
     }
 
@@ -263,7 +261,7 @@ conv_8bit (CharCache  *cache,
 	   Charset     *charset,
 	   const char *input)
 {
-  iconv_t cd;
+  GIConv cd;
   char outbuf;
   
   const char *inptr = input;
@@ -275,7 +273,7 @@ conv_8bit (CharCache  *cache,
   
   cd = find_converter (cache, charset);
 
-  iconv (cd, (const char **)&inptr, &inbytesleft, &outptr, &outbytesleft);
+  g_iconv (cd, (char **)&inptr, &inbytesleft, &outptr, &outbytesleft);
 
   return (guchar)outbuf;
 }
@@ -285,7 +283,7 @@ conv_euc (CharCache  *cache,
 	  Charset     *charset,
 	  const char *input)
 {
-  iconv_t cd;
+  GIConv cd;
   char outbuf[2];
 
   const char *inptr = input;
@@ -297,7 +295,7 @@ conv_euc (CharCache  *cache,
   
   cd = find_converter (cache, charset);
 
-  iconv (cd, &inptr, &inbytesleft, &outptr, &outbytesleft);
+  g_iconv (cd, (char **)&inptr, &inbytesleft, &outptr, &outbytesleft);
 
   if ((guchar)outbuf[0] < 128)
     return outbuf[0];
diff --git a/modules/thai/thai-x.c b/modules/thai/thai-x.c
index 59364d7a..6547250a 100644
--- a/modules/thai/thai-x.c
+++ b/modules/thai/thai-x.c
@@ -19,8 +19,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <iconv.h>
-
 #include <glib.h>
 #include "pango.h"
 #include "pangox.h"
diff --git a/modules/thai/thai.c b/modules/thai/thai.c
index 59364d7a..6547250a 100644
--- a/modules/thai/thai.c
+++ b/modules/thai/thai.c
@@ -19,8 +19,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <iconv.h>
-
 #include <glib.h>
 #include "pango.h"
 #include "pangox.h"
diff --git a/pango/itemize.c b/pango/itemize.c
index 7894aeba..147393c6 100644
--- a/pango/itemize.c
+++ b/pango/itemize.c
@@ -20,7 +20,6 @@
  */
 
 #include "pango.h"
-#include "iconv.h"
 #include "modules.h"
 
 static void add_engines (PangoContext     *context,
diff --git a/pango/pango-context.c b/pango/pango-context.c
index dbdb5801..082344d9 100644
--- a/pango/pango-context.c
+++ b/pango/pango-context.c
@@ -24,7 +24,6 @@
 
 #include "pango/pango-context.h"
 #include "pango/pango-utils.h"
-#include "iconv.h"
 
 #include "pango-modules.h"