X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=configure.in;h=072dd8967f4467a8ddd30ed9577d077fd9c49c2f;hb=f110a9eb416fe4d8824be87b46cf4c50ba927088;hp=e09564e8c9cf184e7c9eecdef164cec9932cc24c;hpb=d9602547f8937fd71e5caa6039e2053e17c9f865;p=gedcom-parse.git

diff --git a/configure.in b/configure.in
index e09564e..072dd89 100644
--- a/configure.in
+++ b/configure.in
@@ -26,15 +26,26 @@ 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=
+EXTRA_CFLAGS=""
 case "$host_os" in
  darwin*) AC_MSG_WARN([Disabling smart preprocessing])
-          EXTRA_CFLAGS="-no-cpp-precomp";;
+          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 =============================================================
@@ -58,13 +69,6 @@ fi
 dnl =============================================================
 dnl Checks for libraries.
 AM_GNU_GETTEXT([use-libtool],[need-ngettext])
-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)
 
 dnl =============================================================
 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -77,12 +81,11 @@ 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
 gedcom_SANE_ICONV
 if test "$am_cv_func_iconv" != yes -o "$is_iconv_sane" != yes; then
@@ -95,18 +98,24 @@ point to an existing installation of that library (see README)
   ])
 fi
 
+if test "${with_libiconv_prefix+set}" = set; then
+  withval="$with_libiconv_prefix"
+  
+    for dir in `echo "$withval" | tr : ' '`; do
+      if test -d $dir/lib; then ICONV_LIBPATH="$ICONV_LIBPATH -L$dir/lib"; fi
+    done
+
+  ICONV_PATH=`echo "$withval" | tr : '/bin:'`
+  ICONV_PATH="$ICONV_PATH/bin"
+fi
+AC_SUBST(ICONV_PATH)
+
 AC_MSG_CHECKING(for location of iconv)
 if test "$am_cv_lib_iconv" = yes; then
   AC_MSG_RESULT(libiconv)
   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_GLIBC22_ICONV
   if test "$is_glibc22_iconv" = yes; then
     DIRS="glibc"
@@ -125,16 +134,20 @@ library (see README).
   ])
 fi
 
+case "$host_os" in
+ darwin*) # Hack to get correct locale_charset() function
+          LDFLAGS="$ICONV_LIBPATH -liconv $LDFLAGS";;
+esac
+
 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
@@ -147,4 +160,5 @@ AC_OUTPUT(GNUmakefile
 	  include/Makefile
 	  include/gedcom.h
           intl/Makefile
-          po/Makefile.in)
+          po/Makefile.in
+	  m4/Makefile)