(toplevel patch) Move gcc_version_trigger from configure to configure.in

(toplevel patch) Move gcc_version_trigger from configure to configure.in

[Nathanael Nerode]

After fiddling around, I concluded this one was best submitted as is,
so here it is: outstanding patch #3, after de-vault and dependency tidy.

Needed before I can get host subdir configuration into the Makefile.
Tested on i686-pc-linux-gnu.

	* configure: Move gcc_version_trigger stuff from here...
	* configure.in: ...to here.

Index: configure
===================================================================
RCS file: /cvs/gcc/gcc/configure,v
retrieving revision 1.46.6.7
diff -u -r1.46.6.7 configure
--- configure	26 Nov 2002 20:07:21 -0000	1.46.6.7
+++ configure	28 Nov 2002 03:18:07 -0000
@@ -585,28 +585,6 @@
 *) ;;
 esac
 
-# Define the trigger file to make sure configure will re-run whenever
-# the gcc version number changes.
-if [ "${with_gcc_version_trigger+set}" = set ]; then
-    gcc_version_trigger="$with_gcc_version_trigger"
-    gcc_version=`grep version_string ${with_gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'`
-else
-    # If gcc's sources are available, define the trigger file.
-    if [ -f ${topsrcdir}/gcc/version.c ] ; then
-	gcc_version_trigger=${topsrcdir}/gcc/version.c
-	gcc_version=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'`
-	case "$arguments" in
-	  *--with-gcc-version-trigger=$gcc_version_trigger* )
-	    ;;
-	  * )
-	    # Make sure configure.in knows about this.
-	    arguments="--with-gcc-version-trigger=$gcc_version_trigger $arguments"
-	    ;;
-	esac
-	withoptions="--with-gcc-version-trigger=$gcc_version_trigger $withoptions"
-    fi
-fi
-
 ### break up ${srcdir}/configure.in.
 case "`grep '^# per\-host:' ${srcdir}/configure.in`" in
 "")
Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/configure.in,v
retrieving revision 1.177.4.10
diff -u -r1.177.4.10 configure.in
--- configure.in	23 Nov 2002 23:33:59 -0000	1.177.4.10
+++ configure.in	28 Nov 2002 03:18:10 -0000
@@ -33,6 +33,28 @@
 
 ##############################################################################
 
+# Define the trigger file to make sure configure will re-run whenever
+# the gcc version number changes.
+if [ "${with_gcc_version_trigger+set}" = set ]; then
+    gcc_version_trigger="$with_gcc_version_trigger"
+    gcc_version=`grep version_string ${with_gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'`
+else
+    # If gcc's sources are available, define the trigger file.
+    if [ -f ${topsrcdir}/gcc/version.c ] ; then
+	gcc_version_trigger=${topsrcdir}/gcc/version.c
+	gcc_version=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'`
+	case "$arguments" in
+	  *--with-gcc-version-trigger=$gcc_version_trigger* )
+	    ;;
+	  * )
+	    # Make sure configure.in knows about this.
+	    arguments="--with-gcc-version-trigger=$gcc_version_trigger $arguments"
+	    ;;
+	esac
+	withoptions="--with-gcc-version-trigger=$gcc_version_trigger $withoptions"
+    fi
+fi
+
 ### To add a new directory to the tree, first choose whether it is a target
 ### or a host dependent tool.  Then put it into the appropriate list
 ### (library or tools, host or target), doing a dependency sort.  For

Re: (toplevel patch) Move gcc_version_trigger from configure to configure.in

[DJ Delorie]

> After fiddling around, I concluded this one was best submitted as is,
> so here it is: outstanding patch #3, after de-vault and dependency tidy.
> 
> Needed before I can get host subdir configuration into the Makefile.
> Tested on i686-pc-linux-gnu.
> 
> 	* configure: Move gcc_version_trigger stuff from here...
> 	* configure.in: ...to here.

Ok.