From c0b2d7dab287e512ffc38218652c3cda789d7141 Mon Sep 17 00:00:00 2001
From: antona <antona>
Date: Sat, 15 Oct 2005 09:53:36 +0000
Subject: [PATCH] Remove getgccver script and just use -dumpversion option to
 get the version directly inside configure.ac.

---
 ChangeLog    |  3 +++
 configure.ac |  4 ++--
 getgccver    | 10 ----------
 3 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100755 getgccver

diff --git a/ChangeLog b/ChangeLog
index 1874e216..242da058 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@ xx/xx/2005 - 1.12.2-WIP
 	- Temporarily disable use of the legal ansi character checking in
 	  libntfs/unistr.c::ntfs_names_collate() pending a proper fix at some
 	  point.  (Anton)
+	- Remove getgccver script and just get the version with the simple gcc
+	  option -dumpversion.  I wish I had known about it earlier!  Tested on
+	  various architectures and versions from 2.95 to 4.0.1.  (Anton)
 
 10/10/2005 - 1.12.1 - Minor fix to location of mount.ntfs-fuse and mkfs.ntfs.
 
diff --git a/configure.ac b/configure.ac
index 6a63308e..d8052ee1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -209,7 +209,7 @@ if test "$enable_crypto" != "no"; then
 		fi
 	])
 	have_libgnutls=false
-	AM_PATH_LIBGNUTLS(1.2.3, [ have_libgnutls=true ],
+	AM_PATH_LIBGNUTLS(1.2.8, [ have_libgnutls=true ],
 	[
 		if test "$enable_crypto" = "yes"; then
 			AC_MSG_ERROR([Linux-NTFS crypto code requires the gnutls library.])
@@ -240,7 +240,7 @@ fi
 
 # Check for gcc version being >= 2.96.
 AC_MSG_CHECKING(version of $_cc)
-cc_version=`$srcdir/getgccver $_cc`
+cc_version=`$_cc -dumpversion`
 cc_major=`echo $cc_version | cut -d'.' -f1`
 cc_minor=`echo $cc_version | cut -d'.' -f2`
 if test -z "$cc_version"; then
diff --git a/getgccver b/getgccver
deleted file mode 100755
index a0e6e22e..00000000
--- a/getgccver
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if test -z "$1"; then
-	echo "This program is only to be run by the ./configure script."
-	exit 1
-fi
-
-# Get the gcc version. Can't do this in configure.ac as automake refuses to
-# preserve the square brackets while generating the configure script.
-$1 --version 2>&1 | head -n 1 | sed s/"egcs-"// | sed s/"gcc (GCC) \([0-9]\.[0-9]*\).*"/"\1"/