# HG changeset patch
# User jwe
# Date 840139544 0
# Node ID 383ce9cdcf31b301d90ab75cf0e142832c719881
# Parent  f06655937d8a4093be575e85cb5e90f9ede37415
[project @ 1996-08-15 20:05:44 by jwe]

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 15 14:39:07 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* configure.in (gxx_version, gcc_version): Strip out cygnus- from
+	the version number.
+
 Tue Jul 30 12:55:43 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* aclocal.m4 (OCTAVE_FLIBS): Also check for -bI:FILE arg to ld,
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -20,7 +20,7 @@
 ### along with Octave; see the file COPYING.  If not, write to the Free
 ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-AC_REVISION($Revision: 1.212 $)
+AC_REVISION($Revision: 1.213 $)
 AC_PREREQ(2.9)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -212,7 +212,8 @@
 
 ADD_CXX_WALL=false
 NO_IMPLICIT_TEMPLATES=
-gxx_version=`$CXX -v 2>&1 | grep "^.*g.. version" | sed 's/^.*g.. version *//'`
+gxx_version=`$CXX -v 2>&1 | grep "^.*g.. version" | \
+  sed 's/^.*g.. version *\(cygnus-\)\?//'`
 case "$gxx_version" in
 changequote(,)dnl
   2.[6789].*|2.[123456789][0123456789].*)
@@ -265,7 +266,8 @@
 ### Do special things for gcc.
 
 ADD_CC_WALL=false
-gcc_version=`$CC -v 2>&1 | grep "^.*gcc version" | sed 's/^.*gcc version *//'`
+gcc_version=`$CC -v 2>&1 | grep "^.*gcc version" | \
+  sed 's/^.*g.. version *\(cygnus-\)\?//'`
 case "$gcc_version" in
   2.*)
     if test -z "$EXTERN_CFLAGS"; then