X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=configure.in;h=14ea192bd28ff4bf22e2fca465ab160260f20448;hb=7fcd7b287ee96e66bc3e7f4032e037fce23d873e;hp=664733bf1765916e12a9fb09dc2cc619f3865a2a;hpb=6a6698c7c366a694a90d62d0fe7bbd4b4461409e;p=gedcom-parse.git

diff --git a/configure.in b/configure.in
index 664733b..14ea192 100644
--- 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,10 +90,16 @@ 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
+  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_GLIBC_ICONV
   if test "$is_glibc_iconv" = yes; then
     DIRS="glibc"
     is_ansel_supported=yes
@@ -104,16 +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
-	  Makefile
-	  README
+          Makefile
 	  gedcom/Makefile
 	  gedcom/calendar/Makefile
 	  gom/Makefile