Version number fallout, take three

Khem Raj kraj@mvista.com
Sun Mar 20 14:02:00 GMT 2005



Zack Weinberg wrote:

>Changes from previous version are to define $(gcc_version), and some
>variables defined based on it, directly in the Makefiles instead of as
>autoconf substitutions; and to use := for every variable defined to a
>$(shell) expression, which avoids reading them more than once and may
>also fix the mysterious serialization of bootstrap (if true, this
>would be a bug in Make, although fortunately one with an easy workaround).
>
>I still don't have very high confidence in this, but I am getting
>close to feeling that it is better than the status quo.  I'm doing
>another test cycle myself, and if it succeeds and the installation
>looks correct, I will probably check this in.  More testing would be
>appreciated, especially with --enable-version-specific-runtime-libs.
>  
>
I built arm-eabi cross gcc bootstrap with --enable-version 
specfic-runtime-libs and install went successful
the previous 'const' error is gone with this patch however the 
gcc/..../4.1.0/spec file is not there anymore I wonder if
this file is obsoleted.

>Comments are greatly appreciated, too.
>
>zw
>
>===================================================================
>Index: Makefile.def
>--- Makefile.def	28 Feb 2005 13:24:42 -0000	1.48
>+++ Makefile.def	20 Mar 2005 00:15:07 -0000
>@@ -173,7 +173,6 @@ flags_to_pass = { flag= libdir ; };
> flags_to_pass = { flag= libexecdir ; };
> flags_to_pass = { flag= lispdir ; };
> flags_to_pass = { flag= libstdcxx_incdir ; };
>-flags_to_pass = { flag= libsubdir ; };
> flags_to_pass = { flag= localstatedir ; };
> flags_to_pass = { flag= mandir ; };
> flags_to_pass = { flag= oldincludedir ; };
>@@ -184,8 +183,6 @@ flags_to_pass = { flag= sysconfdir ; };
> flags_to_pass = { flag= tooldir ; };
> flags_to_pass = { flag= build_tooldir ; };
> flags_to_pass = { flag= gxx_include_dir ; };
>-flags_to_pass = { flag= gcc_version ; };
>-flags_to_pass = { flag= gcc_version_trigger ; };
> flags_to_pass = { flag= target_alias ; };
> 
> // Build tools
>===================================================================
>Index: Makefile.in
>--- Makefile.in	16 Mar 2005 15:34:56 -0000	1.259
>+++ Makefile.in	20 Mar 2005 00:15:07 -0000
>@@ -72,10 +72,6 @@ LN_S = @LN_S@
> # Miscellaneous non-standard autoconf-set variables
> # -------------------------------------------------
> 
>-# The file containing GCC's version number.
>-gcc_version_trigger = @gcc_version_trigger@
>-gcc_version = @gcc_version@
>-
> # The gcc driver likes to know the arguments it was configured with.
> TOPLEVEL_CONFIGURE_ARGUMENTS=@TOPLEVEL_CONFIGURE_ARGUMENTS@
> 
>@@ -85,8 +81,6 @@ libstdcxx_incdir = @libstdcxx_incdir@
> tooldir = @tooldir@
> build_tooldir = @build_tooldir@
> 
>-# Directory in which the compiler finds executables, libraries, etc.
>-libsubdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)
> GDB_NLM_DEPS = 
> 
> # This is the name of the environment variable used for the path to
>@@ -521,7 +515,6 @@ BASE_FLAGS_TO_PASS = \
> 	"libexecdir=$(libexecdir)" \
> 	"lispdir=$(lispdir)" \
> 	"libstdcxx_incdir=$(libstdcxx_incdir)" \
>-	"libsubdir=$(libsubdir)" \
> 	"localstatedir=$(localstatedir)" \
> 	"mandir=$(mandir)" \
> 	"oldincludedir=$(oldincludedir)" \
>@@ -532,8 +525,6 @@ BASE_FLAGS_TO_PASS = \
> 	"tooldir=$(tooldir)" \
> 	"build_tooldir=$(build_tooldir)" \
> 	"gxx_include_dir=$(gxx_include_dir)" \
>-	"gcc_version=$(gcc_version)" \
>-	"gcc_version_trigger=$(gcc_version_trigger)" \
> 	"target_alias=$(target_alias)" \
> 	"BISON=$(BISON)" \
> 	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
>@@ -35515,7 +35506,7 @@ $(srcdir)/Makefile.in: @MAINT@ $(srcdir)
> Makefile: $(srcdir)/Makefile.in config.status
> 	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
> 
>-config.status: configure $(gcc_version_trigger)
>+config.status: configure
> 	CONFIG_SHELL="$(SHELL)" $(SHELL) ./config.status --recheck
> 
> # Rebuilding configure.
>===================================================================
>Index: Makefile.tpl
>--- Makefile.tpl	16 Mar 2005 15:34:55 -0000	1.127
>+++ Makefile.tpl	20 Mar 2005 00:15:07 -0000
>@@ -75,10 +75,6 @@ LN_S = @LN_S@
> # Miscellaneous non-standard autoconf-set variables
> # -------------------------------------------------
> 
>-# The file containing GCC's version number.
>-gcc_version_trigger = @gcc_version_trigger@
>-gcc_version = @gcc_version@
>-
> # The gcc driver likes to know the arguments it was configured with.
> TOPLEVEL_CONFIGURE_ARGUMENTS=@TOPLEVEL_CONFIGURE_ARGUMENTS@
> 
>@@ -88,8 +84,6 @@ libstdcxx_incdir = @libstdcxx_incdir@
> tooldir = @tooldir@
> build_tooldir = @build_tooldir@
> 
>-# Directory in which the compiler finds executables, libraries, etc.
>-libsubdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)
> GDB_NLM_DEPS = 
> 
> # This is the name of the environment variable used for the path to
>@@ -1673,7 +1667,7 @@ $(srcdir)/Makefile.in: @MAINT@ $(srcdir)
> Makefile: $(srcdir)/Makefile.in config.status
> 	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
> 
>-config.status: configure $(gcc_version_trigger)
>+config.status: configure
> 	CONFIG_SHELL="$(SHELL)" $(SHELL) ./config.status --recheck
> 
> # Rebuilding configure.
>===================================================================
>Index: configure
>--- configure	28 Feb 2005 13:24:57 -0000	1.206
>+++ configure	20 Mar 2005 00:15:07 -0000
>@@ -852,37 +852,6 @@ topsrcdir=$srcpwd
> 
> extra_host_args=
> 
>-# Define the trigger file to make sure configure will re-run whenever
>-# the gcc version number changes.
>-
>-if test "${with_gcc_version_trigger+set}" = set; then
>-  gcc_version_trigger=$with_gcc_version_trigger
>-else
>-  gcc_version_trigger=$topsrcdir/gcc/version.c
>-fi
>-if test -f "${gcc_version_trigger}"; then
>-  gcc_version_full=`grep version_string "${gcc_version_trigger}" | sed -e 's/.*"\([^"]*\)".*/\1/'`
>-else
>-  gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'`
>-fi
>-gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
>-
>-
>-
>-
>-if test -f $gcc_version_trigger ; then
>-  case "$ac_configure_args" in
>-    *--with-gcc-version-trigger=$gcc_version_trigger* )
>-      ;;
>-    * )
>-      # Add to all subconfigure arguments: build, host, and target.
>-      ac_configure_args="$ac_configure_args --with-gcc-version-trigger=$gcc_version_trigger"
>-      ;;
>-  esac
>-else
>-  gcc_version_trigger=
>-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.
>@@ -1805,7 +1774,7 @@ else
>   # Extract the first word of "gcc", so it can be a program name with args.
> set dummy gcc; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:1809: checking for $ac_word" >&5
>+echo "configure:1778: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -1835,7 +1804,7 @@ if test -z "$CC"; then
>   # Extract the first word of "cc", so it can be a program name with args.
> set dummy cc; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:1839: checking for $ac_word" >&5
>+echo "configure:1808: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -1886,7 +1855,7 @@ fi
>       # Extract the first word of "cl", so it can be a program name with args.
> set dummy cl; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:1890: checking for $ac_word" >&5
>+echo "configure:1859: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -1918,7 +1887,7 @@ fi
> fi
> 
> echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
>-echo "configure:1922: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
>+echo "configure:1891: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
> 
> ac_ext=c
> # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
>@@ -1929,12 +1898,12 @@ cross_compiling=$ac_cv_prog_cc_cross
> 
> cat > conftest.$ac_ext << EOF
> 
>-#line 1933 "configure"
>+#line 1902 "configure"
> #include "confdefs.h"
> 
> main(){return(0);}
> EOF
>-if { (eval echo configure:1938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>+if { (eval echo configure:1907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>   ac_cv_prog_cc_works=yes
>   # If we can't run a trivial program, we are probably using a cross compiler.
>   if (./conftest; exit) 2>/dev/null; then
>@@ -1960,12 +1929,12 @@ if test $ac_cv_prog_cc_works = no; then
>   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
> fi
> echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
>-echo "configure:1964: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
>+echo "configure:1933: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
> echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
> cross_compiling=$ac_cv_prog_cc_cross
> 
> echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
>-echo "configure:1969: checking whether we are using GNU C" >&5
>+echo "configure:1938: checking whether we are using GNU C" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -1974,7 +1943,7 @@ else
>   yes;
> #endif
> EOF
>-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1978: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
>+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
>   ac_cv_prog_gcc=yes
> else
>   ac_cv_prog_gcc=no
>@@ -1993,7 +1962,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
> ac_save_CFLAGS="$CFLAGS"
> CFLAGS=
> echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
>-echo "configure:1997: checking whether ${CC-cc} accepts -g" >&5
>+echo "configure:1966: checking whether ${CC-cc} accepts -g" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -2060,7 +2029,7 @@ fi
> # Extract the first word of "${ac_tool_prefix}gnatbind", so it can be a program name with args.
> set dummy ${ac_tool_prefix}gnatbind; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:2064: checking for $ac_word" >&5
>+echo "configure:2033: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -2092,7 +2061,7 @@ if test -n "$ac_tool_prefix"; then
>   # Extract the first word of "gnatbind", so it can be a program name with args.
> set dummy gnatbind; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:2096: checking for $ac_word" >&5
>+echo "configure:2065: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -2125,7 +2094,7 @@ fi
> fi
> 
> echo $ac_n "checking whether compiler driver understands Ada""... $ac_c" 1>&6
>-echo "configure:2129: checking whether compiler driver understands Ada" >&5
>+echo "configure:2098: checking whether compiler driver understands Ada" >&5
> if eval "test \"`echo '$''{'acx_cv_cc_gcc_supports_ada'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -2158,7 +2127,7 @@ else
> fi
> 
> echo $ac_n "checking how to compare bootstrapped objects""... $ac_c" 1>&6
>-echo "configure:2162: checking how to compare bootstrapped objects" >&5
>+echo "configure:2131: checking how to compare bootstrapped objects" >&5
> if eval "test \"`echo '$''{'gcc_cv_prog_cmp_skip'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -2256,9 +2225,9 @@ saved_CFLAGS="$CFLAGS"
> CFLAGS="$CFLAGS $gmpinc"
> # Check GMP actually works
> echo $ac_n "checking for correct version of gmp.h""... $ac_c" 1>&6
>-echo "configure:2260: checking for correct version of gmp.h" >&5
>+echo "configure:2229: checking for correct version of gmp.h" >&5
> cat > conftest.$ac_ext <<EOF
>-#line 2262 "configure"
>+#line 2231 "configure"
> #include "confdefs.h"
> #include "gmp.h"
> int main() {
>@@ -2269,7 +2238,7 @@ choke me
> 
> ; return 0; }
> EOF
>-if { (eval echo configure:2273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
>+if { (eval echo configure:2242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
>   rm -rf conftest*
>   echo "$ac_t""yes" 1>&6
> else
>@@ -2282,12 +2251,12 @@ rm -f conftest*
> 
> if test x"$have_gmp" = xyes; then
>   echo $ac_n "checking for MPFR""... $ac_c" 1>&6
>-echo "configure:2286: checking for MPFR" >&5
>+echo "configure:2255: checking for MPFR" >&5
> 
>   saved_LIBS="$LIBS"
>   LIBS="$LIBS $gmplibs"
>   cat > conftest.$ac_ext <<EOF
>-#line 2291 "configure"
>+#line 2260 "configure"
> #include "confdefs.h"
> #include <gmp.h>
> #include <mpfr.h>
>@@ -2295,7 +2264,7 @@ int main() {
> mpfr_t n; mpfr_init(n);
> ; return 0; }
> EOF
>-if { (eval echo configure:2299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>+if { (eval echo configure:2268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>   rm -rf conftest*
>   echo "$ac_t""yes" 1>&6
> else
>@@ -2782,7 +2751,7 @@ do
> # Extract the first word of "$ac_prog", so it can be a program name with args.
> set dummy $ac_prog; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:2786: checking for $ac_word" >&5
>+echo "configure:2755: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_BISON'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -2817,7 +2786,7 @@ do
> # Extract the first word of "$ac_prog", so it can be a program name with args.
> set dummy $ac_prog; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:2821: checking for $ac_word" >&5
>+echo "configure:2790: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_YACC'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -2852,7 +2821,7 @@ do
> # Extract the first word of "$ac_prog", so it can be a program name with args.
> set dummy $ac_prog; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:2856: checking for $ac_word" >&5
>+echo "configure:2825: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_M4'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -2887,7 +2856,7 @@ do
> # Extract the first word of "$ac_prog", so it can be a program name with args.
> set dummy $ac_prog; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:2891: checking for $ac_word" >&5
>+echo "configure:2860: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_FLEX'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -2922,7 +2891,7 @@ do
> # Extract the first word of "$ac_prog", so it can be a program name with args.
> set dummy $ac_prog; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:2926: checking for $ac_word" >&5
>+echo "configure:2895: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_LEX'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -2957,7 +2926,7 @@ do
> # Extract the first word of "$ac_prog", so it can be a program name with args.
> set dummy $ac_prog; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:2961: checking for $ac_word" >&5
>+echo "configure:2930: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_MAKEINFO'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -3603,7 +3572,7 @@ test -n "$target_alias" && ncn_target_to
>   # Extract the first word of "${ncn_tool_prefix}ar", so it can be a program name with args.
> set dummy ${ncn_tool_prefix}ar; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:3607: checking for $ac_word" >&5
>+echo "configure:3576: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -3636,7 +3605,7 @@ if test -z "$ac_cv_prog_AR" ; then
>     # Extract the first word of "ar", so it can be a program name with args.
> set dummy ar; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:3640: checking for $ac_word" >&5
>+echo "configure:3609: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AR'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -3675,7 +3644,7 @@ fi
>   # Extract the first word of "${ncn_tool_prefix}as", so it can be a program name with args.
> set dummy ${ncn_tool_prefix}as; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:3679: checking for $ac_word" >&5
>+echo "configure:3648: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -3708,7 +3677,7 @@ if test -z "$ac_cv_prog_AS" ; then
>     # Extract the first word of "as", so it can be a program name with args.
> set dummy as; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:3712: checking for $ac_word" >&5
>+echo "configure:3681: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AS'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -3747,7 +3716,7 @@ fi
>   # Extract the first word of "${ncn_tool_prefix}dlltool", so it can be a program name with args.
> set dummy ${ncn_tool_prefix}dlltool; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:3751: checking for $ac_word" >&5
>+echo "configure:3720: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -3780,7 +3749,7 @@ if test -z "$ac_cv_prog_DLLTOOL" ; then
>     # Extract the first word of "dlltool", so it can be a program name with args.
> set dummy dlltool; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:3784: checking for $ac_word" >&5
>+echo "configure:3753: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_DLLTOOL'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -3819,7 +3788,7 @@ fi
>   # Extract the first word of "${ncn_tool_prefix}ld", so it can be a program name with args.
> set dummy ${ncn_tool_prefix}ld; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:3823: checking for $ac_word" >&5
>+echo "configure:3792: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -3852,7 +3821,7 @@ if test -z "$ac_cv_prog_LD" ; then
>     # Extract the first word of "ld", so it can be a program name with args.
> set dummy ld; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:3856: checking for $ac_word" >&5
>+echo "configure:3825: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_LD'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -3891,7 +3860,7 @@ fi
>   # Extract the first word of "${ncn_tool_prefix}nm", so it can be a program name with args.
> set dummy ${ncn_tool_prefix}nm; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:3895: checking for $ac_word" >&5
>+echo "configure:3864: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -3924,7 +3893,7 @@ if test -z "$ac_cv_prog_NM" ; then
>     # Extract the first word of "nm", so it can be a program name with args.
> set dummy nm; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:3928: checking for $ac_word" >&5
>+echo "configure:3897: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_NM'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -3963,7 +3932,7 @@ fi
>   # Extract the first word of "${ncn_tool_prefix}ranlib", so it can be a program name with args.
> set dummy ${ncn_tool_prefix}ranlib; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:3967: checking for $ac_word" >&5
>+echo "configure:3936: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -3996,7 +3965,7 @@ if test -z "$ac_cv_prog_RANLIB" ; then
>     # Extract the first word of "ranlib", so it can be a program name with args.
> set dummy ranlib; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:4000: checking for $ac_word" >&5
>+echo "configure:3969: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_RANLIB'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -4035,7 +4004,7 @@ fi
>   # Extract the first word of "${ncn_tool_prefix}windres", so it can be a program name with args.
> set dummy ${ncn_tool_prefix}windres; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:4039: checking for $ac_word" >&5
>+echo "configure:4008: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -4068,7 +4037,7 @@ if test -z "$ac_cv_prog_WINDRES" ; then
>     # Extract the first word of "windres", so it can be a program name with args.
> set dummy windres; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:4072: checking for $ac_word" >&5
>+echo "configure:4041: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_WINDRES'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -4107,7 +4076,7 @@ fi
>   # Extract the first word of "${ncn_tool_prefix}objcopy", so it can be a program name with args.
> set dummy ${ncn_tool_prefix}objcopy; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:4111: checking for $ac_word" >&5
>+echo "configure:4080: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -4140,7 +4109,7 @@ if test -z "$ac_cv_prog_OBJCOPY" ; then
>     # Extract the first word of "objcopy", so it can be a program name with args.
> set dummy objcopy; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:4144: checking for $ac_word" >&5
>+echo "configure:4113: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJCOPY'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -4179,7 +4148,7 @@ fi
>   # Extract the first word of "${ncn_tool_prefix}objdump", so it can be a program name with args.
> set dummy ${ncn_tool_prefix}objdump; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:4183: checking for $ac_word" >&5
>+echo "configure:4152: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -4212,7 +4181,7 @@ if test -z "$ac_cv_prog_OBJDUMP" ; then
>     # Extract the first word of "objdump", so it can be a program name with args.
> set dummy objdump; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:4216: checking for $ac_word" >&5
>+echo "configure:4185: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJDUMP'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -4258,7 +4227,7 @@ fi
>   # Extract the first word of "${ncn_target_tool_prefix}ar", so it can be a program name with args.
> set dummy ${ncn_target_tool_prefix}ar; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:4262: checking for $ac_word" >&5
>+echo "configure:4231: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_AR_FOR_TARGET'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -4291,7 +4260,7 @@ if test -z "$ac_cv_prog_CONFIGURED_AR_FO
>     # Extract the first word of "ar", so it can be a program name with args.
> set dummy ar; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:4295: checking for $ac_word" >&5
>+echo "configure:4264: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AR_FOR_TARGET'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -4330,7 +4299,7 @@ fi
>   # Extract the first word of "${ncn_target_tool_prefix}as", so it can be a program name with args.
> set dummy ${ncn_target_tool_prefix}as; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:4334: checking for $ac_word" >&5
>+echo "configure:4303: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_AS_FOR_TARGET'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -4363,7 +4332,7 @@ if test -z "$ac_cv_prog_CONFIGURED_AS_FO
>     # Extract the first word of "as", so it can be a program name with args.
> set dummy as; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:4367: checking for $ac_word" >&5
>+echo "configure:4336: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AS_FOR_TARGET'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -4402,7 +4371,7 @@ fi
>   # Extract the first word of "${ncn_target_tool_prefix}dlltool", so it can be a program name with args.
> set dummy ${ncn_target_tool_prefix}dlltool; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:4406: checking for $ac_word" >&5
>+echo "configure:4375: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -4435,7 +4404,7 @@ if test -z "$ac_cv_prog_CONFIGURED_DLLTO
>     # Extract the first word of "dlltool", so it can be a program name with args.
> set dummy dlltool; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:4439: checking for $ac_word" >&5
>+echo "configure:4408: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -4474,7 +4443,7 @@ fi
>   # Extract the first word of "${ncn_target_tool_prefix}ld", so it can be a program name with args.
> set dummy ${ncn_target_tool_prefix}ld; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:4478: checking for $ac_word" >&5
>+echo "configure:4447: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_LD_FOR_TARGET'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -4507,7 +4476,7 @@ if test -z "$ac_cv_prog_CONFIGURED_LD_FO
>     # Extract the first word of "ld", so it can be a program name with args.
> set dummy ld; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:4511: checking for $ac_word" >&5
>+echo "configure:4480: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_LD_FOR_TARGET'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -4546,7 +4515,7 @@ fi
>   # Extract the first word of "${ncn_target_tool_prefix}nm", so it can be a program name with args.
> set dummy ${ncn_target_tool_prefix}nm; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:4550: checking for $ac_word" >&5
>+echo "configure:4519: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_NM_FOR_TARGET'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -4579,7 +4548,7 @@ if test -z "$ac_cv_prog_CONFIGURED_NM_FO
>     # Extract the first word of "nm", so it can be a program name with args.
> set dummy nm; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:4583: checking for $ac_word" >&5
>+echo "configure:4552: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_NM_FOR_TARGET'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -4618,7 +4587,7 @@ fi
>   # Extract the first word of "${ncn_target_tool_prefix}ranlib", so it can be a program name with args.
> set dummy ${ncn_target_tool_prefix}ranlib; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:4622: checking for $ac_word" >&5
>+echo "configure:4591: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -4651,7 +4620,7 @@ if test -z "$ac_cv_prog_CONFIGURED_RANLI
>     # Extract the first word of "ranlib", so it can be a program name with args.
> set dummy ranlib; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:4655: checking for $ac_word" >&5
>+echo "configure:4624: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_RANLIB_FOR_TARGET'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -4690,7 +4659,7 @@ fi
>   # Extract the first word of "${ncn_target_tool_prefix}windres", so it can be a program name with args.
> set dummy ${ncn_target_tool_prefix}windres; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:4694: checking for $ac_word" >&5
>+echo "configure:4663: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -4723,7 +4692,7 @@ if test -z "$ac_cv_prog_CONFIGURED_WINDR
>     # Extract the first word of "windres", so it can be a program name with args.
> set dummy windres; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:4727: checking for $ac_word" >&5
>+echo "configure:4696: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_WINDRES_FOR_TARGET'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -4808,7 +4777,7 @@ RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${
> NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target}
> 
> echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
>-echo "configure:4812: checking whether to enable maintainer-specific portions of Makefiles" >&5
>+echo "configure:4781: checking whether to enable maintainer-specific portions of Makefiles" >&5
> # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
> if test "${enable_maintainer_mode+set}" = set; then
>   enableval="$enable_maintainer_mode"
>@@ -4855,7 +4824,7 @@ esac
> # gcc for stageN-gcc and stagePREV-gcc for stage(N-1).  In case this is not
> # possible, however, we can resort to mv.
> echo $ac_n "checking if symbolic links between directories work""... $ac_c" 1>&6
>-echo "configure:4859: checking if symbolic links between directories work" >&5
>+echo "configure:4828: checking if symbolic links between directories work" >&5
> if eval "test \"`echo '$''{'gcc_cv_prog_ln_s_dir'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -4989,15 +4958,34 @@ trap 'rm -f $CONFIG_STATUS conftest*; ex
> # Transform confdefs.h into DEFS.
> # Protect against shell expansion while executing Makefile rules.
> # Protect against Makefile macro expansion.
>-cat > conftest.defs <<\EOF
>-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
>-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
>-s%\[%\\&%g
>-s%\]%\\&%g
>-s%\$%$$%g
>-EOF
>-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
>-rm -f conftest.defs
>+#
>+# If the first sed substitution is executed (which looks for macros that
>+# take arguments), then we branch to the quote section.  Otherwise,
>+# look for a macro that doesn't take arguments.
>+cat >confdef2opt.sed <<\_ACEOF
>+t clear
>+: clear
>+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
>+t quote
>+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\),-D\1=\2,g
>+t quote
>+d
>+: quote
>+s,[ 	`~#$^&*(){}\\|;'"<>?],\\&,g
>+s,\[,\\&,g
>+s,\],\\&,g
>+s,\$,$$,g
>+p
>+_ACEOF
>+# We use echo to avoid assuming a particular line-breaking character.
>+# The extra dot is to prevent the shell from consuming trailing
>+# line-breaks from the sub-command output.  A line-break within
>+# single-quotes doesn't work because, if this script is created in a
>+# platform that uses two characters for line-breaks (e.g., DOS), tr
>+# would break.
>+ac_LF_and_DOT=`echo; echo .`
>+DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
>+rm -f confdef2opt.sed
> 
> 
> # Without the "./", some shells look in PATH for config.status.
>@@ -5089,9 +5077,6 @@ s%@INSTALL_DATA@%$INSTALL_DATA%g
> s%@LN@%$LN%g
> s%@LN_S@%$LN_S%g
> s%@TOPLEVEL_CONFIGURE_ARGUMENTS@%$TOPLEVEL_CONFIGURE_ARGUMENTS%g
>-s%@gcc_version_trigger@%$gcc_version_trigger%g
>-s%@gcc_version_full@%$gcc_version_full%g
>-s%@gcc_version@%$gcc_version%g
> s%@build_subdir@%$build_subdir%g
> s%@host_subdir@%$host_subdir%g
> s%@target_subdir@%$target_subdir%g
>===================================================================
>Index: configure.in
>--- configure.in	28 Feb 2005 13:24:59 -0000	1.343
>+++ configure.in	20 Mar 2005 00:15:09 -0000
>@@ -19,7 +19,6 @@
> ### WARNING: this file contains embedded tabs.  Do not run untabify on this file.
> 
> sinclude(config/acx.m4)
>-sinclude(config/gcc-version.m4)
> sinclude(config/gxx-include-dir.m4)
> 
> AC_INIT(move-if-change)
>@@ -101,22 +100,6 @@ topsrcdir=$srcpwd
> 
> extra_host_args=
> 
>-# Define the trigger file to make sure configure will re-run whenever
>-# the gcc version number changes.
>-TL_AC_GCC_VERSION([$topsrcdir])
>-if test -f $gcc_version_trigger ; then
>-  case "$ac_configure_args" in
>-    *--with-gcc-version-trigger=$gcc_version_trigger* )
>-      ;;
>-    * )
>-      # Add to all subconfigure arguments: build, host, and target.
>-      ac_configure_args="$ac_configure_args --with-gcc-version-trigger=$gcc_version_trigger"
>-      ;;
>-  esac
>-else
>-  gcc_version_trigger=
>-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.
>===================================================================
>Index: fixincludes/Makefile.in
>--- fixincludes/Makefile.in	23 Feb 2005 22:30:01 -0000	1.8
>+++ fixincludes/Makefile.in	20 Mar 2005 00:15:10 -0000
>@@ -49,10 +49,10 @@ target = @target@
> target_noncanonical:=@target_noncanonical@
> 
> # The version of GCC in this tree
>-gcc_version=@gcc_version@
>+gcc_version := $(shell cat $(srcdir)/../gcc/BASE-VER)
> 
> # Directory in which the compiler finds libraries etc.
>-libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(version)
>+libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)
> # Directory in which the compiler finds executables
> libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
> # Where our executable files go
>@@ -130,7 +130,7 @@ mostlyclean : 
> 	rm -f *.o *-stamp $(AF) $(FI) *~ fixinc.sh
> 
> clean: mostlyclean
>-	rm -f mkheaders
>+	rm -f mkheaders mkheaders.almost
> 
> distclean: clean
> 	rm -f Makefile config.h config.log config.status stamp-h
>@@ -143,8 +143,13 @@ distclean : clean
> Makefile: $(srcdir)/Makefile.in config.status
> 	$(SHELL) ./config.status Makefile
> 
>-mkheaders: $(srcdir)/mkheaders.in config.status
>-	CONFIG_FILES=mkheaders CONFIG_HEADERS= ./config.status
>+mkheaders.almost: $(srcdir)/mkheaders.in config.status
>+	CONFIG_FILES=mkheaders.almost:mkheaders.in \
>+	CONFIG_HEADERS= ./config.status
>+
>+mkheaders: mkheaders.almost $(srcdir)/../gcc/BASE-VER
>+	sed -e 's/@gcc_version@/$(gcc_version)/' < $< > $@T
>+	mv -f $@T $@
> 
> config.h: stamp-h
> stamp-h: $(srcdir)/config.h.in config.status
>===================================================================
>Index: fixincludes/aclocal.m4
>--- fixincludes/aclocal.m4	2 Dec 2004 11:03:21 -0000	1.2
>+++ fixincludes/aclocal.m4	20 Mar 2005 00:15:10 -0000
>@@ -1,6 +1,5 @@
> sinclude(../config/acx.m4)
> sinclude(../config/accross.m4)
>-sinclude(../config/gcc-version.m4)
> sinclude(../config/gettext.m4)
> sinclude(../config/progtest.m4)
> 
>===================================================================
>Index: fixincludes/configure
>--- fixincludes/configure	2 Dec 2004 11:03:21 -0000	1.5
>+++ fixincludes/configure	20 Mar 2005 00:15:11 -0000
>@@ -309,7 +309,7 @@ ac_includes_default="\
> # include <unistd.h>
> #endif"
> 
>-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT target_noncanonical TARGET gcc_version_trigger gcc_version_full gcc_version CPP EGREP MAINT LIBOBJS LTLIBOBJS'
>+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT target_noncanonical TARGET CPP EGREP MAINT LIBOBJS LTLIBOBJS'
> ac_subst_files=''
> 
> # Initialize some variables set by options.
>@@ -2425,23 +2425,6 @@ _ACEOF
> 
> fi
> 
>-
>-if test "${with_gcc_version_trigger+set}" = set; then
>-  gcc_version_trigger=$with_gcc_version_trigger
>-else
>-  gcc_version_trigger=$srcdir/../gcc/version.c
>-fi
>-if test -f "${gcc_version_trigger}"; then
>-  gcc_version_full=`grep version_string "${gcc_version_trigger}" | sed -e 's/.*"\([^"]*\)".*/\1/'`
>-else
>-  gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'`
>-fi
>-gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
>-
>-
>-
>-
>-
> case $host in
> 	vax-dec-bsd* )
> 
>@@ -4241,7 +4224,7 @@ fi
> 
>           ac_config_headers="$ac_config_headers config.h"
> 
>-                    ac_config_files="$ac_config_files Makefile mkheaders"
>+                    ac_config_files="$ac_config_files Makefile mkheaders.almost:mkheaders.in"
> 
> cat >confcache <<\_ACEOF
> # This file is a shell script that caches the results of configure
>@@ -4768,7 +4751,7 @@ do
>   case "$ac_config_target" in
>   # Handling of arguments.
>   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
>-  "mkheaders" ) CONFIG_FILES="$CONFIG_FILES mkheaders" ;;
>+  "mkheaders.almost" ) CONFIG_FILES="$CONFIG_FILES mkheaders.almost:mkheaders.in" ;;
>   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
>   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
> echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
>@@ -4875,9 +4858,6 @@ s,@EXEEXT@,$EXEEXT,;t t
> s,@OBJEXT@,$OBJEXT,;t t
> s,@target_noncanonical@,$target_noncanonical,;t t
> s,@TARGET@,$TARGET,;t t
>-s,@gcc_version_trigger@,$gcc_version_trigger,;t t
>-s,@gcc_version_full@,$gcc_version_full,;t t
>-s,@gcc_version@,$gcc_version,;t t
> s,@CPP@,$CPP,;t t
> s,@EGREP@,$EGREP,;t t
> s,@MAINT@,$MAINT,;t t
>===================================================================
>Index: fixincludes/configure.ac
>--- fixincludes/configure.ac	2 Dec 2004 11:03:21 -0000	1.5
>+++ fixincludes/configure.ac	20 Mar 2005 00:15:11 -0000
>@@ -52,8 +52,6 @@ if test $TARGET = twoprocess; then
> 		  [Define if testing and fixing are done by separate process])
> fi
> 
>-TL_AC_GCC_VERSION([$srcdir/..])
>-
> case $host in
> 	vax-dec-bsd* )
> 		AC_DEFINE(exit, xexit, [Define to xexit if the host system does not support atexit])
>@@ -94,5 +92,5 @@ fi	
> AC_SUBST(MAINT)
> 
> AC_CONFIG_HEADERS(config.h, [echo timestamp > stamp-h])
>-AC_CONFIG_FILES(Makefile mkheaders)
>+AC_CONFIG_FILES(Makefile mkheaders.almost:mkheaders.in)
> AC_OUTPUT
>===================================================================
>Index: gcc/Makefile.in
>--- gcc/Makefile.in	16 Mar 2005 06:03:18 -0000	1.1454
>+++ gcc/Makefile.in	20 Mar 2005 00:15:13 -0000
>@@ -685,24 +685,24 @@ GTM_H     = tm.h      $(tm_file_list)
> TM_H      = $(GTM_H) insn-constants.h insn-flags.h
> 
> # Variables for version information.
>-BASEVER   = $(srcdir)/BASE-VER  # 4.x.y
>-DEVPHASE  = $(srcdir)/DEV-PHASE # experimental, prerelease, ""
>-DATESTAMP = $(srcdir)/DATESTAMP # YYYYMMDD or empty
>-
>-BASEVER_c   = $(shell cat $(BASEVER))
>-DEVPHASE_c  = $(shell cat $(DEVPHASE))
>-DATESTAMP_c = $(shell cat $(DATESTAMP))
>+BASEVER     := $(srcdir)/BASE-VER  # 4.x.y
>+DEVPHASE    := $(srcdir)/DEV-PHASE # experimental, prerelease, ""
>+DATESTAMP   := $(srcdir)/DATESTAMP # YYYYMMDD or empty
>+
>+BASEVER_c   := $(shell cat $(BASEVER))
>+DEVPHASE_c  := $(shell cat $(DEVPHASE))
>+DATESTAMP_c := $(shell cat $(DATESTAMP))
> 
>-version     = $(BASEVER_c)
>+version     := $(BASEVER_c)
> 
> # For use in version.c - double quoted strings, with appropriate
> # surrounding punctuation and spaces, and with the datestamp and
> # development phase collapsed to the empty string in release mode
> # (i.e. if DEVPHASE_c is empty).  The space immediately after the
> # comma in the $(if ...) constructs is significant - do not remove it.
>-BASEVER_s   = "\"$(BASEVER_c)\""
>-DEVPHASE_s  = "\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\""
>-DATESTAMP_s = "\"$(if $(DEVPHASE_c), $(DATESTAMP_c))\""
>+BASEVER_s   := "\"$(BASEVER_c)\""
>+DEVPHASE_s  := "\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\""
>+DATESTAMP_s := "\"$(if $(DEVPHASE_c), $(DATESTAMP_c))\""
> 
> # Shorthand variables for dependency lists.
> TARGET_H = $(TM_H) target.h insn-modes.h
>@@ -3424,6 +3424,13 @@ install-include-dir: installdirs
> 	mkdir $(DESTDIR)$(libsubdir)/include
> 	-chmod a+rx $(DESTDIR)$(libsubdir)/include
> 
>+# Create or recreate the install-tools include file directory.
>+itoolsdir = $(libexecsubdir)/install-tools
>+itoolsdatadir = $(libsubdir)/install-tools
>+install-itoolsdirs: installdirs
>+	$(mkinstalldirs) $(DESTDIR)$(itoolsdatadir)/include
>+	$(mkinstalldirs) $(DESTDIR)$(itoolsdir)
>+
> # Install the include directory using tar.
> install-headers-tar: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir
> # We use `pwd`/include instead of just include to problems with CDPATH
>@@ -3446,10 +3453,8 @@ install-headers-cpio: stmp-int-hdrs $(ST
> install-headers-cp: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir
> 	cp -p -r include $(DESTDIR)$(libsubdir)
> 
>-itoolsdir = $(libexecsubdir)/install-tools
>-itoolsdatadir = $(libsubdir)/install-tools
> # Install supporting files for fixincludes to be run later.
>-install-mkheaders: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir \
>+install-mkheaders: stmp-int-hdrs $(STMP_FIXPROTO) install-itoolsdirs \
>   macro_list xlimits.h
> 	for file in $(USER_H); do \
> 	  realfile=`echo $$file | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
>===================================================================
>Index: libffi/Makefile.in
>--- libffi/Makefile.in	8 Dec 2004 15:48:53 -0000	1.48
>+++ libffi/Makefile.in	20 Mar 2005 00:16:09 -0000
>@@ -68,7 +68,6 @@ DIST_COMMON = README $(am__configure_dep
> subdir = .
> ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
> am__aclocal_m4_deps = $(top_srcdir)/../config/accross.m4 \
>-	$(top_srcdir)/../config/gcc-version.m4 \
> 	$(top_srcdir)/../libtool.m4 $(top_srcdir)/acinclude.m4 \
> 	$(top_srcdir)/configure.ac
> am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>@@ -299,9 +298,6 @@ build_os = @build_os@
> build_vendor = @build_vendor@
> datadir = @datadir@
> exec_prefix = @exec_prefix@
>-gcc_version = @gcc_version@
>-gcc_version_full = @gcc_version_full@
>-gcc_version_trigger = @gcc_version_trigger@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
>@@ -327,7 +323,6 @@ target_alias = @target_alias@
> target_cpu = @target_cpu@
> target_os = @target_os@
> target_vendor = @target_vendor@
>-tool_include_dir = @tool_include_dir@
> toolexecdir = @toolexecdir@
> toolexeclibdir = @toolexeclibdir@
> AUTOMAKE_OPTIONS = foreign subdir-objects
>===================================================================
>Index: libffi/aclocal.m4
>--- libffi/aclocal.m4	2 Dec 2004 11:04:21 -0000	1.12
>+++ libffi/aclocal.m4	20 Mar 2005 00:16:09 -0000
>@@ -1200,6 +1200,5 @@ AC_SUBST([am__untar])
> ]) # _AM_PROG_TAR
> 
> m4_include([../config/accross.m4])
>-m4_include([../config/gcc-version.m4])
> m4_include([../libtool.m4])
> m4_include([acinclude.m4])
>===================================================================
>Index: libffi/configure
>--- libffi/configure	2 Dec 2004 11:04:21 -0000	1.71
>+++ libffi/configure	20 Mar 2005 00:16:10 -0000
>@@ -310,7 +310,7 @@ ac_includes_default="\
> # include <unistd.h>
> #endif"
> 
>-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS multi_basedir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CFLAGS CCAS CCASFLAGS LN_S RANLIB ac_ct_RANLIB LIBTOOL MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CPP CPPFLAGS EGREP TESTSUBDIR_TRUE TESTSUBDIR_FALSE AM_RUNTESTFLAGS MIPS_IRIX_TRUE MIPS_IRIX_FALSE MIPS_LINUX_TRUE MIPS_LINUX_FALSE SPARC_TRUE SPARC_FALSE X86_TRUE X86_FALSE X86_WIN32_TRUE X86_WIN32_FALSE ALPHA_TRUE ALPHA_FALSE IA64_TRUE IA64_FALSE M32R_TRUE M32R_FALSE M68K_TRUE M68K_FALSE POWERPC_TRUE POWERPC_FALSE POWERPC_AIX_TRUE POWERPC_AIX_FALSE POWERPC_DARWIN_TRUE POWERPC_DARWIN_FALSE ARM_TRUE ARM_FALSE FRV_TRUE FRV_FALSE S390_TRUE S390_FALSE X86_64_TRUE X86_64_FALSE SH_TRUE SH_FALSE SH64_TRUE SH64_FALSE PA_TRUE PA_FALSE ALLOCA HAVE_LONG_DOUBLE TARGET TARGETDIR toolexecdir toolexeclibdir gcc_version_trigger gcc_version_full gcc_version tool_include_dir LIBOBJS LTLIBOBJS'
>+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS multi_basedir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CFLAGS CCAS CCASFLAGS LN_S RANLIB ac_ct_RANLIB LIBTOOL MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CPP CPPFLAGS EGREP TESTSUBDIR_TRUE TESTSUBDIR_FALSE AM_RUNTESTFLAGS MIPS_IRIX_TRUE MIPS_IRIX_FALSE MIPS_LINUX_TRUE MIPS_LINUX_FALSE SPARC_TRUE SPARC_FALSE X86_TRUE X86_FALSE X86_WIN32_TRUE X86_WIN32_FALSE ALPHA_TRUE ALPHA_FALSE IA64_TRUE IA64_FALSE M32R_TRUE M32R_FALSE M68K_TRUE M68K_FALSE POWERPC_TRUE POWERPC_FALSE POWERPC_AIX_TRUE POWERPC_AIX_FALSE POWERPC_DARWIN_TRUE POWERPC_DARWIN_FALSE ARM_TRUE ARM_FALSE FRV_TRUE FRV_FALSE S390_TRUE S390_FALSE X86_64_TRUE X86_64_FALSE SH_TRUE SH_FALSE SH64_TRUE SH64_FALSE PA_TRUE PA_FALSE ALLOCA HAVE_LONG_DOUBLE TARGET TARGETDIR toolexecdir toolexeclibdir LIBOBJS LTLIBOBJS'
> ac_subst_files=''
> 
> # Initialize some variables set by options.
>@@ -6795,27 +6795,6 @@ esac
> 
> 
> 
>-
>-if test "${with_gcc_version_trigger+set}" = set; then
>-  gcc_version_trigger=$with_gcc_version_trigger
>-else
>-  gcc_version_trigger=$srcdir/../gcc/version.c
>-fi
>-if test -f "${gcc_version_trigger}"; then
>-  gcc_version_full=`grep version_string "${gcc_version_trigger}" | sed -e 's/.*"\([^"]*\)".*/\1/'`
>-else
>-  gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'`
>-fi
>-gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
>-
>-
>-
>-
>-
>-#Figure out where generated headers like ffitarget.h get installed.
>-tool_include_dir='$(libdir)/gcc/$(target_alias)/'${gcc_version}/include
>-
>-
> if test "${multilib}" = "yes"; then
>   multilib_arg="--enable-multilib"
> else
>@@ -7748,10 +7727,6 @@ s,@TARGET@,$TARGET,;t t
> s,@TARGETDIR@,$TARGETDIR,;t t
> s,@toolexecdir@,$toolexecdir,;t t
> s,@toolexeclibdir@,$toolexeclibdir,;t t
>-s,@gcc_version_trigger@,$gcc_version_trigger,;t t
>-s,@gcc_version_full@,$gcc_version_full,;t t
>-s,@gcc_version@,$gcc_version,;t t
>-s,@tool_include_dir@,$tool_include_dir,;t t
> s,@LIBOBJS@,$LIBOBJS,;t t
> s,@LTLIBOBJS@,$LTLIBOBJS,;t t
> CEOF
>===================================================================
>Index: libffi/configure.ac
>--- libffi/configure.ac	2 Dec 2004 11:04:21 -0000	1.9
>+++ libffi/configure.ac	20 Mar 2005 00:16:10 -0000
>@@ -226,12 +226,6 @@ esac
> AC_SUBST(toolexecdir)
> AC_SUBST(toolexeclibdir)
> 
>-TL_AC_GCC_VERSION([$srcdir/..])
>-
>-#Figure out where generated headers like ffitarget.h get installed.
>-tool_include_dir='$(libdir)/gcc/$(target_alias)/'${gcc_version}/include
>-AC_SUBST(tool_include_dir)
>-
> if test "${multilib}" = "yes"; then
>   multilib_arg="--enable-multilib"
> else
>===================================================================
>Index: libffi/include/Makefile.am
>--- libffi/include/Makefile.am	12 Nov 2003 18:18:30 -0000	1.3
>+++ libffi/include/Makefile.am	20 Mar 2005 00:16:10 -0000
>@@ -9,5 +9,8 @@ hackdir=$(includedir)
> 
> hack_DATA= ffi.h
> 
>-toollibffidir = @tool_include_dir@/libffi
>+# Where generated headers like ffitarget.h get installed.
>+gcc_version   := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
>+toollibffidir := $(libdir)/gcc/$(target_alias)/$(gcc_version)/include/libffi
>+
> toollibffi_HEADERS = ffitarget.h
>===================================================================
>Index: libffi/include/Makefile.in
>--- libffi/include/Makefile.in	2 Dec 2004 11:05:08 -0000	1.19
>+++ libffi/include/Makefile.in	20 Mar 2005 00:16:10 -0000
>@@ -43,7 +43,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(sr
> 	$(srcdir)/ffi.h.in $(toollibffi_HEADERS)
> ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
> am__aclocal_m4_deps = $(top_srcdir)/../config/accross.m4 \
>-	$(top_srcdir)/../config/gcc-version.m4 \
> 	$(top_srcdir)/../libtool.m4 $(top_srcdir)/acinclude.m4 \
> 	$(top_srcdir)/configure.ac
> am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>@@ -179,9 +178,6 @@ build_os = @build_os@
> build_vendor = @build_vendor@
> datadir = @datadir@
> exec_prefix = @exec_prefix@
>-gcc_version = @gcc_version@
>-gcc_version_full = @gcc_version_full@
>-gcc_version_trigger = @gcc_version_trigger@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
>@@ -207,7 +203,6 @@ target_alias = @target_alias@
> target_cpu = @target_cpu@
> target_os = @target_os@
> target_vendor = @target_vendor@
>-tool_include_dir = @tool_include_dir@
> toolexecdir = @toolexecdir@
> toolexeclibdir = @toolexeclibdir@
> AUTOMAKE_OPTIONS = foreign
>@@ -215,7 +210,10 @@ DISTCLEANFILES = ffitarget.h
> EXTRA_DIST = ffi.h.in ffi_common.h
> hackdir = $(includedir)
> hack_DATA = ffi.h
>-toollibffidir = @tool_include_dir@/libffi
>+
>+# Where generated headers like ffitarget.h get installed.
>+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
>+toollibffidir := $(libdir)/gcc/$(target_alias)/$(gcc_version)/include/libffi
> toollibffi_HEADERS = ffitarget.h
> all: all-am
> 
>===================================================================
>Index: libffi/testsuite/Makefile.in
>--- libffi/testsuite/Makefile.in	2 Dec 2004 11:05:09 -0000	1.10
>+++ libffi/testsuite/Makefile.in	20 Mar 2005 00:16:10 -0000
>@@ -40,7 +40,6 @@ subdir = testsuite
> DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
> am__aclocal_m4_deps = $(top_srcdir)/../config/accross.m4 \
>-	$(top_srcdir)/../config/gcc-version.m4 \
> 	$(top_srcdir)/../libtool.m4 $(top_srcdir)/acinclude.m4 \
> 	$(top_srcdir)/configure.ac
> am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>@@ -165,9 +164,6 @@ build_os = @build_os@
> build_vendor = @build_vendor@
> datadir = @datadir@
> exec_prefix = @exec_prefix@
>-gcc_version = @gcc_version@
>-gcc_version_full = @gcc_version_full@
>-gcc_version_trigger = @gcc_version_trigger@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
>@@ -193,7 +189,6 @@ target_alias = @target_alias@
> target_cpu = @target_cpu@
> target_os = @target_os@
> target_vendor = @target_vendor@
>-tool_include_dir = @tool_include_dir@
> toolexecdir = @toolexecdir@
> toolexeclibdir = @toolexeclibdir@
> AUTOMAKE_OPTIONS = foreign dejagnu
>===================================================================
>Index: libgfortran/Makefile.am
>--- libgfortran/Makefile.am	23 Jan 2005 17:00:58 -0000	1.29
>+++ libgfortran/Makefile.am	20 Mar 2005 00:16:10 -0000
>@@ -5,6 +5,9 @@
> AM_CFLAGS = -std=gnu99
> ACLOCAL_AMFLAGS = -I ../config
> 
>+## May be used by toolexeclibdir.
>+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
>+
> toolexeclib_LTLIBRARIES = libgfortran.la libgfortranbegin.la
> 
> libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lm
>===================================================================
>Index: libgfortran/Makefile.in
>--- libgfortran/Makefile.in	23 Jan 2005 17:00:58 -0000	1.30
>+++ libgfortran/Makefile.in	20 Mar 2005 00:16:10 -0000
>@@ -1,4 +1,4 @@
>-# Makefile.in generated by automake 1.9.4 from Makefile.am.
>+# Makefile.in generated by automake 1.9.3 from Makefile.am.
> # @configure_input@
> 
> # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
>@@ -47,8 +47,7 @@ DIST_COMMON = README $(am__configure_dep
> 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS
> subdir = .
> ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-am__aclocal_m4_deps = $(top_srcdir)/../config/gcc-version.m4 \
>-	$(top_srcdir)/../config/no-executables.m4 \
>+am__aclocal_m4_deps = $(top_srcdir)/../config/no-executables.m4 \
> 	$(top_srcdir)/acinclude.m4 $(top_srcdir)/../libtool.m4 \
> 	$(top_srcdir)/configure.ac
> am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
>@@ -266,9 +265,6 @@ datadir = @datadir@
> enable_shared = @enable_shared@
> enable_static = @enable_static@
> exec_prefix = @exec_prefix@
>-gcc_version = @gcc_version@
>-gcc_version_full = @gcc_version_full@
>-gcc_version_trigger = @gcc_version_trigger@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
>@@ -298,6 +294,7 @@ toolexecdir = @toolexecdir@
> toolexeclibdir = @toolexeclibdir@
> AM_CFLAGS = -std=gnu99
> ACLOCAL_AMFLAGS = -I ../config
>+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
> toolexeclib_LTLIBRARIES = libgfortran.la libgfortranbegin.la
> libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lm
> libgfortranbegin_la_SOURCES = fmain.c
>===================================================================
>Index: libgfortran/aclocal.m4
>--- libgfortran/aclocal.m4	2 Dec 2004 11:04:22 -0000	1.6
>+++ libgfortran/aclocal.m4	20 Mar 2005 00:16:10 -0000
>@@ -817,6 +817,5 @@ AC_SUBST([am__tar])
> AC_SUBST([am__untar])
> ]) # _AM_PROG_TAR
> 
>-m4_include([../config/gcc-version.m4])
> m4_include([../config/no-executables.m4])
> m4_include([acinclude.m4])
>===================================================================
>Index: libgfortran/configure
>--- libgfortran/configure	12 Dec 2004 08:59:01 -0000	1.26
>+++ libgfortran/configure	20 Mar 2005 00:16:12 -0000
>@@ -308,7 +308,7 @@ ac_includes_default="\
> # include <unistd.h>
> #endif"
> 
>-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT multi_basedir gcc_version_trigger gcc_version_full gcc_version toolexecdir toolexeclibdir CC ac_ct_CC EXEEXT OBJEXT CFLAGS AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB LN_S LIBTOOL enable_shared enable_static FC FCFLAGS LDFLAGS ac_ct_FC CPP CPPFLAGS EGREP MATH_OBJ LIBOBJS LTLIBOBJS'
>+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT multi_basedir toolexecdir toolexeclibdir CC ac_ct_CC EXEEXT OBJEXT CFLAGS AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB LN_S LIBTOOL enable_shared enable_static FC FCFLAGS LDFLAGS ac_ct_FC CPP CPPFLAGS EGREP MATH_OBJ LIBOBJS LTLIBOBJS'
> ac_subst_files=''
> 
> # Initialize some variables set by options.
>@@ -1962,23 +1962,6 @@ else
>   LIBGFOR_IS_NATIVE=true
> fi
> 
>-
>-if test "${with_gcc_version_trigger+set}" = set; then
>-  gcc_version_trigger=$with_gcc_version_trigger
>-else
>-  gcc_version_trigger=$srcdir/../gcc/version.c
>-fi
>-if test -f "${gcc_version_trigger}"; then
>-  gcc_version_full=`grep version_string "${gcc_version_trigger}" | sed -e 's/.*"\([^"]*\)".*/\1/'`
>-else
>-  gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'`
>-fi
>-gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
>-
>-
>-
>-
>-
> # Calculate toolexeclibdir
> # Also toolexecdir, though it's only used in toolexeclibdir
> case ${version_specific_libs} in
>@@ -1987,7 +1970,7 @@ case ${version_specific_libs} in
>     # and header files if --enable-version-specific-runtime-libs option
>     # is selected.
>     toolexecdir='$(libdir)/gcc/$(target_alias)'
>-    toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
>+    toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
>     ;;
>   no)
>     if test -n "$with_cross_host" &&
>@@ -4076,7 +4059,7 @@ test x"$pic_mode" = xno && libtool_flags
> case $host in
> *-*-irix6*)
>   # Find out which ABI we are using.
>-  echo '#line 4079 "configure"' > conftest.$ac_ext
>+  echo '#line 4062 "configure"' > conftest.$ac_ext
>   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>   (eval $ac_compile) 2>&5
>   ac_status=$?
>@@ -4467,7 +4450,7 @@ fi
> 
> 
> # Provide some information about the compiler.
>-echo "$as_me:4470:" \
>+echo "$as_me:4453:" \
>      "checking for Fortran compiler version" >&5
> ac_compiler=`set X $ac_compile; echo $2`
> { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
>@@ -12238,9 +12221,6 @@ s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MOD
> s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
> s,@MAINT@,$MAINT,;t t
> s,@multi_basedir@,$multi_basedir,;t t
>-s,@gcc_version_trigger@,$gcc_version_trigger,;t t
>-s,@gcc_version_full@,$gcc_version_full,;t t
>-s,@gcc_version@,$gcc_version,;t t
> s,@toolexecdir@,$toolexecdir,;t t
> s,@toolexeclibdir@,$toolexeclibdir,;t t
> s,@CC@,$CC,;t t
>===================================================================
>Index: libgfortran/configure.ac
>--- libgfortran/configure.ac	12 Dec 2004 08:59:02 -0000	1.20
>+++ libgfortran/configure.ac	20 Mar 2005 00:16:12 -0000
>@@ -68,8 +68,6 @@ else
>   LIBGFOR_IS_NATIVE=true
> fi
> 
>-TL_AC_GCC_VERSION([$srcdir/..])
>-
> # Calculate toolexeclibdir
> # Also toolexecdir, though it's only used in toolexeclibdir
> case ${version_specific_libs} in
>@@ -78,7 +76,7 @@ case ${version_specific_libs} in
>     # and header files if --enable-version-specific-runtime-libs option
>     # is selected.
>     toolexecdir='$(libdir)/gcc/$(target_alias)'
>-    toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
>+    toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
>     ;;
>   no)
>     if test -n "$with_cross_host" &&
>===================================================================
>Index: libjava/Makefile.am
>--- libjava/Makefile.am	17 Mar 2005 00:59:21 -0000	1.463
>+++ libjava/Makefile.am	20 Mar 2005 00:16:12 -0000
>@@ -4,6 +4,9 @@ AUTOMAKE_OPTIONS = foreign subdir-object
> 
> ACLOCAL_AMFLAGS = -I . -I ../config
> 
>+# May be used by various substitution variables.
>+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
>+
> ## Garbage collector conditionals.
> if USING_BOEHMGC
> BOEHMGC_SRC = boehm.cc
>===================================================================
>Index: libjava/Makefile.in
>--- libjava/Makefile.in	17 Mar 2005 00:59:22 -0000	1.494
>+++ libjava/Makefile.in	20 Mar 2005 00:16:12 -0000
>@@ -59,16 +59,14 @@ DIST_COMMON = README $(am__configure_dep
> 	ChangeLog NEWS THANKS
> subdir = .
> ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-am__aclocal_m4_deps = $(top_srcdir)/pkg.m4 \
>-	$(top_srcdir)/../config/accross.m4 \
>+am__aclocal_m4_deps = $(top_srcdir)/../config/accross.m4 \
> 	$(top_srcdir)/../config/acx.m4 \
>-	$(top_srcdir)/../config/gcc-version.m4 \
> 	$(top_srcdir)/../config/gxx-include-dir.m4 \
> 	$(top_srcdir)/../config/iconv.m4 \
> 	$(top_srcdir)/../config/lcmessage.m4 \
> 	$(top_srcdir)/../config/lib-ld.m4 \
> 	$(top_srcdir)/../config/lib-link.m4 \
>-	$(top_srcdir)/../config/lib-prefix.m4 \
>+	$(top_srcdir)/../config/lib-prefix.m4 $(top_srcdir)/pkg.m4 \
> 	$(top_srcdir)/acinclude.m4 \
> 	$(top_srcdir)/../config/no-executables.m4 \
> 	$(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
>@@ -5016,9 +5014,6 @@ build_subdir = @build_subdir@
> build_vendor = @build_vendor@
> datadir = @datadir@
> exec_prefix = @exec_prefix@
>-gcc_version = @gcc_version@
>-gcc_version_full = @gcc_version_full@
>-gcc_version_trigger = @gcc_version_trigger@
> gxx_include_dir = @gxx_include_dir@
> here = @here@
> host = @host@
>@@ -5054,12 +5049,14 @@ target_noncanonical = @target_noncanonic
> target_os = @target_os@
> target_subdir = @target_subdir@
> target_vendor = @target_vendor@
>-tool_include_dir = @tool_include_dir@
> toolexecdir = @toolexecdir@
> toolexeclibdir = @toolexeclibdir@
> toolexecmainlibdir = @toolexecmainlibdir@
> AUTOMAKE_OPTIONS = foreign subdir-objects
> ACLOCAL_AMFLAGS = -I . -I ../config
>+
>+# May be used by various substitution variables.
>+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
> @USING_BOEHMGC_FALSE@BOEHMGC_SRC = 
> @USING_BOEHMGC_TRUE@BOEHMGC_SRC = boehm.cc
> @USING_NOGC_FALSE@NOGC_SRC = 
>===================================================================
>Index: libjava/aclocal.m4
>--- libjava/aclocal.m4	17 Mar 2005 00:59:28 -0000	1.55
>+++ libjava/aclocal.m4	20 Mar 2005 00:16:12 -0000
>@@ -924,14 +924,13 @@ AC_SUBST([am__tar])
> AC_SUBST([am__untar])
> ]) # _AM_PROG_TAR
> 
>-m4_include([pkg.m4])
> m4_include([../config/accross.m4])
> m4_include([../config/acx.m4])
>-m4_include([../config/gcc-version.m4])
> m4_include([../config/gxx-include-dir.m4])
> m4_include([../config/iconv.m4])
> m4_include([../config/lcmessage.m4])
> m4_include([../config/lib-ld.m4])
> m4_include([../config/lib-link.m4])
> m4_include([../config/lib-prefix.m4])
>+m4_include([pkg.m4])
> m4_include([acinclude.m4])
>===================================================================
>Index: libjava/configure
>--- libjava/configure	10 Mar 2005 19:02:08 -0000	1.255
>+++ libjava/configure	20 Mar 2005 00:16:13 -0000
>@@ -310,7 +310,7 @@ ac_includes_default="\
> # include <unistd.h>
> #endif"
> 
>-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_subdir host_subdir target_subdir libgcj_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE ONESTEP_TRUE ONESTEP_FALSE LIBGCJDEBUG INTERPRETER LIBFFI LIBFFIINCS PLATFORM_INNER_NAT_HDRS CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_ECOS_PLATFORM_TRUE USING_ECOS_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GTK_AWT_TRUE GTK_AWT_FALSE GTK_CAIRO_TRUE GTK_CAIRO_FALSE PKG_CONFIG CAIRO_CFLAGS CAIRO_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE gcc_version_trigger gcc_version_full gcc_version tool_include_dir LIBICONV LTLIBICONV GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS SUPPLY_BACKTRACE_TRUE SUPPLY_BACKTRACE_FALSE GCJH ZIP CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION gxx_include_dir libstdcxx_incdir ALLOCA PERL BACKTRACESPEC SYSDEP_SOURCES here LIBOBJS LTLIBOBJS'
>+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_subdir host_subdir target_subdir libgcj_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE ONESTEP_TRUE ONESTEP_FALSE LIBGCJDEBUG INTERPRETER LIBFFI LIBFFIINCS PLATFORM_INNER_NAT_HDRS CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_ECOS_PLATFORM_TRUE USING_ECOS_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GTK_AWT_TRUE GTK_AWT_FALSE GTK_CAIRO_TRUE GTK_CAIRO_FALSE PKG_CONFIG CAIRO_CFLAGS CAIRO_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS SUPPLY_BACKTRACE_TRUE SUPPLY_BACKTRACE_FALSE GCJH ZIP CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION gxx_include_dir libstdcxx_incdir ALLOCA PERL BACKTRACESPEC SYSDEP_SOURCES here LIBOBJS LTLIBOBJS'
> ac_subst_files=''
> 
> # Initialize some variables set by options.
>@@ -8471,7 +8471,6 @@ fi
> 
> 
> 
>-
> if test "$GCC" = yes; then
>   USING_GCC_TRUE=
>   USING_GCC_FALSE='#'
>@@ -8484,27 +8483,6 @@ fi
> # We're in the tree with gcc, and need to include some of its headers.
> GCC_UNWIND_INCLUDE='-I$(libgcj_basedir)/../gcc'
> 
>-
>-if test "${with_gcc_version_trigger+set}" = set; then
>-  gcc_version_trigger=$with_gcc_version_trigger
>-else
>-  gcc_version_trigger=$srcdir/../gcc/version.c
>-fi
>-if test -f "${gcc_version_trigger}"; then
>-  gcc_version_full=`grep version_string "${gcc_version_trigger}" | sed -e 's/.*"\([^"]*\)".*/\1/'`
>-else
>-  gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'`
>-fi
>-gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
>-
>-
>-
>-
>-
>-# Figure out where generated headers like libgcj-config.h get installed.
>-tool_include_dir='$(libdir)/gcc/$(target_noncanonical)/'${gcc_version}/include
>-
>-
> if test "x${with_newlib}" = "xyes"; then
>    # We are being configured with a cross compiler.  AC_REPLACE_FUNCS
>    # may not work correctly, because the compiler may not be able to
>@@ -13814,9 +13792,9 @@ case ${version_specific_libs} in
>     # Need the gcc compiler version to know where to install libraries
>     # and header files if --enable-version-specific-runtime-libs option
>     # is selected.
>-    includedir='${libdir}/gcc/${target_noncanonical}/'$gcc_version/include/
>+    includedir='$(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include/'
>     toolexecdir='$(libdir)/gcc/$(target_noncanonical)'
>-    toolexecmainlibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
>+    toolexecmainlibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
>     toolexeclibdir=$toolexecmainlibdir
>     ;;
>   no)
>@@ -16728,10 +16706,6 @@ s,@USING_NO_THREADS_FALSE@,$USING_NO_THR
> s,@HASH_SYNC_SPEC@,$HASH_SYNC_SPEC,;t t
> s,@USING_GCC_TRUE@,$USING_GCC_TRUE,;t t
> s,@USING_GCC_FALSE@,$USING_GCC_FALSE,;t t
>-s,@gcc_version_trigger@,$gcc_version_trigger,;t t
>-s,@gcc_version_full@,$gcc_version_full,;t t
>-s,@gcc_version@,$gcc_version,;t t
>-s,@tool_include_dir@,$tool_include_dir,;t t
> s,@LIBICONV@,$LIBICONV,;t t
> s,@LTLIBICONV@,$LTLIBICONV,;t t
> s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t
>===================================================================
>Index: libjava/configure.ac
>--- libjava/configure.ac	10 Mar 2005 19:02:16 -0000	1.21
>+++ libjava/configure.ac	20 Mar 2005 00:16:13 -0000
>@@ -720,18 +720,11 @@ if test "$enable_hash_synchronization" =
> fi
> AC_SUBST(HASH_SYNC_SPEC)
> 
>-
> AM_CONDITIONAL(USING_GCC, test "$GCC" = yes)
> 
> # We're in the tree with gcc, and need to include some of its headers.
> GCC_UNWIND_INCLUDE='-I$(libgcj_basedir)/../gcc'
> 
>-TL_AC_GCC_VERSION([$srcdir/..])
>-
>-# Figure out where generated headers like libgcj-config.h get installed.
>-tool_include_dir='$(libdir)/gcc/$(target_noncanonical)/'${gcc_version}/include
>-AC_SUBST(tool_include_dir)
>-
> if test "x${with_newlib}" = "xyes"; then
>    # We are being configured with a cross compiler.  AC_REPLACE_FUNCS
>    # may not work correctly, because the compiler may not be able to
>@@ -1171,9 +1164,9 @@ case ${version_specific_libs} in
>     # Need the gcc compiler version to know where to install libraries
>     # and header files if --enable-version-specific-runtime-libs option
>     # is selected.
>-    includedir='${libdir}/gcc/${target_noncanonical}/'$gcc_version/include/
>+    includedir='$(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include/'
>     toolexecdir='$(libdir)/gcc/$(target_noncanonical)'
>-    toolexecmainlibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
>+    toolexecmainlibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
>     toolexeclibdir=$toolexecmainlibdir
>     ;;
>   no)
>===================================================================
>Index: libjava/external/Makefile.am
>--- libjava/external/Makefile.am	2 Feb 2005 00:41:49 -0000	1.1
>+++ libjava/external/Makefile.am	20 Mar 2005 00:16:13 -0000
>@@ -1,5 +1,8 @@
> ## Input file for automake to generate the Makefile.in used by configure
> 
>+# May be used by various substitution variables.
>+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
>+
> SUBDIRS = sax w3c_dom
> 
> # Work around what appears to be a GNU make bug handling MAKEFLAGS
>===================================================================
>Index: libjava/external/Makefile.in
>--- libjava/external/Makefile.in	17 Mar 2005 00:59:32 -0000	1.3
>+++ libjava/external/Makefile.in	20 Mar 2005 00:16:13 -0000
>@@ -39,16 +39,14 @@ target_triplet = @target@
> subdir = external
> DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-am__aclocal_m4_deps = $(top_srcdir)/pkg.m4 \
>-	$(top_srcdir)/../config/accross.m4 \
>+am__aclocal_m4_deps = $(top_srcdir)/../config/accross.m4 \
> 	$(top_srcdir)/../config/acx.m4 \
>-	$(top_srcdir)/../config/gcc-version.m4 \
> 	$(top_srcdir)/../config/gxx-include-dir.m4 \
> 	$(top_srcdir)/../config/iconv.m4 \
> 	$(top_srcdir)/../config/lcmessage.m4 \
> 	$(top_srcdir)/../config/lib-ld.m4 \
> 	$(top_srcdir)/../config/lib-link.m4 \
>-	$(top_srcdir)/../config/lib-prefix.m4 \
>+	$(top_srcdir)/../config/lib-prefix.m4 $(top_srcdir)/pkg.m4 \
> 	$(top_srcdir)/acinclude.m4 \
> 	$(top_srcdir)/../config/no-executables.m4 \
> 	$(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
>@@ -252,9 +250,6 @@ build_subdir = @build_subdir@
> build_vendor = @build_vendor@
> datadir = @datadir@
> exec_prefix = @exec_prefix@
>-gcc_version = @gcc_version@
>-gcc_version_full = @gcc_version_full@
>-gcc_version_trigger = @gcc_version_trigger@
> gxx_include_dir = @gxx_include_dir@
> here = @here@
> host = @host@
>@@ -288,10 +283,12 @@ target_noncanonical = @target_noncanonic
> target_os = @target_os@
> target_subdir = @target_subdir@
> target_vendor = @target_vendor@
>-tool_include_dir = @tool_include_dir@
> toolexecdir = @toolexecdir@
> toolexeclibdir = @toolexeclibdir@
> toolexecmainlibdir = @toolexecmainlibdir@
>+
>+# May be used by various substitution variables.
>+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
> SUBDIRS = sax w3c_dom
> 
> # Work around what appears to be a GNU make bug handling MAKEFLAGS
>===================================================================
>Index: libjava/external/sax/Makefile.am
>--- libjava/external/sax/Makefile.am	10 Feb 2005 18:33:53 -0000	1.2
>+++ libjava/external/sax/Makefile.am	20 Mar 2005 00:16:13 -0000
>@@ -2,6 +2,9 @@
> 
> AUTOMAKE_OPTIONS = foreign subdir-objects
> 
>+# May be used by various substitution variables.
>+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
>+
> ## The compiler with whatever flags we want for both -c and -C
> ## compiles.
> GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH)
>===================================================================
>Index: libjava/external/sax/Makefile.in
>--- libjava/external/sax/Makefile.in	17 Mar 2005 00:59:31 -0000	1.4
>+++ libjava/external/sax/Makefile.in	20 Mar 2005 00:16:19 -0000
>@@ -42,16 +42,14 @@ target_triplet = @target@
> subdir = external/sax
> DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-am__aclocal_m4_deps = $(top_srcdir)/pkg.m4 \
>-	$(top_srcdir)/../config/accross.m4 \
>+am__aclocal_m4_deps = $(top_srcdir)/../config/accross.m4 \
> 	$(top_srcdir)/../config/acx.m4 \
>-	$(top_srcdir)/../config/gcc-version.m4 \
> 	$(top_srcdir)/../config/gxx-include-dir.m4 \
> 	$(top_srcdir)/../config/iconv.m4 \
> 	$(top_srcdir)/../config/lcmessage.m4 \
> 	$(top_srcdir)/../config/lib-ld.m4 \
> 	$(top_srcdir)/../config/lib-link.m4 \
>-	$(top_srcdir)/../config/lib-prefix.m4 \
>+	$(top_srcdir)/../config/lib-prefix.m4 $(top_srcdir)/pkg.m4 \
> 	$(top_srcdir)/acinclude.m4 \
> 	$(top_srcdir)/../config/no-executables.m4 \
> 	$(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
>@@ -289,9 +287,6 @@ build_subdir = @build_subdir@
> build_vendor = @build_vendor@
> datadir = @datadir@
> exec_prefix = @exec_prefix@
>-gcc_version = @gcc_version@
>-gcc_version_full = @gcc_version_full@
>-gcc_version_trigger = @gcc_version_trigger@
> gxx_include_dir = @gxx_include_dir@
> here = @here@
> host = @host@
>@@ -325,11 +320,13 @@ target_noncanonical = @target_noncanonic
> target_os = @target_os@
> target_subdir = @target_subdir@
> target_vendor = @target_vendor@
>-tool_include_dir = @tool_include_dir@
> toolexecdir = @toolexecdir@
> toolexeclibdir = @toolexeclibdir@
> toolexecmainlibdir = @toolexecmainlibdir@
> AUTOMAKE_OPTIONS = foreign subdir-objects
>+
>+# May be used by various substitution variables.
>+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
> GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH)
> BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir)'$(CLASSPATH_SEPARATOR)'$(top_srcdir)'$(CLASSPATH_SEPARATOR)'$(top_builddir)
> AM_GCJFLAGS = \
>===================================================================
>Index: libjava/external/w3c_dom/Makefile.am
>--- libjava/external/w3c_dom/Makefile.am	10 Feb 2005 18:33:54 -0000	1.2
>+++ libjava/external/w3c_dom/Makefile.am	20 Mar 2005 00:16:19 -0000
>@@ -2,6 +2,9 @@
> 
> AUTOMAKE_OPTIONS = foreign subdir-objects
> 
>+# May be used by various substitution variables.
>+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
>+
> ## The compiler with whatever flags we want for both -c and -C
> ## compiles.
> GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH)
>===================================================================
>Index: libjava/external/w3c_dom/Makefile.in
>--- libjava/external/w3c_dom/Makefile.in	17 Mar 2005 00:59:32 -0000	1.4
>+++ libjava/external/w3c_dom/Makefile.in	20 Mar 2005 00:16:19 -0000
>@@ -42,16 +42,14 @@ target_triplet = @target@
> subdir = external/w3c_dom
> DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-am__aclocal_m4_deps = $(top_srcdir)/pkg.m4 \
>-	$(top_srcdir)/../config/accross.m4 \
>+am__aclocal_m4_deps = $(top_srcdir)/../config/accross.m4 \
> 	$(top_srcdir)/../config/acx.m4 \
>-	$(top_srcdir)/../config/gcc-version.m4 \
> 	$(top_srcdir)/../config/gxx-include-dir.m4 \
> 	$(top_srcdir)/../config/iconv.m4 \
> 	$(top_srcdir)/../config/lcmessage.m4 \
> 	$(top_srcdir)/../config/lib-ld.m4 \
> 	$(top_srcdir)/../config/lib-link.m4 \
>-	$(top_srcdir)/../config/lib-prefix.m4 \
>+	$(top_srcdir)/../config/lib-prefix.m4 $(top_srcdir)/pkg.m4 \
> 	$(top_srcdir)/acinclude.m4 \
> 	$(top_srcdir)/../config/no-executables.m4 \
> 	$(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
>@@ -383,9 +381,6 @@ build_subdir = @build_subdir@
> build_vendor = @build_vendor@
> datadir = @datadir@
> exec_prefix = @exec_prefix@
>-gcc_version = @gcc_version@
>-gcc_version_full = @gcc_version_full@
>-gcc_version_trigger = @gcc_version_trigger@
> gxx_include_dir = @gxx_include_dir@
> here = @here@
> host = @host@
>@@ -419,11 +414,13 @@ target_noncanonical = @target_noncanonic
> target_os = @target_os@
> target_subdir = @target_subdir@
> target_vendor = @target_vendor@
>-tool_include_dir = @tool_include_dir@
> toolexecdir = @toolexecdir@
> toolexeclibdir = @toolexeclibdir@
> toolexecmainlibdir = @toolexecmainlibdir@
> AUTOMAKE_OPTIONS = foreign subdir-objects
>+
>+# May be used by various substitution variables.
>+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
> GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH)
> BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir)'$(CLASSPATH_SEPARATOR)'$(top_srcdir)'$(CLASSPATH_SEPARATOR)'$(top_builddir)
> AM_GCJFLAGS = \
>===================================================================
>Index: libjava/gcj/Makefile.am
>--- libjava/gcj/Makefile.am	3 Dec 2004 11:15:23 -0000	1.6
>+++ libjava/gcj/Makefile.am	20 Mar 2005 00:16:20 -0000
>@@ -2,11 +2,15 @@
> 
> AUTOMAKE_OPTIONS = foreign
> 
>+# May be used by various substitution variables.
>+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
>+
> # autoconf2.13's target_alias
> target_noncanonical = @target_noncanonical@
> 
> gcjdir = $(gxx_include_dir)/gcj
> gcj_HEADERS = array.h cni.h field.h javaprims.h method.h
> 
>-toolgcjdir = @tool_include_dir@/gcj
>+tool_include_dir := $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include
>+toolgcjdir       := $(tool_include_dir)/gcj
> toolgcj_HEADERS = libgcj-config.h
>===================================================================
>Index: libjava/gcj/Makefile.in
>--- libjava/gcj/Makefile.in	17 Mar 2005 00:59:29 -0000	1.64
>+++ libjava/gcj/Makefile.in	20 Mar 2005 00:16:20 -0000
>@@ -42,16 +42,14 @@ DIST_COMMON = $(gcj_HEADERS) $(srcdir)/M
> 	$(srcdir)/Makefile.in $(srcdir)/libgcj-config.h.in \
> 	$(toolgcj_HEADERS)
> ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-am__aclocal_m4_deps = $(top_srcdir)/pkg.m4 \
>-	$(top_srcdir)/../config/accross.m4 \
>+am__aclocal_m4_deps = $(top_srcdir)/../config/accross.m4 \
> 	$(top_srcdir)/../config/acx.m4 \
>-	$(top_srcdir)/../config/gcc-version.m4 \
> 	$(top_srcdir)/../config/gxx-include-dir.m4 \
> 	$(top_srcdir)/../config/iconv.m4 \
> 	$(top_srcdir)/../config/lcmessage.m4 \
> 	$(top_srcdir)/../config/lib-ld.m4 \
> 	$(top_srcdir)/../config/lib-link.m4 \
>-	$(top_srcdir)/../config/lib-prefix.m4 \
>+	$(top_srcdir)/../config/lib-prefix.m4 $(top_srcdir)/pkg.m4 \
> 	$(top_srcdir)/acinclude.m4 \
> 	$(top_srcdir)/../config/no-executables.m4 \
> 	$(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
>@@ -257,9 +255,6 @@ build_subdir = @build_subdir@
> build_vendor = @build_vendor@
> datadir = @datadir@
> exec_prefix = @exec_prefix@
>-gcc_version = @gcc_version@
>-gcc_version_full = @gcc_version_full@
>-gcc_version_trigger = @gcc_version_trigger@
> gxx_include_dir = @gxx_include_dir@
> here = @here@
> host = @host@
>@@ -295,14 +290,17 @@ target_noncanonical = @target_noncanonic
> target_os = @target_os@
> target_subdir = @target_subdir@
> target_vendor = @target_vendor@
>-tool_include_dir = @tool_include_dir@
> toolexecdir = @toolexecdir@
> toolexeclibdir = @toolexeclibdir@
> toolexecmainlibdir = @toolexecmainlibdir@
> AUTOMAKE_OPTIONS = foreign
>+
>+# May be used by various substitution variables.
>+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
> gcjdir = $(gxx_include_dir)/gcj
> gcj_HEADERS = array.h cni.h field.h javaprims.h method.h
>-toolgcjdir = @tool_include_dir@/gcj
>+tool_include_dir := $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include
>+toolgcjdir := $(tool_include_dir)/gcj
> toolgcj_HEADERS = libgcj-config.h
> all: libgcj-config.h
> 	$(MAKE) $(AM_MAKEFLAGS) all-am
>===================================================================
>Index: libjava/include/Makefile.am
>--- libjava/include/Makefile.am	14 Feb 2005 21:08:08 -0000	1.7
>+++ libjava/include/Makefile.am	20 Mar 2005 00:16:30 -0000
>@@ -2,7 +2,11 @@
> 
> AUTOMAKE_OPTIONS = foreign
> 
>+# May be used by various substitution variables.
>+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
>+
> # autoconf2.13's target_alias
> target_noncanonical = @target_noncanonical@
> 
>+tool_include_dir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include
> tool_include__HEADERS = jni.h jawt.h jawt_md.h jvmpi.h
>===================================================================
>Index: libjava/include/Makefile.in
>--- libjava/include/Makefile.in	17 Mar 2005 00:59:30 -0000	1.66
>+++ libjava/include/Makefile.in	20 Mar 2005 00:16:30 -0000
>@@ -41,16 +41,14 @@ subdir = include
> DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
> 	$(srcdir)/config.h.in $(tool_include__HEADERS)
> ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-am__aclocal_m4_deps = $(top_srcdir)/pkg.m4 \
>-	$(top_srcdir)/../config/accross.m4 \
>+am__aclocal_m4_deps = $(top_srcdir)/../config/accross.m4 \
> 	$(top_srcdir)/../config/acx.m4 \
>-	$(top_srcdir)/../config/gcc-version.m4 \
> 	$(top_srcdir)/../config/gxx-include-dir.m4 \
> 	$(top_srcdir)/../config/iconv.m4 \
> 	$(top_srcdir)/../config/lcmessage.m4 \
> 	$(top_srcdir)/../config/lib-ld.m4 \
> 	$(top_srcdir)/../config/lib-link.m4 \
>-	$(top_srcdir)/../config/lib-prefix.m4 \
>+	$(top_srcdir)/../config/lib-prefix.m4 $(top_srcdir)/pkg.m4 \
> 	$(top_srcdir)/acinclude.m4 \
> 	$(top_srcdir)/../config/no-executables.m4 \
> 	$(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
>@@ -256,9 +254,6 @@ build_subdir = @build_subdir@
> build_vendor = @build_vendor@
> datadir = @datadir@
> exec_prefix = @exec_prefix@
>-gcc_version = @gcc_version@
>-gcc_version_full = @gcc_version_full@
>-gcc_version_trigger = @gcc_version_trigger@
> gxx_include_dir = @gxx_include_dir@
> here = @here@
> host = @host@
>@@ -294,11 +289,14 @@ target_noncanonical = @target_noncanonic
> target_os = @target_os@
> target_subdir = @target_subdir@
> target_vendor = @target_vendor@
>-tool_include_dir = @tool_include_dir@
> toolexecdir = @toolexecdir@
> toolexeclibdir = @toolexeclibdir@
> toolexecmainlibdir = @toolexecmainlibdir@
> AUTOMAKE_OPTIONS = foreign
>+
>+# May be used by various substitution variables.
>+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
>+tool_include_dir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include
> tool_include__HEADERS = jni.h jawt.h jawt_md.h jvmpi.h
> all: config.h
> 	$(MAKE) $(AM_MAKEFLAGS) all-am
>===================================================================
>Index: libjava/libltdl/Makefile.am
>--- libjava/libltdl/Makefile.am	16 Dec 2003 21:48:24 -0000	1.5
>+++ libjava/libltdl/Makefile.am	20 Mar 2005 00:16:32 -0000
>@@ -2,6 +2,9 @@
> 
> AUTOMAKE_OPTIONS = no-dependencies foreign
> 
>+# May be used by various substitution variables.
>+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
>+
> INCLUDES = $(GCINCS)
> 
> if INSTALL_LTDL
>===================================================================
>Index: libjava/testsuite/Makefile.am
>--- libjava/testsuite/Makefile.am	16 Jul 2004 05:36:35 -0000	1.4
>+++ libjava/testsuite/Makefile.am	20 Mar 2005 00:16:32 -0000
>@@ -2,6 +2,9 @@
> 
> AUTOMAKE_OPTIONS = foreign dejagnu
> 
>+# May be used by various substitution variables.
>+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
>+
> # autoconf2.13's target_alias
> target_noncanonical = @target_noncanonical@
> 
>===================================================================
>Index: libjava/testsuite/Makefile.in
>--- libjava/testsuite/Makefile.in	17 Mar 2005 00:59:31 -0000	1.75
>+++ libjava/testsuite/Makefile.in	20 Mar 2005 00:16:32 -0000
>@@ -39,16 +39,14 @@ target_triplet = @target@
> subdir = testsuite
> DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
> ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-am__aclocal_m4_deps = $(top_srcdir)/pkg.m4 \
>-	$(top_srcdir)/../config/accross.m4 \
>+am__aclocal_m4_deps = $(top_srcdir)/../config/accross.m4 \
> 	$(top_srcdir)/../config/acx.m4 \
>-	$(top_srcdir)/../config/gcc-version.m4 \
> 	$(top_srcdir)/../config/gxx-include-dir.m4 \
> 	$(top_srcdir)/../config/iconv.m4 \
> 	$(top_srcdir)/../config/lcmessage.m4 \
> 	$(top_srcdir)/../config/lib-ld.m4 \
> 	$(top_srcdir)/../config/lib-link.m4 \
>-	$(top_srcdir)/../config/lib-prefix.m4 \
>+	$(top_srcdir)/../config/lib-prefix.m4 $(top_srcdir)/pkg.m4 \
> 	$(top_srcdir)/acinclude.m4 \
> 	$(top_srcdir)/../config/no-executables.m4 \
> 	$(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
>@@ -245,9 +243,6 @@ build_subdir = @build_subdir@
> build_vendor = @build_vendor@
> datadir = @datadir@
> exec_prefix = @exec_prefix@
>-gcc_version = @gcc_version@
>-gcc_version_full = @gcc_version_full@
>-gcc_version_trigger = @gcc_version_trigger@
> gxx_include_dir = @gxx_include_dir@
> here = @here@
> host = @host@
>@@ -283,12 +278,14 @@ target_noncanonical = @target_noncanonic
> target_os = @target_os@
> target_subdir = @target_subdir@
> target_vendor = @target_vendor@
>-tool_include_dir = @tool_include_dir@
> toolexecdir = @toolexecdir@
> toolexeclibdir = @toolexeclibdir@
> toolexecmainlibdir = @toolexecmainlibdir@
> AUTOMAKE_OPTIONS = foreign dejagnu
> 
>+# May be used by various substitution variables.
>+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
>+
> # Setup the testing framework, if you have one
> EXPECT = `if [ -f $(top_builddir)/../expect/expect ] ; then \
>             echo $(top_builddir)/../expect/expect ; \
>===================================================================
>Index: libmudflap/Makefile.am
>--- libmudflap/Makefile.am	9 Dec 2004 01:27:28 -0000	1.14
>+++ libmudflap/Makefile.am	20 Mar 2005 00:16:32 -0000
>@@ -9,6 +9,9 @@ ACLOCAL_AMFLAGS = -I .. -I ../config
> MAINT_CHARSET = latin1
> SUBDIRS = testsuite
> 
>+# May be used by various substitution variables.
>+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
>+
> SECTION_FLAGS = @SECTION_FLAGS@
> AM_CFLAGS = -Wall $(SECTION_FLAGS)
> 
>===================================================================
>Index: libmudflap/Makefile.in
>--- libmudflap/Makefile.in	2 Jan 2005 22:24:50 -0000	1.17
>+++ libmudflap/Makefile.in	20 Mar 2005 00:16:32 -0000
>@@ -49,14 +49,15 @@ DIST_COMMON = $(am__configure_deps) $(in
> 	$(top_srcdir)/configure ChangeLog
> subdir = .
> ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-am__aclocal_m4_deps = $(top_srcdir)/../config/gcc-version.m4 \
>-	$(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
>+am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \
>+	$(top_srcdir)/configure.ac
> am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
> 	$(ACLOCAL_M4)
> am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
>  configure.lineno configure.status.lineno
> mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
> CONFIG_HEADER = config.h
>+CONFIG_CLEAN_FILES =
> am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
> am__vpath_adj = case $$p in \
>     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
>@@ -189,9 +190,6 @@ datadir = @datadir@
> enable_shared = @enable_shared@
> enable_static = @enable_static@
> exec_prefix = @exec_prefix@
>-gcc_version = @gcc_version@
>-gcc_version_full = @gcc_version_full@
>-gcc_version_trigger = @gcc_version_trigger@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
>@@ -223,6 +221,9 @@ AUTOMAKE_OPTIONS = 1.8 foreign
> ACLOCAL_AMFLAGS = -I .. -I ../config
> MAINT_CHARSET = latin1
> SUBDIRS = testsuite
>+
>+# May be used by various substitution variables.
>+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
> AM_CFLAGS = -Wall $(SECTION_FLAGS)
> @LIBMUDFLAPTH_FALSE@libmudflapth = 
> @LIBMUDFLAPTH_TRUE@libmudflapth = libmudflapth.la
>@@ -577,7 +578,7 @@ distclean-tags:
> distdir: $(DISTFILES)
> 	$(am__remove_distdir)
> 	mkdir $(distdir)
>-	$(mkdir_p) $(distdir)/. $(distdir)/.. $(distdir)/../config $(distdir)/testsuite
>+	$(mkdir_p) $(distdir)/.. $(distdir)/testsuite
> 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
> 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
> 	list='$(DISTFILES)'; for file in $$list; do \
>===================================================================
>Index: libmudflap/aclocal.m4
>--- libmudflap/aclocal.m4	9 Dec 2004 01:27:28 -0000	1.12
>+++ libmudflap/aclocal.m4	20 Mar 2005 00:16:32 -0000
>@@ -1127,5 +1127,4 @@ AC_SUBST([am__tar])
> AC_SUBST([am__untar])
> ]) # _AM_PROG_TAR
> 
>-m4_include([../config/gcc-version.m4])
> m4_include([../libtool.m4])
>===================================================================
>Index: libmudflap/configure
>--- libmudflap/configure	2 Jan 2005 22:24:50 -0000	1.21
>+++ libmudflap/configure	20 Mar 2005 00:16:32 -0000
>@@ -309,7 +309,7 @@ ac_includes_default="\
> # include <unistd.h>
> #endif"
> 
>-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT multi_basedir CC ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CFLAGS CPP CPPFLAGS EGREP LN_S RANLIB ac_ct_RANLIB LIBTOOL enable_shared enable_static MF_HAVE_STDINT_H MF_HAVE_UINTPTR_T LIBMUDFLAPTH_TRUE LIBMUDFLAPTH_FALSE build_libmudflapth gcc_version_trigger gcc_version_full gcc_version toolexecdir toolexeclibdir NM ac_ct_NM SECTION_FLAGS LIBOBJS LTLIBOBJS'
>+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT multi_basedir CC ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CFLAGS CPP CPPFLAGS EGREP LN_S RANLIB ac_ct_RANLIB LIBTOOL enable_shared enable_static MF_HAVE_STDINT_H MF_HAVE_UINTPTR_T LIBMUDFLAPTH_TRUE LIBMUDFLAPTH_FALSE build_libmudflapth toolexecdir toolexeclibdir NM ac_ct_NM SECTION_FLAGS LIBOBJS LTLIBOBJS'
> ac_subst_files=''
> 
> # Initialize some variables set by options.
>@@ -6509,23 +6509,6 @@ _ACEOF
> fi
> 
> 
>-
>-if test "${with_gcc_version_trigger+set}" = set; then
>-  gcc_version_trigger=$with_gcc_version_trigger
>-else
>-  gcc_version_trigger=$srcdir/../gcc/version.c
>-fi
>-if test -f "${gcc_version_trigger}"; then
>-  gcc_version_full=`grep version_string "${gcc_version_trigger}" | sed -e 's/.*"\([^"]*\)".*/\1/'`
>-else
>-  gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'`
>-fi
>-gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
>-
>-
>-
>-
>-
> # Calculate toolexeclibdir
> # Also toolexecdir, though it's only used in toolexeclibdir
> case ${version_specific_libs} in
>@@ -6534,7 +6517,7 @@ case ${version_specific_libs} in
>     # and header files if --enable-version-specific-runtime-libs option
>     # is selected.
>     toolexecdir='$(libdir)/gcc/$(target_alias)'
>-    toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
>+    toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
>     ;;
>   no)
>     if test -n "$with_cross_host" &&
>@@ -6854,7 +6837,7 @@ else
>   multilib_arg=
> fi
> 
>-                                        ac_config_files="$ac_config_files Makefile testsuite/Makefile testsuite/mfconfig.exp"
>+                              ac_config_files="$ac_config_files Makefile testsuite/Makefile testsuite/mfconfig.exp"
> 
> cat >confcache <<\_ACEOF
> # This file is a shell script that caches the results of configure
>@@ -7587,9 +7570,6 @@ s,@MF_HAVE_UINTPTR_T@,$MF_HAVE_UINTPTR_T
> s,@LIBMUDFLAPTH_TRUE@,$LIBMUDFLAPTH_TRUE,;t t
> s,@LIBMUDFLAPTH_FALSE@,$LIBMUDFLAPTH_FALSE,;t t
> s,@build_libmudflapth@,$build_libmudflapth,;t t
>-s,@gcc_version_trigger@,$gcc_version_trigger,;t t
>-s,@gcc_version_full@,$gcc_version_full,;t t
>-s,@gcc_version@,$gcc_version,;t t
> s,@toolexecdir@,$toolexecdir,;t t
> s,@toolexeclibdir@,$toolexeclibdir,;t t
> s,@NM@,$NM,;t t
>===================================================================
>Index: libmudflap/configure.ac
>--- libmudflap/configure.ac	2 Jan 2005 22:24:50 -0000	1.10
>+++ libmudflap/configure.ac	20 Mar 2005 00:16:33 -0000
>@@ -132,8 +132,6 @@ AC_SUBST(build_libmudflapth)
> 
> AC_CHECK_LIB(dl, dlsym)
> 
>-TL_AC_GCC_VERSION([$srcdir/..])
>-
> # Calculate toolexeclibdir
> # Also toolexecdir, though it's only used in toolexeclibdir
> case ${version_specific_libs} in
>@@ -142,7 +140,7 @@ case ${version_specific_libs} in
>     # and header files if --enable-version-specific-runtime-libs option
>     # is selected.
>     toolexecdir='$(libdir)/gcc/$(target_alias)'
>-    toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
>+    toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
>     ;;
>   no)
>     if test -n "$with_cross_host" &&
>===================================================================
>Index: libmudflap/testsuite/Makefile.in
>--- libmudflap/testsuite/Makefile.in	9 Dec 2004 01:27:29 -0000	1.13
>+++ libmudflap/testsuite/Makefile.in	20 Mar 2005 00:16:33 -0000
>@@ -40,8 +40,8 @@ subdir = testsuite
> DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
> 	$(srcdir)/mfconfig.exp.in
> ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>-am__aclocal_m4_deps = $(top_srcdir)/../config/gcc-version.m4 \
>-	$(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
>+am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \
>+	$(top_srcdir)/configure.ac
> am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
> 	$(ACLOCAL_M4)
> mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
>@@ -127,9 +127,6 @@ datadir = @datadir@
> enable_shared = @enable_shared@
> enable_static = @enable_static@
> exec_prefix = @exec_prefix@
>-gcc_version = @gcc_version@
>-gcc_version_full = @gcc_version_full@
>-gcc_version_trigger = @gcc_version_trigger@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
>===================================================================
>Index: libobjc/Makefile.in
>--- libobjc/Makefile.in	2 Mar 2005 19:37:02 -0000	1.47
>+++ libobjc/Makefile.in	20 Mar 2005 00:16:33 -0000
>@@ -33,7 +33,7 @@ VPATH = @glibcpp_srcdir@
> prefix = @prefix@
> exec_prefix = @exec_prefix@
> target_noncanonical = @target_noncanonical@
>-gcc_version = @gcc_version@
>+gcc_version := $(shell cat $(srcdir)/../gcc/BASE-VER)
> host_subdir = @host_subdir@
> top_srcdir = @top_srcdir@
> toplevel_srcdir = @toplevel_srcdir@
>===================================================================
>Index: libobjc/aclocal.m4
>--- libobjc/aclocal.m4	2 Dec 2004 11:05:04 -0000	1.13
>+++ libobjc/aclocal.m4	20 Mar 2005 00:16:33 -0000
>@@ -198,5 +198,4 @@ if eval "test \"`echo '$ac_cv_prog_cc_'$
> fi
> ])
> 
>-m4_include([../config/gcc-version.m4])
> m4_include([acinclude.m4])
>===================================================================
>Index: libobjc/configure
>--- libobjc/configure	28 Feb 2005 20:04:36 -0000	1.58
>+++ libobjc/configure	20 Mar 2005 00:16:33 -0000
>@@ -309,7 +309,7 @@ ac_includes_default="\
> # include <unistd.h>
> #endif"
> 
>-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_subdir host_subdir target_subdir VERSION OBJC_BOEHM_GC toplevel_srcdir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical glibcpp_srcdir gcc_version_trigger gcc_version_full gcc_version toolexecdir toolexeclibdir includedirname libext CC ac_ct_CC EXEEXT OBJEXT CFLAGS AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LN_S STRIP ac_ct_STRIP LIBTOOL SET_MAKE CPP CPPFLAGS EGREP LIBOBJS LTLIBOBJS'
>+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_subdir host_subdir target_subdir VERSION OBJC_BOEHM_GC toplevel_srcdir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical glibcpp_srcdir toolexecdir toolexeclibdir includedirname libext CC ac_ct_CC EXEEXT OBJEXT CFLAGS AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LN_S STRIP ac_ct_STRIP LIBTOOL SET_MAKE CPP CPPFLAGS EGREP LIBOBJS LTLIBOBJS'
> ac_subst_files=''
> 
> # Initialize some variables set by options.
>@@ -1588,23 +1588,6 @@ case $srcdir in
> esac
> 
> 
>-
>-if test "${with_gcc_version_trigger+set}" = set; then
>-  gcc_version_trigger=$with_gcc_version_trigger
>-else
>-  gcc_version_trigger=$srcdir/../gcc/version.c
>-fi
>-if test -f "${gcc_version_trigger}"; then
>-  gcc_version_full=`grep version_string "${gcc_version_trigger}" | sed -e 's/.*"\([^"]*\)".*/\1/'`
>-else
>-  gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'`
>-fi
>-gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
>-
>-
>-
>-
>-
> # Calculate toolexeclibdir
> # Also toolexecdir, though it's only used in toolexeclibdir
> case ${version_specific_libs} in
>@@ -1613,7 +1596,7 @@ case ${version_specific_libs} in
>     # and header files if --enable-version-specific-runtime-libs option
>     # is selected.
>     toolexecdir='$(libdir)/gcc/$(target_noncanonical)'
>-    toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
>+    toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
>     ;;
>   no)
>     if test -n "$with_cross_host" &&
>@@ -3712,7 +3695,7 @@ test x"$pic_mode" = xno && libtool_flags
> case $host in
> *-*-irix6*)
>   # Find out which ABI we are using.
>-  echo '#line 3715 "configure"' > conftest.$ac_ext
>+  echo '#line 3698 "configure"' > conftest.$ac_ext
>   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>   (eval $ac_compile) 2>&5
>   ac_status=$?
>@@ -5140,7 +5123,7 @@ if test "${enable_sjlj_exceptions+set}" 
>   :
> else
>   cat > conftest.$ac_ext << EOF
>-#line 5143 "configure"
>+#line 5126 "configure"
> @interface Frob
> @end
> @implementation Frob
>@@ -5864,9 +5847,6 @@ s,@target_vendor@,$target_vendor,;t t
> s,@target_os@,$target_os,;t t
> s,@target_noncanonical@,$target_noncanonical,;t t
> s,@glibcpp_srcdir@,$glibcpp_srcdir,;t t
>-s,@gcc_version_trigger@,$gcc_version_trigger,;t t
>-s,@gcc_version_full@,$gcc_version_full,;t t
>-s,@gcc_version@,$gcc_version,;t t
> s,@toolexecdir@,$toolexecdir,;t t
> s,@toolexeclibdir@,$toolexeclibdir,;t t
> s,@includedirname@,$includedirname,;t t
>===================================================================
>Index: libobjc/configure.ac
>--- libobjc/configure.ac	28 Feb 2005 20:04:41 -0000	1.14
>+++ libobjc/configure.ac	20 Mar 2005 00:16:33 -0000
>@@ -118,8 +118,6 @@ case $srcdir in
> esac
> AC_SUBST(glibcpp_srcdir)
> 
>-TL_AC_GCC_VERSION([$srcdir/..])
>-
> # Calculate toolexeclibdir
> # Also toolexecdir, though it's only used in toolexeclibdir
> case ${version_specific_libs} in
>@@ -128,7 +126,7 @@ case ${version_specific_libs} in
>     # and header files if --enable-version-specific-runtime-libs option
>     # is selected.
>     toolexecdir='$(libdir)/gcc/$(target_noncanonical)'
>-    toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
>+    toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
>     ;;
>   no)
>     if test -n "$with_cross_host" &&
>===================================================================
>Index: libstdc++-v3/acinclude.m4
>--- libstdc++-v3/acinclude.m4	24 Feb 2005 18:55:16 -0000	1.307
>+++ libstdc++-v3/acinclude.m4	20 Mar 2005 00:16:33 -0000
>@@ -752,7 +752,7 @@ AC_DEFUN([GLIBCXX_EXPORT_INSTALL_INFO], 
> 
>   # Default case for install directory for include files.
>   if test $version_specific_libs = no && test $gxx_include_dir = no; then
>-    gxx_include_dir='${prefix}'/include/c++/${gcc_version}
>+    gxx_include_dir='${prefix}/include/c++/${gcc_version}'
>   fi
> 
>   # Version-specific runtime libs processing.
>@@ -762,10 +762,10 @@ AC_DEFUN([GLIBCXX_EXPORT_INSTALL_INFO], 
>     # is selected.  FIXME: these variables are misnamed, there are
>     # no executables installed in _toolexecdir or _toolexeclibdir.
>     if test x"$gxx_include_dir" = x"no"; then
>-      gxx_include_dir='${libdir}/gcc/${host_alias}/'$gcc_version/include/c++
>+      gxx_include_dir='${libdir}/gcc/${host_alias}/${gcc_version}/include/c++'
>     fi
>     glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
>-    glibcxx_toolexeclibdir='${toolexecdir}/'$gcc_version'$(MULTISUBDIR)'
>+    glibcxx_toolexeclibdir='${toolexecdir}/${gcc_version}$(MULTISUBDIR)'
>   fi
> 
>   # Calculate glibcxx_toolexecdir, glibcxx_toolexeclibdir
>===================================================================
>Index: libstdc++-v3/configure
>--- libstdc++-v3/configure	24 Feb 2005 18:55:17 -0000	1.423
>+++ libstdc++-v3/configure	20 Mar 2005 00:16:58 -0000
>@@ -99295,7 +99295,7 @@ echo "${ECHO_T}$version_specific_libs" >
> 
>   # Default case for install directory for include files.
>   if test $version_specific_libs = no && test $gxx_include_dir = no; then
>-    gxx_include_dir='${prefix}'/include/c++/${gcc_version}
>+    gxx_include_dir='${prefix}/include/c++/${gcc_version}'
>   fi
> 
>   # Version-specific runtime libs processing.
>@@ -99305,10 +99305,10 @@ echo "${ECHO_T}$version_specific_libs" >
>     # is selected.  FIXME: these variables are misnamed, there are
>     # no executables installed in _toolexecdir or _toolexeclibdir.
>     if test x"$gxx_include_dir" = x"no"; then
>-      gxx_include_dir='${libdir}/gcc/${host_alias}/'$gcc_version/include/c++
>+      gxx_include_dir='${libdir}/gcc/${host_alias}/${gcc_version}/include/c++'
>     fi
>     glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
>-    glibcxx_toolexeclibdir='${toolexecdir}/'$gcc_version'$(MULTISUBDIR)'
>+    glibcxx_toolexeclibdir='${toolexecdir}/${gcc_version}$(MULTISUBDIR)'
>   fi
> 
>   # Calculate glibcxx_toolexecdir, glibcxx_toolexeclibdir
>  
>

-- 
Khem Raj
MontaVista Software Inc.

http://www.mvista.com
Platform To Innovate




More information about the Java-patches mailing list