From 98ee17127b3057d825473d5e6f3f71d62ffcbf41 Mon Sep 17 00:00:00 2001
From: chrfranke <chrfranke@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Fri, 22 Jan 2010 19:24:59 +0000
Subject: [PATCH] autogen.sh: Fix version regexp, allow automake 1.11.1.
git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@3043 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
smartmontools/CHANGELOG | 2 ++
smartmontools/autogen.sh | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/smartmontools/CHANGELOG b/smartmontools/CHANGELOG
index e0fcb7f31..0cfa8e35b 100644
--- a/smartmontools/CHANGELOG
+++ b/smartmontools/CHANGELOG
@@ -43,6 +43,8 @@ NOTES FOR FUTURE RELEASES: see TODO file.
<DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE>
+ [CF] autogen.sh: Fix version regexp, allow automake 1.11.1.
+
[CF] Linux: Allow smartd 'DEVICESCAN -d sat' (ticket #13).
Detects (S)ATA devices behind a standard SAT layer
(Vendor ID: "ATA "), but not USB bridges with SAT support.
diff --git a/smartmontools/autogen.sh b/smartmontools/autogen.sh
index 5e171e792..9ab37837a 100755
--- a/smartmontools/autogen.sh
+++ b/smartmontools/autogen.sh
@@ -64,7 +64,7 @@ case "$AUTOMAKE" in
*automake-1.8)
ver=1.8 ;;
*)
- ver="`$AUTOMAKE --version | sed -n '1s,^.*\([12]\.[.0-9]*[-pl0-9]*\).*$,\1,p'`"
+ ver="`$AUTOMAKE --version | sed -n '1s,^.*[^.0-9]\([12]\.[0-9][-.0-9pl]*\).*$,\1,p'`"
ver="${ver:-?.?.?}"
esac
@@ -83,7 +83,7 @@ case "$ver" in
rm -f casetest.tmp
;;
- 1.9.[1-6]|1.10|1.10.[12]|1.11)
+ 1.9.[1-6]|1.10|1.10.[12]|1.11|1.11.1)
# OK
;;
--
GitLab