OSDN Git Service

Oops - fixed typos in previous delta
[pf3gnuchains/gcc-fork.git] / gcc / configure.in
index 92675af..743d65f 100644 (file)
@@ -149,7 +149,10 @@ if test x$local_prefix = x; then
        local_prefix=/usr/local
 fi
 
-gxx_include_dir=
+# Don't set gcc_gxx_include_dir to gxx_include_dir since that's only
+# passed in by the toplevel make and thus we'd get different behavior
+# depending on where we built the sources.
+gcc_gxx_include_dir=
 # Specify the g++ header file directory
 AC_ARG_WITH(gxx-include-dir,
 [  --with-gxx-include-dir=DIR
@@ -157,16 +160,16 @@ AC_ARG_WITH(gxx-include-dir,
 [case "${withval}" in
 yes)   AC_MSG_ERROR(bad value ${withval} given for g++ include directory) ;;
 no)    ;;
-*)     gxx_include_dir=$with_gxx_include_dir ;;
+*)     gcc_gxx_include_dir=$with_gxx_include_dir ;;
 esac])
 
-if test x${gxx_include_dir} = x; then
+if test x${gcc_gxx_include_dir} = x; then
   if test x${enable_version_specific_runtime_libs} = xyes; then
-    gxx_include_dir='${libsubdir}/include/g++'
+    gcc_gxx_include_dir='${libsubdir}/include/g++'
   else
     topsrcdir=${srcdir}/.. . ${srcdir}/../config.if
 changequote(<<, >>)dnl
-    gxx_include_dir="\$(libsubdir)/\$(unlibsubdir)/..\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/include/g++"-${libstdcxx_interface}
+    gcc_gxx_include_dir="\$(libsubdir)/\$(unlibsubdir)/..\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/include/g++"-${libstdcxx_interface}
 changequote([, ])dnl
   fi
 fi
@@ -195,7 +198,7 @@ AC_ARG_ENABLE(c-cpplib,
 if test x$enable_c_cpplib != xno; then
   extra_c_objs="${extra_c_objs} libcpp.a"
   extra_cxx_objs="${extra_cxx_objs} ../libcpp.a"
-  extra_c_flags=-DUSE_CPPLIB=1
+  extra_c_flags="${extra_c_flags} -DUSE_CPPLIB=1"
   cpp_main=cppmain
 fi)
 
@@ -226,7 +229,7 @@ AC_ARG_ENABLE(init-priority,
   --disable-init-priority conform to ISO C++ rules for ordering static objects
                          (i.e. initialized in order of declaration). ],
 if test x$enable_init_priority != xno; then
-  extra_c_flags=-DUSE_INIT_PRIORITY
+  extra_c_flags="${extra_c_flags} -DUSE_INIT_PRIORITY"
 fi)
 
 # Enable threads
@@ -415,6 +418,9 @@ host_xmake_file=
 host_truncate_target=
 host_exeext=
 
+# It is relative to $prefix.
+cpp_install_dir=
+
 # Decode the host machine, then the target machine.
 # For the host machine, we save the xm_file variable as host_xm_file;
 # then we decode the target machine and forget everything else
@@ -502,11 +508,23 @@ changequote([,])dnl
        tm_file=${cpu_type}/${cpu_type}.h
        xm_file=${cpu_type}/xm-${cpu_type}.h
        
-       # Set the default macros to define for GNU/Linux systems.
+       # Common parts for linux-gnu and openbsd systems
        case $machine in
        *-*-linux-gnu*)
                xm_defines="HAVE_ATEXIT POSIX BSTRING"
                ;;
+       *-*-openbsd*)
+               tm_file=${cpu_type}/openbsd.h
+               # On OpenBSD systems, the headers are okay
+               fixincludes=Makefile.in
+               tmake_file="t-libc-ok t-openbsd"
+               # avoid surprises, always provide an xm-openbsd file 
+               xm_file=${cpu_type}/xm-openbsd.h
+               if test x$enable_threads = xyes; then
+                       thread_file='posix'
+                       tmake_file="${tmake_file} t-openbsd-thread"
+               fi
+               ;;
        esac
 
        case $machine in
@@ -586,6 +604,12 @@ changequote([,])dnl
                fixincludes=fixinc.wrap
                gas=yes gnu_ld=yes
                ;;
+
+       alpha*-*-openbsd*)
+               # default x-alpha is only appropriate for dec-osf.
+               target_cpu_default="MASK_GAS"
+               xmake_file=none
+               ;;
                
        alpha*-dec-osf*)
                if test x$stabs = xyes
@@ -728,6 +752,10 @@ changequote([,])dnl
                tm_file=arm/unknown-elf.h
                tmake_file=arm/t-arm-elf
                ;;
+        arm*-*-oabi)
+               tm_file=arm/unknown-elf-oabi.h
+               tmake_file=arm/t-arm-elf
+               ;;
        c1-convex-*)                    # Convex C1
                target_cpu_default=1
                use_collect2=yes
@@ -776,13 +804,17 @@ changequote([,])dnl
        h8300-*-*)
                float_format=i32
                ;;
+       hppa*-*-openbsd*)
+               target_cpu_default="MASK_SNAKE"
+               tmake_file=pa/t-openbsd
+               ;;
        hppa1.1-*-pro*)
                tm_file="pa/pa-pro.h ${tm_file} pa/pa-pro-end.h libgloss.h"
                xm_file=pa/xm-papro.h
                tmake_file=pa/t-pro
                ;;
        hppa1.1-*-osf*)
-               target_cpu_default=1
+               target_cpu_default="MASK_SNAKE"
                tm_file="${tm_file} pa/pa-osf.h"
                use_collect2=yes
                fixincludes=Makefile.in
@@ -798,7 +830,7 @@ changequote([,])dnl
                fixincludes=Makefile.in
                ;;
        hppa1.1-*-bsd*)
-               target_cpu_default=1
+               target_cpu_default="MASK_SNAKE"
                use_collect2=yes
                fixincludes=Makefile.in
                ;;
@@ -835,7 +867,7 @@ changequote([,])dnl
 changequote(,)dnl
        hppa1.1-*-hpux8.0[0-2]*)
 changequote([,])dnl
-               target_cpu_default=1
+               target_cpu_default="MASK_SNAKE"
                tm_file="${tm_file} pa/pa-hpux.h"
                xm_file=pa/xm-pahpux.h
                xmake_file=pa/x-pa-hpux
@@ -849,7 +881,7 @@ changequote([,])dnl
                use_collect2=yes
                ;;
        hppa1.1-*-hpux8*)
-               target_cpu_default=1
+               target_cpu_default="MASK_SNAKE"
                tm_file="${tm_file} pa/pa-hpux.h"
                xm_file=pa/xm-pahpux.h
                xmake_file=pa/x-pa-hpux
@@ -872,7 +904,7 @@ changequote([,])dnl
                use_collect2=yes
                ;;
        hppa1.1-*-hpux10* | hppa2*-*-hpux10*)
-               target_cpu_default=1
+               target_cpu_default="MASK_SNAKE"
                tm_file="${tm_file} pa/pa-hpux.h pa/pa-hpux10.h"
                xm_file=pa/xm-pahpux.h
                xmake_file=pa/x-pa-hpux
@@ -895,6 +927,7 @@ changequote([,])dnl
                tm_file="${tm_file} pa/pa-hpux.h pa/pa-hpux10.h"
                xm_file=pa/xm-pahpux.h
                xmake_file=pa/x-pa-hpux
+               tmake_file=pa/t-pa
                if test x$gas = xyes
                then
                        tm_file="${tm_file} pa/pa-gas.h"
@@ -910,7 +943,7 @@ changequote([,])dnl
                use_collect2=yes
                ;;
        hppa1.1-*-hpux* | hppa2*-*-hpux*)
-               target_cpu_default=1
+               target_cpu_default="MASK_SNAKE"
                tm_file="${tm_file} pa/pa-hpux.h pa/pa-hpux9.h"
                xm_file=pa/xm-pahpux.h
                xmake_file=pa/x-pa-hpux
@@ -933,7 +966,7 @@ changequote([,])dnl
                use_collect2=yes
                ;;
        hppa1.1-*-hiux* | hppa2*-*-hiux*)
-               target_cpu_default=1
+               target_cpu_default="MASK_SNAKE"
                tm_file="${tm_file} pa/pa-hpux.h pa/pa-hiux.h"
                xm_file=pa/xm-pahpux.h
                xmake_file=pa/x-pa-hpux
@@ -956,7 +989,7 @@ changequote([,])dnl
                use_collect2=yes
                ;;
        hppa*-*-lites*)
-               target_cpu_default=1
+               target_cpu_default="MASK_SNAKE"
                use_collect2=yes
                fixincludes=Makefile.in
                ;;
@@ -1102,10 +1135,8 @@ changequote([,])dnl
                fixincludes=fixinc.wrap
                tmake_file=i386/t-freebsd
                ;;
-       # We are hoping OpenBSD is still close enough to NetBSD that we can
-       # share the configurations.
 changequote(,)dnl
-       i[34567]86-*-netbsd* | i[34567]86-*-openbsd*)
+       i[34567]86-*-netbsd*)
 changequote([,])dnl
                tm_file=i386/netbsd.h
                # On NetBSD, the headers are already okay, except for math.h.
@@ -1113,6 +1144,14 @@ changequote([,])dnl
                tmake_file=t-netbsd
                ;;
 changequote(,)dnl
+       i[34567]86-*-openbsd*)
+changequote([,])dnl
+               # Remove when the math emulator is fixed
+               target_cpu_default="MASK_NO_FANCY_MATH_387"
+               # we need collect2 until our bug is fixed...
+               use_collect2=yes
+               ;;
+changequote(,)dnl
        i[34567]86-*-coff*)
 changequote([,])dnl
                tm_file=i386/i386-coff.h
@@ -1152,7 +1191,7 @@ changequote([,])dnl                       # with a.out format using
                xmake_file=x-linux-aout
                tmake_file="t-linux-aout i386/t-crtstuff"
                tm_file=i386/linux-oldld.h
-               fixincludes=Makefile.in #On Linux, the headers are ok already.
+               fixincludes=fixinc.x86-linux-gnu
                gnu_ld=yes
                float_format=i386
                ;;
@@ -1162,7 +1201,7 @@ changequote([,])dnl                       # with a.out format
                xmake_file=x-linux-aout
                tmake_file="t-linux-aout i386/t-crtstuff"
                tm_file=i386/linux-aout.h
-               fixincludes=Makefile.in #On Linux, the headers are ok already.
+               fixincludes=fixinc.x86-linux-gnu
                gnu_ld=yes
                float_format=i386
                ;;
@@ -1174,7 +1213,7 @@ changequote([,])dnl                       # with ELF format using the
                tm_file=i386/linux.h    
                tmake_file="t-linux t-linux-gnulibc1 i386/t-crtstuff"
                extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-               fixincludes=Makefile.in #On Linux, the headers are ok already.
+               fixincludes=fixinc.x86-linux-gnu
                gnu_ld=yes
                float_format=i386
                if test x$enable_threads = xyes; then
@@ -1189,7 +1228,7 @@ changequote([,])dnl                       # with ELF format using glibc 2
                tm_file=i386/linux.h
                tmake_file="t-linux i386/t-crtstuff"
                extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-               fixincludes=Makefile.in #On Linux, the headers are ok already.
+               fixincludes=fixinc.x86-linux-gnu
                gnu_ld=yes
                float_format=i386
                if test x$enable_threads = xyes; then
@@ -1198,6 +1237,7 @@ changequote([,])dnl                       # with ELF format using glibc 2
                ;;
 changequote(,)dnl
        i[34567]86-*-gnu*)
+               float_format=i386
 changequote([,])dnl
                ;;
 changequote(,)dnl
@@ -1306,7 +1346,7 @@ changequote([,])dnl
                else
                        tmake_file=i386/t-sco5
                fi
-               extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
+               extra_parts="crti.o crtbegin.o crtend.o crtbeginS.o crtendS.o"
                ;;
 changequote(,)dnl
        i[34567]86-*-sco3.2v4*)         # 80386 running SCO 3.2v4 system
@@ -1974,6 +2014,11 @@ changequote([,])dnl
                tmake_file=t-netbsd
                float_format=m68k
                ;;
+       m68k*-*-openbsd*)
+               float_format=m68k
+               # we need collect2 until our bug is fixed...
+               use_collect2=yes
+               ;;
        m68k-*-sysv3*)                  # Motorola m68k's running system V.3
                xm_file="xm-alloca.h ${xm_file}"
                xm_defines=USG
@@ -2097,6 +2142,9 @@ changequote([,])dnl
                        tmake_file=m88k/t-luna
                fi
                ;;
+       m88k-*-openbsd*)
+               tmake_file="${tmake_file} m88k/t-luna-gas"
+               ;;
        m88k-*-sysv3*)
                tm_file=m88k/sysv3.h
                extra_parts="crtbegin.o crtend.o"
@@ -2129,7 +2177,7 @@ changequote([,])dnl
                gas=yes
                gnu_ld=yes
                extra_parts="crtbegin.o crtend.o"
-#              thread_file='vxworks'
+               thread_file='vxworks'
                ;;
        mips-sgi-irix5cross64)          # Irix5 host, Irix 6 target, cross64
                tm_file="mips/iris6.h mips/cross64.h"
@@ -2305,6 +2353,16 @@ changequote([,])dnl
                gas=yes
                fixincludes=Makefile.in 
                ;;
+       mips*el-*-openbsd*)     # mips little endian
+               target_cpu_default="MASK_GAS|MASK_ABICALLS"
+               tm_file=mips/openbsd.h
+               xmake_file=none
+               ;;
+       mips*-*-openbsd*)               # mips big endian
+               target_cpu_default="MASK_GAS|MASK_ABICALLS"
+               tm_file=mips/openbsd-be.h
+               xmake_file=none
+               ;;
        mips-sony-bsd* | mips-sony-newsos*)     # Sony NEWS 3600 or risc/news.
                tm_file="mips/news4.h ${tm_file}"
                if test x$stabs = xyes; then
@@ -2655,6 +2713,9 @@ changequote([,])dnl
                 ;;
         pdp11-*-*)
                ;;
+       ns32k-*-openbsd*)
+               # Nothing special
+               ;;
        pyramid-*-*)
                cpu_type=pyr
                xmake_file=pyr/x-pyr
@@ -2667,6 +2728,13 @@ changequote([,])dnl
                xmake_file=romp/x-mach
                use_collect2=yes
                ;;
+       romp-*-openbsd*)
+               # Nothing special
+               ;;
+       powerpc-*-openbsd*)
+               tmake_file="${tmake_file} rs6000/t-rs6000 rs6000/t-openbsd"
+               xmake_file=none
+               ;;
        powerpc-*-beos*)
                cpu_type=rs6000
                tm_file=rs6000/beos.h
@@ -2863,7 +2931,12 @@ changequote([,])dnl
 changequote(,)dnl
        rs6000-ibm-aix4.[12]* | powerpc-ibm-aix4.[12]*)
 changequote([,])dnl
-               tm_file=rs6000/aix41.h
+               if test "$gnu_ld" = yes
+               then
+                       tm_file=rs6000/aix41-gld.h
+               else
+                       tm_file=rs6000/aix41.h
+               fi
                if test x$host != x$target
                then
                        tmake_file=rs6000/t-xnewas
@@ -2956,6 +3029,10 @@ changequote([,])dnl
                fixincludes=fixinc.wrap
                tmake_file=t-netbsd
                ;;
+       sparc-*-openbsd*)
+               # we need collect2 until our bug is fixed...
+               use_collect2=yes
+               ;;
        sparc-*-bsd*)
                tm_file=sparc/bsd.h
                ;;
@@ -3017,7 +3094,7 @@ changequote([,])dnl
                xmake_file=sparc/x-sysv4
                extra_parts="crt1.o crti.o crtn.o gcrt1.o crtbegin.o crtend.o"
                fixincludes=fixinc.wrap
-               float_format=i128
+               float_format=none
                if test x${enable_threads} = x ; then
                    enable_threads=$have_pthread_h
                    if test x${enable_threads} = x ; then
@@ -3032,6 +3109,15 @@ changequote([,])dnl
                    fi
                fi
                ;;
+        sparc-hal-solaris2*)
+                xm_file=sparc/xm-sol2.h
+                tm_file="sparc/sol2.h sparc/hal.h"
+                tmake_file="sparc/t-halos sparc/t-sol2"
+                xmake_file=sparc/x-sysv4
+                extra_parts="crt1.o crti.o crtn.o gmon.o crtbegin.o crtend.o"
+                fixincludes=fixinc.svr4
+                broken_install=yes
+                ;;
        sparc-*-solaris2*)
                if test x$gnu_ld = xyes
                then
@@ -3048,11 +3134,14 @@ changequote([,])dnl
 changequote(,)dnl
                *-*-solaris2.[0-4])
 changequote([,])dnl
-                       fixincludes=fixinc.svr4;;
+                       fixincludes=fixinc.svr4
+                       float_format=i128
+                       ;;
                *)
-                       fixincludes=fixinc.wrap;;
+                       fixincludes=fixinc.wrap
+                       float_format=none
+                       ;;
                esac
-               float_format=i128
                if test x${enable_threads} = x; then
                    enable_threads=$have_pthread_h
                    if test x${enable_threads} = x; then
@@ -3175,6 +3264,9 @@ changequote([,])dnl
                tmake_file=t-netbsd
                float_format=vax
                ;;
+       vax-*-openbsd*)
+               tmake_file="${tm_file} vax/t-openbsd"
+               ;;
        vax-*-ultrix*)                  # vaxen running ultrix
                tm_file="${tm_file} vax/ultrix.h"
                use_collect2=yes
@@ -3245,7 +3337,7 @@ changequote([,])dnl
        alpha*-*-*)
                case $machine in
                        alphaev6*)
-                               target_cpu_default2="MASK_CPU_EV6|MASK_BXW|MASK_CIX|MASK_MAX"
+                               target_cpu_default2="MASK_CPU_EV6|MASK_BWX|MASK_CIX|MASK_MAX"
                                ;;
                        alphapca56*)
                                target_cpu_default2="MASK_CPU_EV5|MASK_BWX|MASK_MAX"
@@ -3280,7 +3372,7 @@ changequote([,])dnl
                        xarm[23678] | xarm250 | xarm[67][01]0 \
                        | xarm7m | xarm7dm | xarm7dmi | xarm7tdmi \
                        | xarm7100 | xarm7500 | xarm7500fe | xarm810 \
-                       | xstrongarm | xstrongarm110)
+                       | xstrongarm | xstrongarm110 | xstrongarm1100)
                                target_cpu_default2="TARGET_CPU_$with_cpu"
                                ;;
 
@@ -3324,6 +3416,7 @@ changequote([,])dnl
                        xcommon | xpower | xpower2 | xpowerpc | xrios \
                          | xrios1 | xrios2 | xrsc | xrsc1 \
                          | x601 | x602 | x603 | x603e | x604 | x604e | x620 \
+                         | xec603e | x740 | x750 | x401 \
                          | x403 | x505 | x801 | x821 | x823 | x860)
                                target_cpu_default2="\"$with_cpu\""
                                ;;
@@ -3443,6 +3536,11 @@ if test x$float_format = x
 then float_format=i64
 fi
 
+if test $float_format = none
+then float_h_file=Makefile.in
+else float_h_file=float-$float_format.h
+fi
+
 if test x$enable_haifa = x
 then
   case $target in
@@ -3451,6 +3549,12 @@ then
   esac
 fi
 
+# Handle cpp installation.
+if [[ x$enable_cpp != x ]]
+then
+  tmake_file="$tmake_file t-install-cpp"
+fi
+
 # Say what files are being used for the output code and MD file.
 echo "Using \`$srcdir/config/$out_file' to output insns."
 echo "Using \`$srcdir/config/$md_file' as machine description file."
@@ -3569,7 +3673,21 @@ do
        fi
 
        for file in `eval echo '$'$var`; do
+               case $file in
+               auto-config.h)
+                       ;;
+               *)
+                       echo '#ifdef IN_GCC' >>$link
+                       ;;
+               esac
                echo "#include \"$file\"" >>$link
+               case $file in
+               auto-config.h)
+                       ;;
+               *)
+                       echo '#endif' >>$link
+                       ;;
+               esac
        done
 
        for def in `eval echo '$'$define`; do
@@ -3594,6 +3712,24 @@ changequote(,)dnl
 gcc_version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${gcc_version_trigger}`
 changequote([,])dnl
 
+# Internationalization
+PACKAGE=gcc
+VERSION="$gcc_version"
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
+
+ALL_LINGUAS="en_UK"
+
+# NLS support is still experimental, so disable it by default for now.
+AC_ARG_ENABLE(nls,
+  [  --enable-nls            use Native Language Support (disabled by default)],
+  , enable_nls=no)
+
+AM_GNU_GETTEXT
+XGETTEXT="AWK='$AWK' \$(SHELL) \$(top_srcdir)/exgettext $XGETTEXT"
+
 # Get an absolute path to the GCC top-level source directory
 holddir=`pwd`
 cd $srcdir
@@ -3955,7 +4091,7 @@ all_boot_languages=
 all_compilers=
 all_stagestuff=
 all_diff_excludes=
-all_outputs=Makefile
+all_outputs='Makefile intl/Makefile po/Makefile.in'
 # List of language makefile fragments.
 all_lang_makefiles=
 all_headers=
@@ -4023,10 +4159,10 @@ target_list="all.build all.cross start.encap rest.encap \
 for t in $target_list
 do
        x=
-       for l in .. $all_languages
+       for lang in .. $all_languages
        do
-               if test $l != ".."; then
-                       x="$x $l.$t"
+               if test $lang != ".."; then
+                       x="$x $lang.$t"
                fi
        done
        echo "lang.$t: $x" >> Make-hooks
@@ -4084,7 +4220,7 @@ AC_SUBST(sched_prefix)
 AC_SUBST(sched_cflags)
 if test x$enable_haifa != x; then
     # Explicitly remove files that need to be recompiled for the Haifa scheduler.
-    for x in genattrtab.o toplev.o loop.o unroll.o *sched.o; do
+    for x in genattrtab.o toplev.o *sched.o; do
        if test -f $x; then
            echo "Removing $x"
            rm -f $x
@@ -4092,6 +4228,45 @@ if test x$enable_haifa != x; then
     done
 fi
 
+# If $(exec_prefix) exists and is not the same as $(prefix), then compute an
+# absolute path for gcc_tooldir based on inserting the number of up-directory
+# movements required to get from $(exec_prefix) to $(prefix) into the basic
+# $(libsubdir)/@(unlibsubdir) based path.
+# Don't set gcc_tooldir to tooldir since that's only passed in by the toplevel
+# make and thus we'd get different behavior depending on where we built the
+# sources.
+if test x$exec_prefix = xNONE -o x$exec_prefix = x$prefix; then
+    gcc_tooldir='$(libsubdir)/$(unlibsubdir)/../$(target_alias)'
+else
+changequote(<<, >>)dnl
+# An explanation of the sed strings:
+#  -e 's|^\$(prefix)||'   matches and eliminates 'prefix' from 'exec_prefix'
+#  -e 's|/$||'            match a trailing forward slash and eliminates it
+#  -e 's|^[^/]|/|'        forces the string to start with a forward slash (*)
+#  -e 's|/[^/]*|../|g'    replaces each occurance of /<directory> with ../
+#
+# (*) Note this pattern overwrites the first character of the string
+# with a forward slash if one is not already present.  This is not a
+# problem because the exact names of the sub-directories concerned is
+# unimportant, just the number of them matters.
+#
+# The practical upshot of these patterns is like this:
+#
+#  prefix     exec_prefix        result
+#  ------     -----------        ------
+#   /foo        /foo/bar          ../
+#   /foo/       /foo/bar          ../
+#   /foo        /foo/bar/         ../
+#   /foo/       /foo/bar/         ../
+#   /foo        /foo/bar/ugg      ../../
+#
+    dollar='$$'
+    gcc_tooldir="\$(libsubdir)/\$(unlibsubdir)/\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/\$(dollar)||' -e 's|^[^/]|/|' -e 's|/[^/]*|../|g'\`\$(target_alias)"
+changequote([, ])dnl
+fi
+AC_SUBST(gcc_tooldir)
+AC_SUBST(dollar)
+
 # Warn if using init_priority.
 AC_MSG_CHECKING(whether to enable init_priority by default)
 if test x$enable_init_priority != xyes; then
@@ -4144,18 +4319,20 @@ AC_SUBST(JAVAGC)
 AC_SUBST(gcc_version)
 AC_SUBST(gcc_version_trigger)
 AC_SUBST(local_prefix)
-AC_SUBST(gxx_include_dir)
+AC_SUBST(gcc_gxx_include_dir)
 AC_SUBST(fixincludes)
 AC_SUBST(build_install_headers_dir)
 AC_SUBST(build_exeext)
 AC_SUBST(host_exeext)
-AC_SUBST(float_format)
+AC_SUBST(float_h_file)
 AC_SUBST(will_use_collect2)
 AC_SUBST(maybe_use_collect2)
 AC_SUBST(cc_set_by_configure)
 AC_SUBST(stage_prefix_set_by_configure)
 AC_SUBST(install)
 AC_SUBST(symbolic_link)
+AC_SUBST(cpp_install_dir)
+
 
 AC_SUBST_FILE(target_overrides)
 AC_SUBST_FILE(host_overrides)
@@ -4228,6 +4405,11 @@ if test "$symbolic_link" = "ln -s"; then
    fi
  done
 else true ; fi
+# Avoid having to add intl to our include paths.
+if test -f intl/libintl.h; then
+  echo creating libintl.h
+  echo '#include "intl/libintl.h"' >libintl.h
+fi
 ],
 [
 host='${host}'
@@ -4260,4 +4442,5 @@ host_overrides='${host_overrides}'
 cross_defines='${cross_defines}'
 cross_overrides='${cross_overrides}'
 build_overrides='${build_overrides}'
+cpp_install_dir='${cpp_install_dir}'
 ])