Checks for portability and for use of libiconv if iconv is not in libc.

diff --git a/configure.in b/configure.in
index 76aec9d3ac1f47de9497d033d3cc11445c7a0ab5..f680443721c3fc78f1e195904d9459f10ec6c9d4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -28,9 +28,16 @@ AM_INIT_AUTOMAKE(${NAME},${VERSION})
 AM_CONFIG_HEADER(config.h)
 ALL_LINGUAS="nl"
 
+dnl =============================================================
+dnl Checks for programs.
 AC_PROG_CC
 AM_PROG_LIBTOOL
+AC_PROG_AWK
 AM_PROG_LEX
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_PROG_RANLIB
 AC_PROG_YACC
 if test "$YACC" = "bison -y"; then
   AC_MSG_WARN([We'll remove the -y option here])
@@ -39,6 +46,9 @@ else
   AC_MSG_ERROR([Sorry, bison is needed])
 fi
 
+dnl =============================================================
+dnl Checks for libraries.
+AM_GNU_GETTEXT
 AM_WITH_DMALLOC
 
 dnl == Make statically linked test program for dmalloc tests
@@ -47,7 +57,54 @@ if test "$with_dmalloc" = "yes"; then
 fi
 AC_SUBST(EXTRA_PROGS)
 
-AM_GNU_GETTEXT
+dnl =============================================================
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_C_INLINE
+AC_TYPE_SIZE_T
+
+dnl ==========================================================
+dnl Checks for library functions.
+AC_CHECK_FUNCS(vsnprintf vsprintf)
+
+dnl ==========================================================
+dnl My local stuff
+
+AM_ICONV
+
+if test "$am_cv_func_iconv" != yes; then
+  AC_MSG_ERROR([
+*******************************************************************************
+You need 'iconv' to use this library, consider installing GNU libiconv or
+use --with-libiconv-prefix to point to an existing installation of that
+library (see README)
+*******************************************************************************
+  ])
+fi
+
+AC_MSG_CHECKING(for location of iconv)
+if test "$am_cv_lib_iconv" = yes; then
+  AC_MSG_RESULT(libiconv)
+  AC_LIBICONV_HAS_ANSEL
+else
+  AC_MSG_RESULT(libc)
+  AC_GLIBC_ICONV
+  if test "$is_glibc_iconv" = yes; then
+    DIRS="ansel"
+    is_ansel_supported=yes
+    AC_SUBST(DIRS)
+  fi
+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).
+*******************************************************************************
+  ])
+fi
 
 AC_OUTPUT(Makefile
          gedcom/Makefile