[Linux-NTFS-cvs] CVS: linux-ntfs ChangeLog,1.64,1.65 configure,1.38,1.39 configure.in,1.34,1.35

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv29291

Modified Files:
	ChangeLog configure configure.in 
Log Message:
Better gcc detection in 'configure.in'. (Szakacsits Szabolcs)


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ChangeLog,v
retrieving revision 1.64
retrieving revision 1.65
diff -U2 -r1.64 -r1.65
--- ChangeLog	2 Jul 2002 23:47:10 -0000	1.64
+++ ChangeLog	5 Jul 2002 17:07:48 -0000	1.65
@@ -109,4 +109,7 @@
 	  typedef them ourselves from the C99 standard uint8_t, etc types which
 	  IMO are braindamaged.
+	- Better gcc detection in 'configure.in'. (Szakacsits Szabolcs)
+	  Tested with:	egcs-1.0.3 (egcs-2.90.29), egcs-1.1.2 (egcs-2.91.66),
+			gcc 2.95.3, 2.96 (from RH 7.1 and 7.3), and 3.0.4.
 
 12/03/2002 - 1.6.0 - More mkntfs options and cleanups.

Index: configure
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/configure,v
retrieving revision 1.38
retrieving revision 1.39
diff -U2 -r1.38 -r1.39
--- configure	3 Jul 2002 14:38:40 -0000	1.38
+++ configure	5 Jul 2002 17:07:48 -0000	1.39
@@ -5693,11 +5693,11 @@
 echo "configure:5694: checking version of $_cc" >&5
 cc_version=`$_cc --version 2>&1`
-cc_major=`echo $cc_version | cut -d'.' -f1`
-cc_minor=`echo $cc_version | cut -d'.' -f2`
+cc_major=`echo $cc_version | sed 's/egcs-//' | cut -d'.' -f1`
+cc_minor=`echo $cc_version | sed 's/egcs-//' | cut -d'.' -f2`
 if test -z $cc_version; then
 	cc_version="v. ?.??"
 	cc_major=1
 fi
-if (( $cc_major < 2 )) || ( (( $cc_major == 2 )) && (($cc_minor < 96 )) ); then
+if test $cc_major -lt 2 -o \( $cc_major -eq 2 -a $cc_minor -lt 96 \) ; then
 cc_version="$cc_version, bad"
 echo "$ac_t""$cc_version" 1>&6

Index: configure.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/configure.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -U2 -r1.34 -r1.35
--- configure.in	3 Jul 2002 14:38:40 -0000	1.34
+++ configure.in	5 Jul 2002 17:07:48 -0000	1.35
@@ -75,11 +75,11 @@
 AC_MSG_CHECKING(version of $_cc)
 cc_version=`$_cc --version 2>&1`
-cc_major=`echo $cc_version | cut -d'.' -f1`
-cc_minor=`echo $cc_version | cut -d'.' -f2`
+cc_major=`echo $cc_version | sed 's/egcs-//' | cut -d'.' -f1`
+cc_minor=`echo $cc_version | sed 's/egcs-//' | cut -d'.' -f2`
 if test -z $cc_version; then
 	cc_version="v. ?.??"
 	cc_major=1
 fi
-if (( $cc_major < 2 )) || ( (( $cc_major == 2 )) && (($cc_minor < 96 )) ); then
+if test $cc_major -lt 2 -o \( $cc_major -eq 2 -a $cc_minor -lt 96 \) ; then
 cc_version="$cc_version, bad"
 AC_MSG_RESULT($cc_version)