dlugolecki.net.pl
Dziennik
Polecane
Software
projects
/
gedcom-parse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Give warning if mismatch on character set (and force value).
[gedcom-parse.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index 072dd8967f4467a8ddd30ed9577d077fd9c49c2f..d59e896253ea34fe06994fef284a4a101c39d360 100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-8,16
+8,18
@@
dnl Global variables
NAME=gedcom-parse
AC_SUBST(NAME)
NAME=gedcom-parse
AC_SUBST(NAME)
-VERSION=0.
17
+VERSION=0.
20.0
VERSION_MAJOR=`echo $VERSION | sed 's/\..*$//'`
changequote(<<,>>)
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)
changequote([,])
AC_SUBST(VERSION_MAJOR)
AC_SUBST(VERSION_MINOR)
+AC_SUBST(VERSION_PATCH)
AC_SUBST(VERSION)
AC_SUBST(VERSION)
-LIBVERSION=0:
7
+LIBVERSION=0:
8
AC_SUBST(LIBVERSION)
SHELL=/bin/sh
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
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)
AC_SUBST(ICONV_PATH)
AC_MSG_CHECKING(for location of iconv)
@@
-134,11
+137,6
@@
library (see README).
])
fi
])
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
AC_OUTPUT(GNUmakefile
Makefile
gedcom-config