Mercurial > octave-nkf
changeset 2353:383ce9cdcf31
[project @ 1996-08-15 20:05:44 by jwe]
author | jwe |
---|---|
date | Thu, 15 Aug 1996 20:05:44 +0000 |
parents | f06655937d8a |
children | 2ce6e1ec9b53 |
files | ChangeLog configure.in |
diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Aug 08 21:06:49 1996 +0000 +++ b/ChangeLog Thu Aug 15 20:05:44 1996 +0000 @@ -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,
--- a/configure.in Thu Aug 08 21:06:49 1996 +0000 +++ b/configure.in Thu Aug 15 20:05:44 1996 +0000 @@ -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