summaryrefslogtreecommitdiff
path: root/libf2c
diff options
context:
space:
mode:
Diffstat (limited to 'libf2c')
-rw-r--r--libf2c/ChangeLog5
-rwxr-xr-xlibf2c/configure2
-rw-r--r--libf2c/configure.in2
3 files changed, 7 insertions, 2 deletions
diff --git a/libf2c/ChangeLog b/libf2c/ChangeLog
index 7ccc621e0e2..e995be3990c 100644
--- a/libf2c/ChangeLog
+++ b/libf2c/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb 16 11:10:05 2000 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
+
+ * configure.in (gcc_version): When setting, narrow search to
+ lines containing `version_string'.
+
Tue Nov 16 20:39:42 1999 Geoffrey Keating <geoffk@cygnus.com>
* libU77/u77-test.f (wd): Allow for longer working directory
diff --git a/libf2c/configure b/libf2c/configure
index a1823685fe7..3b445f62a77 100755
--- a/libf2c/configure
+++ b/libf2c/configure
@@ -1231,7 +1231,7 @@ test -f libU77/makefile && mv libU77/makefile libU77/makefile.ori
# Get the version trigger filename from the toplevel
if [ "${with_gcc_version_trigger+set}" = set ]; then
gcc_version_trigger=$with_gcc_version_trigger
- gcc_version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${gcc_version_trigger}`
+ gcc_version=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'`
else
gcc_version_trigger=
gcc_version=UNKNOWN
diff --git a/libf2c/configure.in b/libf2c/configure.in
index a4c502c2424..6d18744034d 100644
--- a/libf2c/configure.in
+++ b/libf2c/configure.in
@@ -202,7 +202,7 @@ test -f libU77/makefile && mv libU77/makefile libU77/makefile.ori
# Get the version trigger filename from the toplevel
if [[ "${with_gcc_version_trigger+set}" = set ]]; then
gcc_version_trigger=$with_gcc_version_trigger
- gcc_version=`sed -e 's/.*\"\([[^ \"]]*\)[[ \"]].*/\1/' < ${gcc_version_trigger}`
+ gcc_version=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([[^ \"]]*\)[[ \"]].*/\1/'`
else
gcc_version_trigger=
gcc_version=UNKNOWN