diff options
| author | Manfred Hollstein <manfred@gcc.gnu.org> | 1998-06-26 02:13:51 +0000 |
|---|---|---|
| committer | Manfred Hollstein <manfred@gcc.gnu.org> | 1998-06-26 02:13:51 +0000 |
| commit | f1943b772f833a3e511c35a78cc90607e752a202 (patch) | |
| tree | 51d261c8aa76a052e642e4bccf8260e143210109 /libf2c/configure.in | |
| parent | e4bfc274846798f11a977e98f27c442ad90ca000 (diff) | |
| download | gcc-f1943b772f833a3e511c35a78cc90607e752a202.tar.gz | |
Makefile.in (BASE_FLAGS_TO_PASS): Add gcc_version_trigger.
d
egcs/ChangeLog:
1998-06-26 Manfred Hollstein <manfred@s-direktnet.de>
* Makefile.in (BASE_FLAGS_TO_PASS): Add gcc_version_trigger.
(Makefile): Depend on $(gcc_version_trigger).
* configure (gcc_version): Change default initializer to empty
string.
(gcc_version_trigger): New variable; pass this variable down
to subdir configures to enable them checking gcc's version
themselves. Emit make macros for both gcc_version vars.
(topsrcdir): Initialize reliably.
(recursion line): Remove --with-gcc-version=${gcc_version}.
egcs/gcc/ChangeLog:
1998-06-26 Manfred Hollstein <manfred@s-direktnet.de>
* Makefile.in (gcc_version, gcc_version_trigger): New macros.
(version): Initialize from $(gcc_version).
* configure.in (version): Rename to gcc_version.
(gcc_version_trigger): New variable; call AC_SUBST for it and
emit it into the generated config.status.
* configure: Regenerate.
egcs/libf2c/ChangeLog.egcs:
1998-06-26 Manfred Hollstein <manfred@s-direktnet.de>
* Makefile.in (gcc_version_trigger): Add new macro.
(config.status): Add dependency upon $(gcc_version_trigger).
* configure.in (gcc_version_trigger): New variable; initialize
using value from toplevel configure; add AC_SUBST for it.
(gcc_version): Change initialization to use this new variable.
* configure: Regenerate.
egcs/libio/ChangeLog:
1998-06-26 Manfred Hollstein <manfred@s-direktnet.de>
* config.shared (FLAGS_TO_PASS): Add gcc_version_trigger.
(Makefile): Add dependency upon $(gcc_version_trigger).
From-SVN: r20736
Diffstat (limited to 'libf2c/configure.in')
| -rw-r--r-- | libf2c/configure.in | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/libf2c/configure.in b/libf2c/configure.in index bd1145f30be..5dcfb2d6f09 100644 --- a/libf2c/configure.in +++ b/libf2c/configure.in @@ -343,18 +343,17 @@ test -f libF77/makefile && mv libF77/makefile libF77/makefile.ori 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 -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 +# 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}` else - gcc_version=${with_gcc_version} + gcc_version_trigger= + gcc_version=UNKNOWN fi + AC_SUBST(gcc_version) +AC_SUBST(gcc_version_trigger) AC_CANONICAL_SYSTEM AC_SUBST(target_alias) |