X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=configure.in;h=b942a935cd719bc265148ecafa79e29a5afae608;hb=0ed444394c30a2e3983fb551e7f788804116a8b4;hp=072dd8967f4467a8ddd30ed9577d077fd9c49c2f;hpb=f110a9eb416fe4d8824be87b46cf4c50ba927088;p=gedcom-parse.git diff --git a/configure.in b/configure.in index 072dd89..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 @@ -108,6 +110,7 @@ if test "${with_libiconv_prefix+set}" = set; then 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) @@ -134,11 +137,6 @@ 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 @@ -161,4 +159,5 @@ AC_OUTPUT(GNUmakefile include/gedcom.h intl/Makefile po/Makefile.in - m4/Makefile) + m4/Makefile + bin/Makefile)