Commit 98ee1712 authored by chrfranke's avatar chrfranke
Browse files

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
parent 3b635d89
...@@ -43,6 +43,8 @@ NOTES FOR FUTURE RELEASES: see TODO file. ...@@ -43,6 +43,8 @@ NOTES FOR FUTURE RELEASES: see TODO file.
<DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE> <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). [CF] Linux: Allow smartd 'DEVICESCAN -d sat' (ticket #13).
Detects (S)ATA devices behind a standard SAT layer Detects (S)ATA devices behind a standard SAT layer
(Vendor ID: "ATA "), but not USB bridges with SAT support. (Vendor ID: "ATA "), but not USB bridges with SAT support.
......
...@@ -64,7 +64,7 @@ case "$AUTOMAKE" in ...@@ -64,7 +64,7 @@ case "$AUTOMAKE" in
*automake-1.8) *automake-1.8)
ver=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:-?.?.?}" ver="${ver:-?.?.?}"
esac esac
...@@ -83,7 +83,7 @@ case "$ver" in ...@@ -83,7 +83,7 @@ case "$ver" in
rm -f casetest.tmp 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 # OK
;; ;;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment