Tweak sed expressions for substitutions in version.h.

5b9eb472 · Niels Möller · f51bd649 · 5b9eb472 · 5b9eb472
Commit 5b9eb472 authored Mar 25, 2015 by Niels Möller
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

ChangeLog ChangeLog +3 -0

configure.ac configure.ac +3 -2

No files found.
--- a/ChangeLog
+++ b/ChangeLog
 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.


--- 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])