From ee7c89c2a465ba0ffd6949047fddea5434b4bce5 Mon Sep 17 00:00:00 2001 From: chrfranke <chrfranke@4ea69e1a-61f1-4043-bf83-b5c94c648137> Date: Sat, 20 Jun 2009 19:51:42 +0000 Subject: [PATCH] Remove 'CYGWIN=check_case:strict', this does no longer work on Cygwin 1.7. Print warning if Automake version cannot handle case insensitive filesystems. git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@2808 4ea69e1a-61f1-4043-bf83-b5c94c648137 --- sm5/CHANGELOG | 6 +++++- sm5/autogen.sh | 46 +++++++++++++++++++++++++++++----------------- 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/sm5/CHANGELOG b/sm5/CHANGELOG index 0cb9c7bde..a23ebd292 100644 --- a/sm5/CHANGELOG +++ b/sm5/CHANGELOG @@ -1,6 +1,6 @@ CHANGELOG for smartmontools -$Id: CHANGELOG,v 1.807 2009/06/20 19:11:04 chrfranke Exp $ +$Id: CHANGELOG,v 1.808 2009/06/20 19:51:42 chrfranke Exp $ The most recent version of this file is: http://smartmontools.cvs.sourceforge.net/smartmontools/sm5/CHANGELOG?view=markup @@ -41,6 +41,10 @@ NOTES FOR FUTURE RELEASES: see TODO file. <DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE> + [CF] autogen.sh: Remove 'CYGWIN=check_case:strict', this does no + longer work on Cygwin 1.7. Print warning if Automake version + cannot handle case insensitive filesystems. + [CF] Remove '#define TRUE/FALSE', use 'bool' and 'true/false'. [CF] Add 'options' parameter to SCSI printing routine. Move global diff --git a/sm5/autogen.sh b/sm5/autogen.sh index ec8627772..7f43385a4 100755 --- a/sm5/autogen.sh +++ b/sm5/autogen.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: autogen.sh,v 1.20 2009/06/12 12:25:02 chrfranke Exp $ +# $Id: autogen.sh,v 1.21 2009/06/20 19:51:42 chrfranke Exp $ # # Generate ./configure from config.in and Makefile.in from Makefile.am. # This also adds files like missing,depcomp,install-sh to the source @@ -10,10 +10,6 @@ # Cygwin? test -x /usr/bin/uname && /usr/bin/uname | grep -i CYGWIN >/dev/null && { - # Enable strict case checking - # (to avoid e.g. "DIST_COMMON = ... ChangeLog ..." in Makefile.in) - export CYGWIN="${CYGWIN}${CYGWIN:+ }check_case:strict" - # Check for Unix text file type echo > dostest.tmp test "`wc -c < dostest.tmp`" -eq 1 || @@ -61,24 +57,40 @@ echo "Your installation of GNU Automake is broken or incomplete." exit 2; } -# Warn if Automake version is unknown -ver= +# Detect Automake version case "$AUTOMAKE" in - *automake-1.[78]|*automake17) - ;; + *automake-1.7|*automake17) + ver=1.7 ;; + *automake-1.8) + ver=1.8 ;; *) ver="`$AUTOMAKE --version | sed -n '1s,^.*\([12]\.[.0-9]*[-pl0-9]*\).*$,\1,p'`" ver="${ver:-?.?.?}" - case "$ver" in - 1.[78]*|1.9.[1-6]|1.10|1.10.[12]|1.11) ver= ;; - esac ;; esac -test -z "$ver" || -{ -echo "Note: GNU Automake version ${ver} was not tested by the developers." -echo "Please report success/failure to the smartmontools-support mailing list." -} +# Warn if Automake version was not tested or does not support filesystem +case "$ver" in + 1.[78]|1.[78].*) + # Check for case sensitive filesystem + # (to avoid e.g. "DIST_COMMON = ... ChangeLog ..." in Makefile.in on Cygwin) + rm -f CASETEST.TMP + echo > casetest.tmp + test -f CASETEST.TMP && + { + echo "Warning: GNU Automake version ${ver} does not properly handle case" + echo "insensitive filesystems. Some make targets may not work." + } + rm -f casetest.tmp + ;; + + 1.9.[1-6]|1.10|1.10.[12]|1.11) + # OK + ;; + + *) + echo "Note: GNU Automake version ${ver} was not tested by the developers." + echo "Please report success/failure to the smartmontools-support mailing list." +esac set -e # stops on error status -- GitLab