diff options
Diffstat (limited to 'Build/source')
| -rw-r--r-- | Build/source/m4/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/m4/kpse-lib-version.m4 | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog index df104694457..474e8d465b5 100644 --- a/Build/source/m4/ChangeLog +++ b/Build/source/m4/ChangeLog @@ -1,3 +1,8 @@ +2015-09-044 Peter Breitenlohner <peb@mppmu.mpg.de> + + * kpse-lib-version.m4 (KPSE_LIB_VERSION): Allow more general + version number suffix strings, e.g., "-beta1". + 2015-08-14 Peter Breitenlohner <peb@mppmu.mpg.de> * kpse-pkgs.m4 (kpse_texk_pkgs): Add gregorio. diff --git a/Build/source/m4/kpse-lib-version.m4 b/Build/source/m4/kpse-lib-version.m4 index b6fa4ce9908..12fab2cb610 100644 --- a/Build/source/m4/kpse-lib-version.m4 +++ b/Build/source/m4/kpse-lib-version.m4 @@ -1,5 +1,5 @@ # Private macros for the TeX Live (TL) tree. -# Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org> +# Copyright (C) 2011-2015 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder # gives unlimited permission to copy and/or distribute it, @@ -8,15 +8,15 @@ # KPSE_LIB_VERSION(NAME) # ---------------------- # Split NAME_version into NAME_major, NAME_minor, and NAME_micro -# (ignoring lowercase letters forming an optional suffix). +# (ignoring an optional suffix starting with a non-digit). AC_DEFUN([KPSE_LIB_VERSION], -[m4_bpatsubst($1_version, [^\([0-9]+\).\([0-9]+\).\([0-9]+\)[a-z]*$], +[m4_bpatsubst($1_version, [^\([0-9]+\).\([0-9]+\).\([0-9]+\).*$], [m4_define([$1_major], [\1])m4_define([$1_minor], [\2])m4_define([$1_micro], [\3])])[]dnl ]) # KPSE_LIB_VERSION # KPSE_LT_VERSION(NAME) # --------------------- -# Split NAME_version as above and define _LT_VERSINFO. +# Split NAME_version as above and define NAME_LT_VERSINFO. AC_DEFUN([KPSE_LT_VERSION], [KPSE_LIB_VERSION([$1]) AC_SUBST(AS_TR_CPP($1)[_LT_VERSINFO], |