diff options
| author | Niels Möller <nisse@lysator.liu.se> | 2015-03-25 23:27:00 +0100 |
|---|---|---|
| committer | Niels Möller <nisse@lysator.liu.se> | 2015-03-25 23:27:00 +0100 |
| commit | 5b9eb472fb7a8744bc14bb682ce181db2b578c40 (patch) | |
| tree | ee68b1398ded068b2b0e7ba90347d5cc2750ddf6 | |
| parent | f51bd6497d4b056cc5593102eefae661146999b8 (diff) | |
| download | nettle-5b9eb472fb7a8744bc14bb682ce181db2b578c40.tar.gz | |
Tweak sed expressions for substitutions in version.h.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 6 insertions, 2 deletions
@@ -1,5 +1,8 @@ 2015-03-25 Niels Möller <nisse@diamant.hack.org> + * configure.ac (MAJOR_VERSION, MINOR_VERSION): Tweak sed + expressions, to tolerate version suffixes. + * Makefile.in (distdir): Include assembly files from the new x86_64/aesni, x86_64/fat, and arm/fat directories. diff --git a/configure.ac b/configure.ac index 56f69097..2b4c03c5 100644 --- a/configure.ac +++ b/configure.ac @@ -16,8 +16,9 @@ LIBNETTLE_MINOR=0 LIBHOGWEED_MAJOR=4 LIBHOGWEED_MINOR=0 -MAJOR_VERSION=`echo $PACKAGE_VERSION | sed 's/\(.*\)\..*/\1/g'` -MINOR_VERSION=`echo $PACKAGE_VERSION | sed 's/.*\.\(.*\)/\1/g'` +dnl Note double square brackets, for extra m4 quoting. +MAJOR_VERSION=`echo $PACKAGE_VERSION | sed 's/^\([[^.]]*\)\..*/\1/'` +MINOR_VERSION=`echo $PACKAGE_VERSION | sed 's/^[[^.]]*\.\([[0-9]]*\).*/\1/'` AC_SUBST([MAJOR_VERSION]) AC_SUBST([MINOR_VERSION]) |