From: Niels Möller <nisse@lysator.liu.se>
Date: Wed, 25 Mar 2015 22:27:00 +0000 (+0100)
Subject: Tweak sed expressions for substitutions in version.h.
X-Git-Tag: nettle_3.1rc1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b9eb472fb7a8744bc14bb682ce181db2b578c40;p=thirdparty%2Fnettle.git

Tweak sed expressions for substitutions in version.h.
---

diff --git a/ChangeLog b/ChangeLog
index 30947895..33ee0184 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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])