diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-11-12 23:45:34 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-11-12 23:45:34 +0000 |
| commit | 84edb7cb9a67dfd10857e9503ec953c05d870341 (patch) | |
| tree | 6d7ea6e6aea099af10eb9125975268139e20bea3 /configure.in | |
| parent | f726b8d49d00e325314ee6f17cf1f7eaed1fd019 (diff) | |
| download | pango-84edb7cb9a67dfd10857e9503ec953c05d870341.tar.gz | |
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.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 33 |
1 files changed, 0 insertions, 33 deletions
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]) |