diff -r 1748c5d94fe2 -r 9f4b672bd85c configure.ac --- a/configure.ac Wed Apr 25 11:46:40 2018 +0100 +++ b/configure.ac Tue Jun 05 17:21:56 2018 +0100 @@ -34,24 +34,14 @@ ]) AM_INIT_AUTOMAKE(no-define parallel-tests) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) -case $VERSION in - *.*.*) - AC_SUBST(PLOVER_MAJOR_VERSION,[[`echo $VERSION | sed 's/\..*//'`]]) - AC_SUBST(PLOVER_MINOR_VERSION, - [[`echo $VERSION | sed 's/[^.]*\.\([^.]*\)\..*/\1/'`]]) - AC_SUBST(PLOVER_MICRO_VERSION,[[`echo $VERSION | sed 's/.*\.\([^.]*\)/\1/'`]]) ;; - *.*) - AC_SUBST(PLOVER_MAJOR_VERSION,[[`echo $VERSION | sed 's/\..*//'`]]) - AC_SUBST(PLOVER_MINOR_VERSION, - [[`echo $VERSION | sed 's/[^.]*\.\([^.]*\)/\1/'`]]) - AC_SUBST(PLOVER_MICRO_VERSION,0) - ;; - *) - AC_SUBST(PLOVER_MAJOR_VERSION,0) - AC_SUBST(PLOVER_MINOR_VERSION,0) - AC_SUBST(PLOVER_MICRO_VERSION,0) - ;; -esac +AC_SUBST(PLOVER_MAJOR_VERSION,[[`echo $VERSION | \ + sed -e 's/^[^.]*$/0/' -e 's/\..*//'`]]) +AC_SUBST(PLOVER_MINOR_VERSION,[[`echo $VERSION | \ + sed -e 's/.*/&.0.0/' -e 's/[^.]*\.\([^.]*\)\..*/\1/'`]]) +AC_SUBST(PLOVER_MICRO_VERSION,[[`echo $VERSION | \ + sed -e 's/.*/&.0.0.0/' -e 's/\([^.]*\.\)\{2\}\([^.]*\)\..*/\2/'`]]) +AC_SUBST(PLOVER_PATCH_LEVEL,[[`echo $VERSION | \ + sed -e 's/.*/&.0.0.0.0/' -e 's/\([^.]*\.\)\{3\}\([^.]*\)\..*/\2/'`]]) AC_CANONICAL_HOST AC_SUBST(HOST_OS,$host_os) AC_SUBST(HOST_CPU,$host_cpu)