X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=configure.in;h=fbb85eca367a1ea203a88a156acf8471baa3ff7c;hb=a5bd4c3c89f5cb433a615c436947b8b0f44c3661;hp=cf0506748b1e802468cc88fdb111cb49eddf6c36;hpb=d3813a0a638c7811aada3170d4b77bf590cee24d;p=gedcom-parse.git

diff --git a/configure.in b/configure.in
index cf05067..fbb85ec 100644
--- a/configure.in
+++ b/configure.in
@@ -30,6 +30,13 @@ 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
@@ -50,20 +57,14 @@ fi
 
 dnl =============================================================
 dnl Checks for libraries.
-AM_GNU_GETTEXT([use-libtool])
-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.
@@ -76,13 +77,13 @@ 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
@@ -99,8 +100,8 @@ else
   AC_SUBST(LCS_SUBDIRS)
   AC_SUBST(LCS_INCLUDES)
   AC_SUBST(LCS_LIBADD)
-  gedcom_GLIBC_ICONV
-  if test "$is_glibc_iconv" = yes; then
+  gedcom_GLIBC22_ICONV
+  if test "$is_glibc22_iconv" = yes; then
     DIRS="glibc"
     is_ansel_supported=yes
     AC_SUBST(DIRS)
@@ -110,9 +111,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
@@ -130,6 +131,7 @@ AC_OUTPUT(GNUmakefile
 	  t/Makefile
 	  t/src/Makefile
 	  t/input/Makefile
+	  t/output/Makefile
 	  data/Makefile
 	  data/new.ged
 	  doc/Makefile
@@ -138,4 +140,5 @@ AC_OUTPUT(GNUmakefile
 	  include/Makefile
 	  include/gedcom.h
           intl/Makefile
-          po/Makefile.in)
+          po/Makefile.in
+	  m4/Makefile)