diff --git a/smartmontools/CHANGELOG b/smartmontools/CHANGELOG index e0fcb7f31b0a9270f628f9e9e53888c8bd7ab28a..0cfa8e35bdba13b0e8561a967ba569033fa1bfb6 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 5e171e792938f11ed66b2f4b7ebcaa823cc990b7..9ab37837a5aca442cdd948e6faaca82ac3ecaedd 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 ;;