X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=configure.in;h=54c2329d84aedcae98e04865be8ff2fad055fae7;hb=64aae11be78e118de49ebc4ab982023b12a04fe2;hp=f680443721c3fc78f1e195904d9459f10ec6c9d4;hpb=3fd736471db6995d9cff3f8579f17a7dafdf994e;p=gedcom-parse.git

diff --git a/configure.in b/configure.in
index f680443..54c2329 100644
--- a/configure.in
+++ b/configure.in
@@ -28,6 +28,8 @@ AM_INIT_AUTOMAKE(${NAME},${VERSION})
 AM_CONFIG_HEADER(config.h)
 ALL_LINGUAS="nl"
 
+AC_CANONICAL_HOST
+
 dnl =============================================================
 dnl Checks for programs.
 AC_PROG_CC
@@ -48,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
@@ -65,7 +67,10 @@ AC_TYPE_SIZE_T
 
 dnl ==========================================================
 dnl Checks for library functions.
-AC_CHECK_FUNCS(vsnprintf vsprintf)
+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
@@ -85,12 +90,18 @@ 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
-    DIRS="ansel"
+  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)
   fi
@@ -99,26 +110,32 @@ 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(Makefile
+AC_OUTPUT(GNUmakefile
+          Makefile
 	  gedcom/Makefile
 	  gedcom/calendar/Makefile
 	  gom/Makefile
-	  ansel/Makefile
+	  iconv/Makefile
+	  iconv/glibc/Makefile
+	  iconv/libiconv/Makefile
 	  utf8/Makefile
+	  utf8/libcharset/Makefile
 	  t/Makefile
 	  t/src/Makefile
 	  t/input/Makefile
+	  t/output/Makefile
 	  data/Makefile
 	  data/new.ged
 	  doc/Makefile
 	  doc/images/Makefile
+	  doc/index.html
 	  include/Makefile
 	  include/gedcom.h
           intl/Makefile