X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=configure.in;h=be4c412f68e2b88d3bd919a18f7473cf52790e0c;hb=64d436abd5d160aa9e0691a79cef1f4c7b1988d5;hp=468a67ffa31c44ca2e4943d413fd31731e14785f;hpb=7c67262c69b8178ef81270c88113d452729eb73e;p=gedcom-parse.git diff --git a/configure.in b/configure.in index 468a67f..be4c412 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 @@ -104,9 +110,9 @@ 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 @@ -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