X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=configure.in;h=6a04e25df3115d90f0ef1f7f0f03133a614536f0;hb=refs%2Fheads%2Flibiconv-gedcom-1.14;hp=072dd8967f4467a8ddd30ed9577d077fd9c49c2f;hpb=f110a9eb416fe4d8824be87b46cf4c50ba927088;p=gedcom-parse.git diff --git a/configure.in b/configure.in index 072dd89..6a04e25 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.90.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:9 AC_SUBST(LIBVERSION) SHELL=/bin/sh @@ -25,7 +27,7 @@ AC_SUBST(SHELL) dnl ============================================================= AM_INIT_AUTOMAKE(${NAME},${VERSION}) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS(config.h) AC_CONFIG_SUBDIRS(utf8) ALL_LINGUAS="nl" @@ -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 @@ -157,8 +155,13 @@ AC_OUTPUT(GNUmakefile doc/Makefile doc/images/Makefile doc/index.html + doc/doxygen/Makefile + doc/doxygen/doxygen.conf + doc/html/Makefile + doc/html/images/Makefile include/Makefile include/gedcom.h intl/Makefile po/Makefile.in - m4/Makefile) + m4/Makefile + bin/Makefile)