From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 1 Nov 2012 15:26:24 +0000 (+0000)
Subject: Fix for autoconf 2.69
X-Git-Tag: release_3_0_0_beta1~1617
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9abeb4fbeaafa2f83dbc396eb9cd9f363d68ac9;p=thirdparty%2Ffreeradius-server.git

Fix for autoconf 2.69
---

diff --git a/configure b/configure
index 22b501893a2..7a6d34f88dd 100755
--- a/configure
+++ b/configure
@@ -2475,8 +2475,8 @@ ac_config_headers="$ac_config_headers src/include/autoconf.h"
 
 
 RADIUSD_MAJOR_VERSION=`cat VERSION | sed 's/\..*//'`
-RADIUSD_MINOR_VERSION=`cat VERSION | sed 's/^^\.*\.//' | sed 's/\..*$//'`
-RADIUSD_INCRM_VERSION=`cat VERSION | sed 's/^.*\..*\.//' | sed 's/-.*$//'`
+RADIUSD_MINOR_VERSION=`cat VERSION | sed 's/^[^\.]*\.//' | sed 's/\..*$//'`
+RADIUSD_INCRM_VERSION=`cat VERSION | sed 's/^.*\..*\.//' | sed 's/[\.-].*$//'`
 
 RADIUSD_VERSION=`echo | awk -v major="$RADIUSD_MAJOR_VERSION" \
 -v minor="$RADIUSD_MINOR_VERSION" \
diff --git a/configure.in b/configure.in
index 1148693e1be..9b68a3c2096 100644
--- a/configure.in
+++ b/configure.in
@@ -32,8 +32,8 @@ AC_CONFIG_HEADER(src/include/autoconf.h)
 dnl # The version of the software
 
 RADIUSD_MAJOR_VERSION=`cat VERSION | sed 's/\..*//'`
-RADIUSD_MINOR_VERSION=`cat VERSION | sed 's/^[^\.]*\.//' | sed 's/\..*$//'`
-RADIUSD_INCRM_VERSION=`cat VERSION | sed 's/^.*\..*\.//' | sed 's/-.*$//'`
+RADIUSD_MINOR_VERSION=`cat VERSION | sed 's/^[[^\.]]*\.//' | sed 's/\..*$//'`
+RADIUSD_INCRM_VERSION=`cat VERSION | sed 's/^.*\..*\.//' | sed 's/[[\.-]].*$//'`
 
 RADIUSD_VERSION=`echo | awk -v major="$RADIUSD_MAJOR_VERSION" \
 -v minor="$RADIUSD_MINOR_VERSION" \