Check for glibc 2.2 iconv (2.2 is needed for the ansel module).

[gedcom-parse.git] / configure.in

diff --git a/configure.in b/configure.in
index ef83cc941d67fc0c6b647f2491e05fd77df46921..54c2329d84aedcae98e04865be8ff2fad055fae7 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
@@ -48,7 +50,7 @@ fi
 
 dnl =============================================================
 dnl Checks for libraries.
-AM_GNU_GETTEXT
+AM_GNU_GETTEXT([use-libtool])
 AM_WITH_DMALLOC
 
 dnl == Make statically linked test program for dmalloc tests
@@ -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
@@ -85,11 +90,17 @@ fi
 AC_MSG_CHECKING(for location of iconv)
 if test "$am_cv_lib_iconv" = yes; then
   AC_MSG_RESULT(libiconv)
-  AC_LIBICONV_HAS_ANSEL
+  gedcom_LIBICONV_HAS_ANSEL
 else
   AC_MSG_RESULT(libc)
-  AC_GLIBC_ICONV
-  if test "$is_glibc_iconv" = yes; then
+  LCS_SUBDIRS=libcharset
+  LCS_INCLUDES='-I $(srcdir)/libcharset'
+  LCS_LIBADD=libcharset/libcharset.la
+  AC_SUBST(LCS_SUBDIRS)
+  AC_SUBST(LCS_INCLUDES)
+  AC_SUBST(LCS_LIBADD)
+  gedcom_GLIBC22_ICONV
+  if test "$is_glibc22_iconv" = yes; then
     DIRS="glibc"
     is_ansel_supported=yes
     AC_SUBST(DIRS)
@@ -99,14 +110,15 @@ fi
 if test "$is_ansel_supported" != yes; then
   AC_MSG_WARN([
 *******************************************************************************
-Your libiconv library doesn't support ANSEL.  Consider installing the modified
-libiconv library if you need ANSEL support in the Gedcom parser library (see
-README).
+Your iconv implementation doesn't support ANSEL.  Consider installing the
+modified libiconv library if you need ANSEL support in the Gedcom parser
+library (see README).
 *******************************************************************************
   ])
 fi
 
-AC_OUTPUT(Makefile
+AC_OUTPUT(GNUmakefile
+          Makefile
          gedcom/Makefile
          gedcom/calendar/Makefile
          gom/Makefile
@@ -114,13 +126,16 @@ AC_OUTPUT(Makefile
          iconv/glibc/Makefile
          iconv/libiconv/Makefile
          utf8/Makefile
+         utf8/libcharset/Makefile
          t/Makefile
          t/src/Makefile
          t/input/Makefile
+         t/output/Makefile
          data/Makefile
          data/new.ged
          doc/Makefile
          doc/images/Makefile
+         doc/index.html
          include/Makefile
          include/gedcom.h
           intl/Makefile