libraries/mrw-cxx
1
0
Fork 0
Code Issues Releases Activity

fixed version number

Browse Source
This commit is contained in:
Marc Wäckerlin
2015-07-31 10:45:37 +00:00
parent f312f03e47
commit 06ab4e21c3
4 changed files with 46 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ax_init_standard_project.m4
View File

@@ -22,21 +22,19 @@ m4_define(x_least, mrw_esyscmd_s([
# define version number from subversion's revision number:
# it is taken modulo 256 due to a bug on Apple's MacOSX
# add to x_minor if revision number is > 256
m4_define(x_minor_fixed, mrw_esyscmd_s([
m4_define(x_minor_diff, mrw_esyscmd_s([
SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout"
for path in . .. ../..; do
if svn info $path 2>&1 > /dev/null; then
SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
break;
fi
fi;
done
# Mac does not support LEAST > 255
echo $ECHO_N $((x_minor+$SVN_REVISION/256))
echo $ECHO_N $(($SVN_REVISION/256))
]))
# setup version number
m4_define(x_version, mrw_esyscmd_s([
echo $ECHO_N x_major.x_minor_fixed.x_least
]))
m4_define(x_version, [x_major.m4_eval(x_minor+x_minor_diff).x_least])
## bugreport mail address is taken from <user@host> in first line of AUTHORS
m4_define(x_bugreport, mrw_esyscmd_s([
@@ -85,7 +83,7 @@ AC_DEFUN([AX_ADD_MAKEFILE_TARGET_DEP], [
# $1 = variable name
AC_DEFUN([AX_SUBST], [
AC_SUBST([$1])
tmp_var=$(echo "${$1}" | awk 1 ORS='\\n')
tmp_var=$(echo "${$1}" | awk 1 ORS='\\n' | sed 's,\\n$,,')
tmp_var=${tmp_var//\"/\\\"}
tmp_var=${tmp_var//\'/\'\"\'\"\'}
tmp_var=${tmp_var//#/\\#}
@@ -264,9 +262,9 @@ EOF
# use this in configure.ac to support C++ libraries
AC_DEFUN([AX_USE_LIBTOOL], [
# libtool versioning
LIB_MAJOR=m4_eval(x_major+x_minor_fixed)
LIB_MAJOR=m4_eval(x_major+x_minor+x_minor_diff)
LIB_MINOR=x_least
LIB_LEAST=x_minor_fixed
LIB_LEAST=m4_eval(x_minor+x_minor_diff)
LIB_VERSION="${LIB_MAJOR}:${LIB_MINOR}:${LIB_LEAST}"
AM_LDFLAGS="-version-info ${LIB_VERSION}"
AC_SUBST(AM_LDFLAGS)