X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=configure.in;h=5d077544fea54e211f41326d0eb77de12e39c0d2;hb=9ad95f680bf91a02be9b053a404b1f66dc2dc8ce;hp=be4c412f68e2b88d3bd919a18f7473cf52790e0c;hpb=0f9a7049ffbf4c18322dc695d77b19feadca5ba6;p=gedcom-parse.git

diff --git a/configure.in b/configure.in
index be4c412..5d07754 100644
--- a/configure.in
+++ b/configure.in
@@ -26,10 +26,28 @@ AC_SUBST(SHELL)
 dnl =============================================================
 AM_INIT_AUTOMAKE(${NAME},${VERSION})
 AM_CONFIG_HEADER(config.h)
+AC_CONFIG_SUBDIRS(utf8)
 ALL_LINGUAS="nl"
 
 AC_CANONICAL_HOST
 
+EXTRA_CFLAGS=""
+case "$host_os" in
+ darwin*) AC_MSG_WARN([Disabling smart preprocessing])
+          EXTRA_CFLAGS="-no-cpp-precomp $EXTRA_CFLAGS";;
+esac
+
+AC_ARG_ENABLE(debug,
+[  --enable-debug          Compilation flags to allow debugging [default=yes]],
+  if test $enableval == "yes"
+  then
+    EXTRA_CFLAGS="-g $EXTRA_CFLAGS"
+  fi,
+  EXTRA_CFLAGS="-g $EXTRA_CFLAGS"
+)
+
+AC_SUBST(EXTRA_CFLAGS)
+
 dnl =============================================================
 dnl Checks for programs.
 AC_PROG_CC
@@ -50,39 +68,32 @@ 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.
 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
 
+gedcom_SYS_NEWLINE
 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
@@ -93,14 +104,8 @@ if test "$am_cv_lib_iconv" = yes; then
   gedcom_LIBICONV_HAS_ANSEL
 else
   AC_MSG_RESULT(libc)
-  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_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)
@@ -119,14 +124,13 @@ fi
 
 AC_OUTPUT(GNUmakefile
           Makefile
+	  gedcom-config
 	  gedcom/Makefile
 	  gedcom/calendar/Makefile
 	  gom/Makefile
 	  iconv/Makefile
 	  iconv/glibc/Makefile
 	  iconv/libiconv/Makefile
-	  utf8/Makefile
-	  utf8/libcharset/Makefile
 	  t/Makefile
 	  t/src/Makefile
 	  t/input/Makefile
@@ -139,4 +143,5 @@ AC_OUTPUT(GNUmakefile
 	  include/Makefile
 	  include/gedcom.h
           intl/Makefile
-          po/Makefile.in)
+          po/Makefile.in
+	  m4/Makefile)