Removed support for testing with dmalloc (valgrind is better...).

[gedcom-parse.git] / configure.in

diff --git a/configure.in b/configure.in
index ef83cc941d67fc0c6b647f2491e05fd77df46921..fbb85eca367a1ea203a88a156acf8471baa3ff7c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -28,6 +28,15 @@ AM_INIT_AUTOMAKE(${NAME},${VERSION})
 AM_CONFIG_HEADER(config.h)
 ALL_LINGUAS="nl"
 
+AC_CANONICAL_HOST
+
+EXTRA_CFLAGS=
+case "$host_os" in
+ darwin*) AC_MSG_WARN([Disabling smart preprocessing])
+          EXTRA_CFLAGS="-no-cpp-precomp";;
+esac
+AC_SUBST(EXTRA_CFLAGS)
+
 dnl =============================================================
 dnl Checks for programs.
 AC_PROG_CC
@@ -48,36 +57,33 @@ fi
 
 dnl =============================================================
 dnl Checks for libraries.
-AM_GNU_GETTEXT
-AM_WITH_DMALLOC
-
-dnl == Make statically linked test program for dmalloc tests
-if test "$with_dmalloc" = "yes"; then
-  EXTRA_PROGS=gomtest_static
-fi
-AC_SUBST(EXTRA_PROGS)
+AM_GNU_GETTEXT([use-libtool],[need-ngettext])
 
 dnl =============================================================
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_C_INLINE
 AC_TYPE_SIZE_T
+AC_CHECK_SIZEOF(void *, 4)
 
 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
 
 AM_ICONV
-
-if test "$am_cv_func_iconv" != yes; then
+gedcom_SANE_ICONV
+if test "$am_cv_func_iconv" != yes -o "$is_iconv_sane" != 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)
+You need 'iconv' (with features comparable to what is in glibc 2.2) 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
@@ -85,11 +91,17 @@ 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
+  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)
@@ -99,14 +111,15 @@ 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
@@ -114,14 +127,18 @@ AC_OUTPUT(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
-          po/Makefile.in)
+          po/Makefile.in
+         m4/Makefile)