Skip to content
Snippets Groups Projects
Commit 96f1b654 authored by ballen4705's avatar ballen4705
Browse files

Fixed autogen.sh script so that it uses 'grep -n 1' if 'grep -1'

fails.  Needed for Mac OS X 10.4. Uck.


git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@2451 4ea69e1a-61f1-4043-bf83-b5c94c648137
parent 462da0d1
No related branches found
No related tags found
No related merge requests found
CHANGELOG for smartmontools CHANGELOG for smartmontools
$Id: CHANGELOG,v 1.647 2008/01/07 21:37:57 chrfranke Exp $ $Id: CHANGELOG,v 1.648 2008/01/23 13:43:24 ballen4705 Exp $
The most recent version of this file is: The most recent version of this file is:
http://smartmontools.cvs.sourceforge.net/smartmontools/sm5/CHANGELOG?view=markup http://smartmontools.cvs.sourceforge.net/smartmontools/sm5/CHANGELOG?view=markup
...@@ -34,6 +34,9 @@ NOTES FOR FUTURE RELEASES: see TODO file. ...@@ -34,6 +34,9 @@ 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>
[BA] Fixed autogen.sh script so that it uses 'grep -n 1' if 'grep -1'
fails. Needed for Mac OS X 10.4. Uck.
[CF] Windows: Added IOCTL_STORAGE_PREDICT_FAILURE. This allows access [CF] Windows: Added IOCTL_STORAGE_PREDICT_FAILURE. This allows access
to ATA SMART status and data if other calls do not work. to ATA SMART status and data if other calls do not work.
Thanks to Jaroslaw Kowalski for pointing this out. Thanks to Jaroslaw Kowalski for pointing this out.
......
#!/bin/sh #!/bin/sh
# $Id: autogen.sh,v 1.16 2008/01/02 19:34:55 bkorb Exp $ # $Id: autogen.sh,v 1.17 2008/01/23 13:43:24 ballen4705 Exp $
# #
# Generate ./configure from config.in and Makefile.in from Makefile.am. # Generate ./configure from config.in and Makefile.in from Makefile.am.
# This also adds files like missing,depcomp,install-sh to the source # This also adds files like missing,depcomp,install-sh to the source
...@@ -68,7 +68,14 @@ case "$AUTOMAKE" in ...@@ -68,7 +68,14 @@ case "$AUTOMAKE" in
*automake-1.[78]|*automake17) *automake-1.[78]|*automake17)
;; ;;
*) *)
# first see if we need 'head -1' or 'head -n 1'
echo hello | head -1 > /dev/null 2> /dev/null
if [ $? ] ; then
ver="`$AUTOMAKE --version | head -n 1 | sed -n 's,^.*\([12]\.[.0-9]*[-pl0-9]*\).*$,\1,p'`"
else
ver="`$AUTOMAKE --version | head -1 | sed -n 's,^.*\([12]\.[.0-9]*[-pl0-9]*\).*$,\1,p'`" ver="`$AUTOMAKE --version | head -1 | sed -n 's,^.*\([12]\.[.0-9]*[-pl0-9]*\).*$,\1,p'`"
fi
ver="${ver:-?.?.?}" ver="${ver:-?.?.?}"
case "$ver" in case "$ver" in
1.[78]*|1.9.[1-6]|1.10) ver= ;; 1.[78]*|1.9.[1-6]|1.10) ver= ;;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment