X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=configure.in;h=b942a935cd719bc265148ecafa79e29a5afae608;hb=0ed444394c30a2e3983fb551e7f788804116a8b4;hp=5d077544fea54e211f41326d0eb77de12e39c0d2;hpb=9ad95f680bf91a02be9b053a404b1f66dc2dc8ce;p=gedcom-parse.git diff --git a/configure.in b/configure.in index 5d07754..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 @@ -98,6 +100,19 @@ 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) @@ -144,4 +159,5 @@ AC_OUTPUT(GNUmakefile include/gedcom.h intl/Makefile po/Makefile.in - m4/Makefile) + m4/Makefile + bin/Makefile)