X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=configure.in;h=e09564e8c9cf184e7c9eecdef164cec9932cc24c;hb=e3dd6ccaa1b35bd47b80b45077e9e0795d964bb5;hp=664733bf1765916e12a9fb09dc2cc619f3865a2a;hpb=6a6698c7c366a694a90d62d0fe7bbd4b4461409e;p=gedcom-parse.git

diff --git a/configure.in b/configure.in
index 664733b..e09564e 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,7 +57,7 @@ fi
 
 dnl =============================================================
 dnl Checks for libraries.
-AM_GNU_GETTEXT
+AM_GNU_GETTEXT([use-libtool],[need-ngettext])
 AM_WITH_DMALLOC
 
 dnl == Make statically linked test program for dmalloc tests
@@ -64,6 +71,7 @@ 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 +84,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
@@ -90,11 +98,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)
@@ -104,16 +118,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(GNUmakefile
-	  Makefile
-	  README
+          Makefile
 	  gedcom/Makefile
 	  gedcom/calendar/Makefile
 	  gom/Makefile
@@ -125,6 +138,7 @@ AC_OUTPUT(GNUmakefile
 	  t/Makefile
 	  t/src/Makefile
 	  t/input/Makefile
+	  t/output/Makefile
 	  data/Makefile
 	  data/new.ged
 	  doc/Makefile