From 6174dcf37580c05ea846cfe0659a61574f7ae71c Mon Sep 17 00:00:00 2001 From: Manfred Hollstein Date: Wed, 24 Jun 1998 06:16:19 +0000 Subject: configure (gcc_version): Initialize properly depending on how and where configure is started. d egcs/ChangeLog: 1998-06-24 Manfred Hollstein * configure (gcc_version): Initialize properly depending on how and where configure is started. (recursion line): Pass a --with-gcc-version=${gcc_version} to configures in subdirs. egcs/libf2c/ChangeLog.egcs: 1998-06-24 Manfred Hollstein * Makefile.in (version): Rename to gcc_version. * configure.in (version): Likewise. (gcc_version): Add code to use an option passed from parent configure. * configure: Regenerate. egcs/libio/ChangeLog: 1998-06-24 Manfred Hollstein * config.shared (FLAGS_TO_PASS): Add gcc_version. From-SVN: r20687 --- libf2c/configure | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'libf2c/configure') diff --git a/libf2c/configure b/libf2c/configure index cef4491..63163a8 100755 --- a/libf2c/configure +++ b/libf2c/configure @@ -1862,7 +1862,16 @@ test -f libI77/makefile && mv libI77/makefile libI77/makefile.ori test -f libU77/makefile && mv libU77/makefile libU77/makefile.ori # Get the version number from the toplevel -version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${srcdir}/../gcc/version.c` +if test x${with_gcc_version} = x; then + # Try to get the version number from a hopefully existing gcc directory. + if test -d ${srcdir}/../gcc; then + gcc_version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${srcdir}/../gcc/version.c` + else + gcc_version=UNKNOWN + fi +else + gcc_version=${with_gcc_version} +fi ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do @@ -1911,7 +1920,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1915: checking host system type" >&5 +echo "configure:1924: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1932,7 +1941,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:1936: checking target system type" >&5 +echo "configure:1945: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -1950,7 +1959,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1954: checking build system type" >&5 +echo "configure:1963: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -2126,7 +2135,7 @@ s%@RANLIB_TEST@%$RANLIB_TEST%g s%@CPP@%$CPP%g s%@F2C_INTEGER@%$F2C_INTEGER%g s%@F2C_LONGINT@%$F2C_LONGINT%g -s%@version@%$version%g +s%@gcc_version@%$gcc_version%g s%@host@%$host%g s%@host_alias@%$host_alias%g s%@host_cpu@%$host_cpu%g -- cgit v1.1