Use of libcharset (for portability).

diff --git a/acinclude.m4 b/acinclude.m4
index 7eb2ce35f49744eb8cde421267113f3e8ca1f3a1..e50ed926b1ac5df72eb1f0bfd44f5a8ed40d5a0f 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,5 +1,56 @@
 dnl $Id$
 dnl $Name$
+
+dnl From codeset.m4 (in libcharset):
+#serial 2
+
+dnl From Bruno Haible.
+
+AC_DEFUN(jm_LANGINFO_CODESET,
+[
+  AC_CHECK_HEADERS(langinfo.h)
+  AC_CHECK_FUNCS(nl_langinfo)
+
+  AC_CACHE_CHECK([for nl_langinfo and CODESET], jm_cv_langinfo_codeset,
+    [AC_TRY_LINK([#include <langinfo.h>],
+      [char* cs = nl_langinfo(CODESET);],
+      jm_cv_langinfo_codeset=yes,
+      jm_cv_langinfo_codeset=no)
+    ])
+  if test $jm_cv_langinfo_codeset = yes; then
+    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
+      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+  fi
+])
+
+dnl From glibc21.m4 (in libcharset):
+#serial 2
+
+# Test for the GNU C Library, version 2.1 or newer.
+# From Bruno Haible.
+
+AC_DEFUN(jm_GLIBC21,
+  [
+    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
+      ac_cv_gnu_library_2_1,
+      [AC_EGREP_CPP([Lucky GNU user],
+       [
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+  Lucky GNU user
+ #endif
+#endif
+       ],
+       ac_cv_gnu_library_2_1=yes,
+       ac_cv_gnu_library_2_1=no)
+      ]
+    )
+    AC_SUBST(GLIBC21)
+    GLIBC21="$ac_cv_gnu_library_2_1"
+  ]
+)
+
 dnl From iconv.m4:
 #serial AM2
 

diff --git a/configure.in b/configure.in
index ef83cc941d67fc0c6b647f2491e05fd77df46921..c85d285fefbbf328b0a83dc7f56447b7c4a2dd04 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -28,6 +28,8 @@ AM_INIT_AUTOMAKE(${NAME},${VERSION})
 AM_CONFIG_HEADER(config.h)
 ALL_LINGUAS="nl"
 
+AC_CANONICAL_HOST
+
 dnl =============================================================
 dnl Checks for programs.
 AC_PROG_CC
@@ -65,7 +67,10 @@ AC_TYPE_SIZE_T
 
 dnl ==========================================================
 dnl Checks for library functions.
-AC_CHECK_FUNCS(vsnprintf vsprintf)
+AC_CHECK_HEADERS(stddef.h stdlib.h string.h)
+AC_CHECK_FUNCS(setlocale vsnprintf vsprintf)
+jm_LANGINFO_CODESET
+jm_GLIBC21
 
 dnl ==========================================================
 dnl My local stuff
@@ -114,6 +119,7 @@ AC_OUTPUT(Makefile
          iconv/glibc/Makefile
          iconv/libiconv/Makefile
          utf8/Makefile
+         utf8/libcharset/Makefile
          t/Makefile
          t/src/Makefile
          t/input/Makefile

diff --git a/utf8/Makefile.am b/utf8/Makefile.am
index 2a237bee707660af5497d149733925fb7d4122d6..bcf29c2edabd50f9617e4d72f3b4ff09b80c4eb1 100644 (file)
--- a/utf8/Makefile.am
+++ b/utf8/Makefile.am
@@ -2,7 +2,12 @@
 # $Id$
 # $Name$
 
+SUBDIRS = libcharset .
+
+INCLUDES = -I $(srcdir)/libcharset
+
 noinst_LTLIBRARIES = libutf8.la
 libutf8_la_SOURCES = utf8-locale.c
 libutf8_la_LDFLAGS = $(LIBICONV)
+libutf8_la_LIBADD  = libcharset/libcharset.la
 noinst_HEADERS = utf8-locale.h