X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=configure.in;h=5d077544fea54e211f41326d0eb77de12e39c0d2;hb=94f6ef24d90516725581e38673bb871f8d19c289;hp=fa93c2cb9564138ad95183aeaa0f487ed995f761;hpb=7bac33ce1bed45ef6b59d9353b91c0eaa6b0dc0d;p=gedcom-parse.git

diff --git a/configure.in b/configure.in
index fa93c2c..5d07754 100644
--- a/configure.in
+++ b/configure.in
@@ -26,6 +26,7 @@ AC_SUBST(SHELL)
 dnl =============================================================
 AM_INIT_AUTOMAKE(${NAME},${VERSION})
 AM_CONFIG_HEADER(config.h)
+AC_CONFIG_SUBDIRS(utf8)
 ALL_LINGUAS="nl"
 
 AC_CANONICAL_HOST
@@ -80,8 +81,6 @@ dnl ==========================================================
 dnl Checks for library functions.
 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
@@ -105,12 +104,6 @@ if test "$am_cv_lib_iconv" = yes; then
   gedcom_LIBICONV_HAS_ANSEL
 else
   AC_MSG_RESULT(libc)
-  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"
@@ -131,14 +124,13 @@ fi
 
 AC_OUTPUT(GNUmakefile
           Makefile
+	  gedcom-config
 	  gedcom/Makefile
 	  gedcom/calendar/Makefile
 	  gom/Makefile
 	  iconv/Makefile
 	  iconv/glibc/Makefile
 	  iconv/libiconv/Makefile
-	  utf8/Makefile
-	  utf8/libcharset/Makefile
 	  t/Makefile
 	  t/src/Makefile
 	  t/input/Makefile