From 13e52bbfbf093802ada3dbff2d60d9b20d157be3 Mon Sep 17 00:00:00 2001 From: "flatcap.org!flatcap" Date: Thu, 9 Jan 2003 02:22:03 +0000 Subject: [PATCH] horrendous regex to identify gcc 3.* (Logical change 1.81) --- configure | 6 +++--- configure.in | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index e8bc5212..618d133a 100755 --- a/configure +++ b/configure @@ -5712,9 +5712,9 @@ fi echo $ac_n "checking version of $_cc""... $ac_c" 1>&6 echo "configure:5715: checking version of $_cc" >&5 -cc_version=`$_cc --version 2>&1` -cc_major=`echo $cc_version | sed 's/egcs-//' | cut -d'.' -f1` -cc_minor=`echo $cc_version | sed 's/egcs-//' | cut -d'.' -f2` +cc_version=`$_cc --version 2>&1 | head -1 | sed 's/egcs-//' | sed 's/gcc (GCC) \([0-9]\.[0-9]\).*/\1/'` +cc_major=`echo $cc_version | cut -d'.' -f1` +cc_minor=`echo $cc_version | cut -d'.' -f2` if test -z $cc_version; then cc_version="v. ?.??" cc_major=1 diff --git a/configure.in b/configure.in index 8a893c21..fd5b1371 100644 --- a/configure.in +++ b/configure.in @@ -79,9 +79,9 @@ fi dnl Check for gcc version being >= 2.96. AC_MSG_CHECKING(version of $_cc) -cc_version=`$_cc --version 2>&1` -cc_major=`echo $cc_version | sed 's/egcs-//' | cut -d'.' -f1` -cc_minor=`echo $cc_version | sed 's/egcs-//' | cut -d'.' -f2` +cc_version=`$_cc --version 2>&1 | head -1 | sed 's/egcs-//' | sed 's/gcc (GCC) \([0-9]\.[0-9]\).*/\1/'` +cc_major=`echo $cc_version | cut -d'.' -f1` +cc_minor=`echo $cc_version | cut -d'.' -f2` if test -z $cc_version; then cc_version="v. ?.??" cc_major=1