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).


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@20736 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 22 insertions, 22 deletions

diff --git a/libf2c/Makefile.in b/libf2c/Makefile.in
index b3d046bc3c6..e9a027eea1b 100644
--- a/libf2c/Makefile.in
+++ b/libf2c/Makefile.in
@@ -28,6 +28,7 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 target_alias = @target_alias@
 gcc_version = @gcc_version@
+gcc_version_trigger = @gcc_version_trigger@
 
 bindir = $(exec_prefix)/bin
 libdir = $(exec_prefix)/lib
@@ -193,7 +194,7 @@ ${srcdir}/libU77/configure: ${srcdir}/libU77/configure.in
 	  cd $(srcdir)/libU77 && autoconf && rm -f config.cache
 g2c.h Makefile: $(srcdir)/g2c.h.in $(srcdir)/Makefile.in config.status
 	$(SHELL) config.status
-config.status: $(srcdir)/configure
+config.status: $(srcdir)/configure $(gcc_version_trigger)
 	$(SHELL) config.status --recheck
 
 info install-info clean-info dvi:
diff --git a/libf2c/configure b/libf2c/configure
index 63163a84166..b3e6d50cf84 100755
--- a/libf2c/configure
+++ b/libf2c/configure
@@ -1861,18 +1861,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_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   if test -f $ac_dir/install-sh; then
@@ -1920,7 +1919,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:1924: checking host system type" >&5
+echo "configure:1923: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -1941,7 +1940,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:1945: checking target system type" >&5
+echo "configure:1944: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -1959,7 +1958,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:1963: checking build system type" >&5
+echo "configure:1962: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -2136,6 +2135,7 @@ s%@CPP@%$CPP%g
 s%@F2C_INTEGER@%$F2C_INTEGER%g
 s%@F2C_LONGINT@%$F2C_LONGINT%g
 s%@gcc_version@%$gcc_version%g
+s%@gcc_version_trigger@%$gcc_version_trigger%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
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)