X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=configure.in;h=b942a935cd719bc265148ecafa79e29a5afae608;hb=327069289a45ed1e91d8bfc07d7d89cfbad057d6;hp=7e267e57f8a4bbeb32b3e59b77d4d952c9458567;hpb=13206019511132a89823d875c9cbf4c9c8ed8c0d;p=gedcom-parse.git

diff --git a/configure.in b/configure.in
index 7e267e5..b942a93 100644
--- a/configure.in
+++ b/configure.in
@@ -8,16 +8,18 @@ dnl Global variables
 NAME=gedcom-parse
 AC_SUBST(NAME)
 
-VERSION=0.17
+VERSION=0.20.0
 VERSION_MAJOR=`echo $VERSION | sed 's/\..*$//'`
 changequote(<<,>>)
-VERSION_MINOR=`echo $VERSION | sed 's/^[^\.]*\.//'`
+VERSION_MINOR=`echo $VERSION | sed 's/^[^\.]*\.//' | sed 's/\..*$//'`
+VERSION_PATCH=`echo $VERSION | sed 's/^[^\.]*\.[^\.]*\.//'`
 changequote([,])
 AC_SUBST(VERSION_MAJOR)
 AC_SUBST(VERSION_MINOR)
+AC_SUBST(VERSION_PATCH)
 AC_SUBST(VERSION)
 
-LIBVERSION=0:7
+LIBVERSION=0:8
 AC_SUBST(LIBVERSION)
 
 SHELL=/bin/sh
@@ -26,14 +28,15 @@ 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,
@@ -80,8 +83,6 @@ 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
@@ -99,18 +100,25 @@ 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_LIBPATH)
+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"
@@ -131,14 +139,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
@@ -152,4 +159,5 @@ AC_OUTPUT(GNUmakefile
 	  include/gedcom.h
           intl/Makefile
           po/Makefile.in
-	  m4/Makefile)
+	  m4/Makefile
+	  bin/Makefile)