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 b9faf077338f080c6edd6de1222acc66d5fa2d0d..54c2329d84aedcae98e04865be8ff2fad055fae7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -50,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
@@ -90,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)
@@ -104,15 +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(GNUmakefile
-         README
+          Makefile
          gedcom/Makefile
          gedcom/calendar/Makefile
          gom/Makefile
@@ -124,6 +130,7 @@ AC_OUTPUT(GNUmakefile
          t/Makefile
          t/src/Makefile
          t/input/Makefile
+         t/output/Makefile
          data/Makefile
          data/new.ged
          doc/Makefile