From d3813a0a638c7811aada3170d4b77bf590cee24d Mon Sep 17 00:00:00 2001
From: Peter Verthez <Peter.Verthez@advalvas.be>
Date: Mon, 21 Oct 2002 18:47:52 +0000
Subject: [PATCH] Don't use subdir libcharset if libiconv is used. Rename own
 m4 macros to gedcom_...

---
 configure.in | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 468a67f..cf05067 100644
--- a/configure.in
+++ b/configure.in
@@ -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
-- 
2.30.2