Daily bump.

[platform/upstream/gcc.git] / configure

diff --git a/configure b/configure
index 8888867..af33406 100755 (executable)
--- a/configure
+++ b/configure
@@ -56,7 +56,8 @@ exec_prefixoption=
 fatal=
 floating_point=default
 gas=default
-gcc_version=UNKNOWN
+gcc_version=
+gcc_version_trigger=
 host_alias=NOHOST
 host_makefile_frag=
 moveifchange=
@@ -458,6 +459,7 @@ fi
 
 configsub=`echo ${progname} | sed 's/configure$/config.sub/'`
 moveifchange=`echo ${progname} | sed 's/configure$/move-if-change/'`
+topsrcdir=`cd \`dirname ${progname}\`; pwd`
 
 # this is a hack.  sun4 must always be a valid host alias or this will fail.
 if ${config_shell} ${configsub} sun4 >/dev/null 2>&1 ; then
@@ -520,6 +522,28 @@ case "${exec_prefixoption}" in
 *) ;;
 esac
 
+# Define the trigger file to make sure configure will re-run whenever
+# the gcc version number changes.
+if [ "${with_gcc_version_trigger+set}" = set ]; then
+    gcc_version_trigger="$with_gcc_version_trigger"
+    gcc_version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${with_gcc_version_trigger}`
+else
+    # If gcc's sources are available, define the trigger file.
+    if [ -f ${topsrcdir}/gcc/version.c ] ; then
+       gcc_version_trigger=${topsrcdir}/gcc/version.c
+       gcc_version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${gcc_version_trigger}`
+       case "$arguments" in
+         *--with-gcc-version-trigger=$gcc_version_trigger* )
+           ;;
+         * )
+           # Make sure configure.in knows about this.
+           arguments="--with-gcc-version-trigger=$gcc_version_trigger $arguments"
+           ;;
+       esac
+       withoptions="--with-gcc-version-trigger=$gcc_version_trigger $withoptions"
+    fi
+fi
+
 ### break up ${srcdir}/configure.in.
 case "`grep '^# per\-host:' ${srcdir}/configure.in`" in
 "")
@@ -701,12 +725,6 @@ if [ "${program_prefix}" != "" ] ; then
     program_transform_name="-e s,^,${program_prefix}, ${program_transform_name}"
 fi
 
-# If gcc's sources are available, extract its version number which is used by
-# $libsubdir.
-if [ -f $srcdir/gcc/version.c ]; then
-    gcc_version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${srcdir}/gcc/version.c`
-fi
-
 # If CC and CXX are not set in the environment, and the Makefile
 # exists, try to extract them from it.  This is to handle running
 # ./config.status by hand.
@@ -1223,7 +1241,11 @@ EOF
            # Note, if you change the default, make sure to fix both here
            # and in the gcc subdirectory.
            if test -z "${with_gxx_include_dir}"; then
-               echo gxx_include_dir = '${prefix}/include/g++' >> ${Makefile}
+               if test x${enable_version_specific_runtime_libs} = xyes; then
+                   echo gxx_include_dir = '${libsubdir}/include/g++' >> ${Makefile}
+               else
+                   echo gxx_include_dir = '${prefix}/include/g++' >> ${Makefile}
+               fi
            else
                echo gxx_include_dir = ${with_gxx_include_dir} >> ${Makefile}
            fi
@@ -1234,11 +1256,17 @@ EOF
            else
                echo enable_shared = ${enable_shared} >> ${Makefile}
            fi
+           # record if we want to rumtime library stuff installed in libsubdir.
+           if test -z "${enable_version_specific_runtime_libs}"; then
+               echo enable_version_specific_runtime_libs = no >> ${Makefile}
+           else
+               echo enable_version_specific_runtime_libs = ${enable_version_specific_runtime_libs} >> ${Makefile}
+           fi
 
-           # Emit a macro which is used to build the libsubdir macro where
-           # compiler specific stuff can be found/installed.
-           # FIXME: This works only if gcc's sources are available in a gcc
-           # subdirectory!
+           # Emit a macro which describes the file containing gcc's
+           # version number.
+           echo gcc_version_trigger = ${gcc_version_trigger} >> ${Makefile}
+           # And emit a macro defining gcc's version number.
            echo gcc_version = ${gcc_version} >> ${Makefile}
 
             # reset prefix, exec_prefix, srcdir, SUBDIRS, NONSUBDIRS,