X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure;h=4b09c82cac107294f1dab7da1c38d9eafe56895e;hb=96909b926c59a374c4054e332d56212c3e42c6c5;hp=a86251fa3c6cad6beff828582cb43db25944c011;hpb=bfe725ec1de445fa159aba4828be140e98797f58;p=deliverable%2Fbinutils-gdb.git diff --git a/configure b/configure index a86251fa3c..4b09c82cac 100755 --- a/configure +++ b/configure @@ -3,7 +3,8 @@ ### WARNING: this file contains embedded tabs. Do not run untabify on this file. # Configuration script -# Copyright (C) 1988, 90, 91, 92, 93, 94 Free Software Foundation, Inc. +# Copyright (C) 1988, 90, 91, 92, 93, 94, 95, 96, 1997 +# Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -45,11 +46,12 @@ symbolic_link='ln -s' Makefile=Makefile Makefile_in=Makefile.in -arguments=$* +arguments= build_alias= -cache_file= +cache_file=config.cache cache_file_option= configdirs= +diroptions= exec_prefix= exec_prefixoption= fatal= @@ -82,9 +84,52 @@ target_makefile_frag= undefs=NOUNDEFS version="$Revision$" x11=default +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datadir='${prefix}/share' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +libdir='${exec_prefix}/lib' +includedir='${prefix}/include' +oldincludedir='/usr/include' +infodir='${prefix}/info' +mandir='${prefix}/man' ### we might need to use some other shell than /bin/sh for running subshells -# + +### If we are on Windows, search for the shell. This will permit people +### to not have /bin/sh, but to be able to see /SOME/PATH/sh configure +### without also having to set CONFIG_SHELL. This code will work when +### using bash, which sets OSTYPE. +case "${OSTYPE}" in +*win32*) + if [ x${CONFIG_SHELL} = x ]; then + if [ ! -f /bin/sh ]; then + if [ x${SHELL} != x ] && [ -f ${SHELL} ]; then + CONFIG_SHELL=${SHELL} + export CONFIG_SHELL + else + for prog in sh sh.exe bash bash.exe; do + IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" + for dir in $PATH; do + test -z "$dir" && dir=. + if test -f $dir/$prog; then + CONFIG_SHELL=$dir/$prog + export CONFIG_SHELL + break + fi + done + IFS="$save_ifs" + test -n "${CONFIG_SHELL}" && break + done + fi + fi + fi + ;; +esac + config_shell=${CONFIG_SHELL-/bin/sh} NO_EDIT="This file was generated automatically by configure. Do not edit." @@ -137,19 +182,31 @@ do case $option in --*=*) optarg=`echo $option | sed -e 's/^[^=]*=//'` + arguments="$arguments $option" ;; # These options have mandatory values. Since we didn't find an = sign, # the value must be in the next argument - --b* | --cache* | --ex* | --ho* | --pre* | --program-p* | --program-s* | --program-t* | --si* | --sr* | --ta* | --tm* | --x-*) + --bu* | --cache* | --ex* | --ho* | --pre* | --program-p* | --program-s* | --program-t* | --si* | --sr* | --ta* | --tm* | --x-* | --bi* | --sb* | --li* | --da* | --sy* | --sh* | --lo* | --in* | --ol* | --ma*) optarg=$1 shift + arguments="$arguments $option=$optarg" + ;; + --v) + arguments="$arguments -v" + ;; + --*) + arguments="$arguments $option" ;; esac # Now, process the options case $option in - --build* | --b*) + --bi*) + bindir=$optarg + diroptions="$diroptions --bindir=$optarg" + ;; + --build* | --bu*) case "$build_alias" in "") build_alias=$optarg ;; *) echo '***' Can only configure for one build machine at a time. 1>&2 @@ -160,6 +217,10 @@ do --cache*) cache_file=$optarg ;; + --da*) + datadir=$optarg + diroptions="$diroptions --datadir=$optarg" + ;; --disable-*) enableopt=`echo ${option} | sed 's:^--disable-:enable_:;s:-:_:g'` eval $enableopt=no @@ -172,8 +233,8 @@ do esac enableopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'` - eval $enableopt="$optarg" - enableoptions="$enableoptions $option" + eval "$enableopt='$optarg'" + enableoptions="$enableoptions '$option'" ;; --exec-prefix* | --ex*) exec_prefix=$optarg @@ -193,12 +254,41 @@ do ;; esac ;; + --inc*) + includedir=$optarg + diroptions="$diroptions --includedir=$optarg" + ;; + --inf*) + infodir=$optarg + diroptions="$diroptions --infodir=$optarg" + ;; + --libd*) + libdir=$optarg + diroptions="$diroptions --libdir=$optarg" + ;; + --libe*) + libexecdir=$optarg + diroptions="$diroptions --libexecdir=$optarg" + ;; + --lo*) + localstatedir=$optarg + diroptions="$diroptions --localstatedir=$optarg" + ;; + --ma*) + mandir=$optarg + diroptions="$diroptions --mandir=$optarg" + ;; --nfp | --nf*) floating_point=no + floating_pointoption="--nfp" ;; --norecursion | --no*) norecursion=yes ;; + --ol*) + oldincludedir=$optarg + diroptions="$diroptions --oldincludedir=$optarg" + ;; --prefix* | --pre*) prefix=$optarg prefixoption="--prefix=$optarg" @@ -219,6 +309,14 @@ do --rm) removing=--rm ;; + --sb*) + sbindir=$optarg + diroptions="$diroptions --sbindir=$optarg" + ;; + --sh*) + sharedstatedir=$optarg + diroptions="$diroptions --sharedstatedir=$optarg" + ;; --silent | --sil* | --quiet | --q*) redirect=">/dev/null" verbose=--silent @@ -237,6 +335,10 @@ do --srcdir* | --sr*) srcdir=$optarg ;; + --sy*) + sysconfdir=$optarg + diroptions="$diroptions --sysconfdir=$optarg" + ;; --target* | --ta*) case $target_alias in NOTARGET) target_alias=$optarg ;; @@ -328,7 +430,7 @@ case "${fatal}" in # Neither --host option nor undefs were present. # Call config.guess. guesssys=`echo ${progname} | sed 's/configure$/config.guess/'` - if host_alias=`${guesssys}` + if host_alias=`${config_shell} ${guesssys}` then # If the string we are going to use for # the target is a prefix of the string @@ -353,6 +455,8 @@ case "${fatal}" in ;; *) host_alias=$undefs + arguments="--host=$host_alias $arguments" + undefs=NOUNDEFS ;; esac esac @@ -367,6 +471,7 @@ case "${fatal}" in ;; *) target_alias=$undefs + arguments="--target=$target_alias $arguments" ;; esac esac @@ -411,7 +516,7 @@ configsub=`echo ${progname} | sed 's/configure$/config.sub/'` moveifchange=`echo ${progname} | sed 's/configure$/move-if-change/'` # this is a hack. sun4 must always be a valid host alias or this will fail. -if ${configsub} sun4 >/dev/null 2>&1 ; then +if ${config_shell} ${configsub} sun4 >/dev/null 2>&1 ; then true else echo '***' cannot find config.sub. 1>&2 @@ -419,7 +524,7 @@ else fi touch config.junk -if ${moveifchange} config.junk config.trash ; then +if ${config_shell} ${moveifchange} config.junk config.trash ; then true else echo '***' cannot find move-if-change. 1>&2 @@ -440,7 +545,18 @@ case "${srcdir}" in fi fi ;; -*) ;; +*) + # Set srcdir to "." if that's what it is. + # This is important for multilib support. + if [ ! -d ${srcdir} ] ; then + echo "Invalid source directory ${srcdir}" >&2 + exit 1 + fi + pwd=`pwd` + srcpwd=`cd ${srcdir} ; pwd` + if [ "${pwd}" = "${srcpwd}" ] ; then + srcdir=. + fi esac ### warn about some conflicting configurations. @@ -482,11 +598,11 @@ case "`grep '^# per\-host:' ${srcdir}/configure.in`" in eval exec ${config_shell} ${srcdir}/configure ${verbose} \ ${buildopt} --host=${host_alias} --target=${target_alias} \ ${prefixoption} ${tmpdiroption} ${exec_prefixoption} \ - ${srcdiroption} \ + ${srcdiroption} ${diroptions} \ ${program_prefixoption} ${program_suffixoption} \ ${program_transform_nameoption} ${site_option} \ ${withoptions} ${withoutoptions} \ - ${enableoptions} ${disableoptions} \ + ${enableoptions} ${disableoptions} ${floating_pointoption} \ ${cache_file_option} ${removing} ${other_options} ${redirect} else echo '***' There is no configure script present though. 1>&2 @@ -547,9 +663,9 @@ esac case "${build_alias}" in "") if result=`${config_shell} ${configsub} ${host_alias}` ; then - build_cpu=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'` - build_vendor=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'` - build_os=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'` + build_cpu=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` + build_vendor=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` + build_os=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` build=${build_cpu}-${build_vendor}-${build_os} build_alias=${host_alias} fi @@ -557,9 +673,9 @@ case "${build_alias}" in *) if result=`${config_shell} ${configsub} ${build_alias}` ; then buildopt="--build=${build_alias}" - build_cpu=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'` - build_vendor=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'` - build_os=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'` + build_cpu=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` + build_vendor=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` + build_os=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` build=${build_cpu}-${build_vendor}-${build_os} else echo "Unrecognized build system name ${build_alias}." 1>&2 @@ -574,9 +690,9 @@ else echo "Unrecognized host system name ${host_alias}." 1>&2 exit 1 fi -host_cpu=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'` -host_vendor=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'` -host_os=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'` +host_cpu=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` host=${host_cpu}-${host_vendor}-${host_os} . ${tmpfile}.hst @@ -587,9 +703,9 @@ else echo "Unrecognized target system name ${target_alias}." 1>&2 exit 1 fi -target_cpu=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'` -target_vendor=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'` -target_os=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'` +target_cpu=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +target_vendor=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +target_os=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` target=${target_cpu}-${target_vendor}-${target_os} . ${tmpfile}.tgt @@ -647,38 +763,98 @@ fi if [ -z "${CC}" -a -r Makefile ]; then sed -n -e ':loop /\\$/ N -/\\$/ b loop s/\\\n//g +t loop /^CC[ ]*=/ s/CC[ ]*=[ ]*\(.*\)/\1/p' < Makefile > Makefile.cc CC=`tail -1 Makefile.cc` rm -f Makefile.cc fi +if [ -z "${CFLAGS}" -a -r Makefile ]; then + sed -n -e ':loop +/\\$/ N +s/\\\n//g +t loop +/^CFLAGS[ ]*=/ s/CFLAGS[ ]*=[ ]*\(.*\)/\1/p' < Makefile > Makefile.cc + CFLAGS=`tail -1 Makefile.cc` + rm -f Makefile.cc +fi + if [ -z "${CXX}" -a -r Makefile ]; then sed -n -e ':loop /\\$/ N -/\\$/ b loop s/\\\n//g +t loop /^CXX[ ]*=/ s/CXX[ ]*=[ ]*\(.*\)/\1/p' < Makefile > Makefile.cc CXX=`tail -1 Makefile.cc` rm -f Makefile.cc fi +if [ -z "${CXXFLAGS}" -a -r Makefile ]; then + sed -n -e ':loop +/\\$/ N +s/\\\n//g +t loop +/^CXXFLAGS[ ]*=/ s/CXXFLAGS[ ]*=[ ]*\(.*\)/\1/p' < Makefile > Makefile.cc + CXXFLAGS=`tail -1 Makefile.cc` + rm -f Makefile.cc +fi + +# Generate a default definition for YACC. This is used if the makefile can't +# locate bison or byacc in objdir. + +for prog in 'bison -y' byacc yacc +do + set dummy $prog; tmp=$2 + IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" + for dir in $PATH; do + test -z "$dir" && dir=. + if test -f $dir/$tmp; then + DEFAULT_YACC="$prog" + break + fi + done + IFS="$save_ifs" + + test -n "$DEFAULT_YACC" && break +done + +# Generate a default definition for LEX. This is used if the makefile can't +# locate flex in objdir. + +for prog in flex lex +do + set dummy $prog; tmp=$2 + IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" + for dir in $PATH; do + test -z "$dir" && dir=. + if test -f $dir/$tmp; then + DEFAULT_LEX="$prog" + break + fi + done + IFS="$save_ifs" + + test -n "$DEFAULT_LEX" && break +done + if [ "${build}" != "${host}" ]; then # If we are doing a Canadian Cross, in which the host and build systems # are not the same, we set reasonable default values for the tools. tools="AR AR_FOR_TARGET AS AS_FOR_TARGET BISON CC_FOR_BUILD" - tools="${tools} CC_FOR_TARGET CXX_FOR_TARGET HOST_PREFIX" - tools="${tools} HOST_PREFIX_1 LEX MAKEINFO NM NM_FOR_TARGET" - tools="${tools} RANLIB RANLIB_FOR_TARGET" + tools="${tools} CC_FOR_TARGET CXX_FOR_TARGET" + tools="${tools} DLLTOOL DLLTOOL_FOR_TARGET GCC_FOR_TARGET HOST_PREFIX" + tools="${tools} HOST_PREFIX_1 LD LD_FOR_TARGET LEX MAKEINFO NM" + tools="${tools} NM_FOR_TARGET RANLIB RANLIB_FOR_TARGET" + tools="${tools} WINDRES WINDRES_FOR_TARGET YACC" for var in ${tools}; do if [ -z "`eval 'echo $'"${var}"`" -a -r Makefile ]; then sed -n -e ':loop /\\$/ N -/\\$/ b loop s/\\\n//g +t loop /^'"${var}"'[ ]*=/ s/'"${var}"'[ ]*=[ ]*\(.*\)/\1/p' \ < Makefile > Makefile.v t=`tail -1 Makefile.v` @@ -693,38 +869,50 @@ s/\\\n//g AR_FOR_TARGET=${AR_FOR_TARGET-${target_alias}-ar} AS=${AS-${host_alias}-as} AS_FOR_TARGET=${AS_FOR_TARGET-${target_alias}-as} + BISON=${BISON-bison} CC=${CC-${host_alias}-gcc} - CXX=${CXX-${host_alias}-gcc} + CFLAGS=${CFLAGS-"-g -O2"} + CXX=${CXX-${host_alias}-c++} + CXXFLAGS=${CXXFLAGS-"-g -O2"} CC_FOR_BUILD=${CC_FOR_BUILD-gcc} CC_FOR_TARGET=${CC_FOR_TARGET-${target_alias}-gcc} - CXX_FOR_TARGET=${CXX_FOR_TARGET-${target_alias}-gcc} + CXX_FOR_TARGET=${CXX_FOR_TARGET-${target_alias}-c++} + DLLTOOL=${DLLTOOL-${host_alias}-dlltool} + DLLTOOL_FOR_TARGET=${DLLTOOL_FOR_TARGET-${target_alias}-dlltool} + GCC_FOR_TARGET=${GCC_FOR_TARGET-${CC_FOR_TARGET-${target_alias}-gcc}} HOST_PREFIX=${build_alias}- HOST_PREFIX_1=${build_alias}- + LD=${LD-${host_alias}-ld} + LD_FOR_TARGET=${LD_FOR_TARGET-${target_alias}-ld} MAKEINFO=${MAKEINFO-makeinfo} NM=${NM-${host_alias}-nm} NM_FOR_TARGET=${NM_FOR_TARGET-${target_alias}-nm} RANLIB=${RANLIB-${host_alias}-ranlib} RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET-${target_alias}-ranlib} + WINDRES=${WINDRES-${host_alias}-windres} + WINDRES_FOR_TARGET=${WINDRES_FOR_TARGET-${target_alias}-windres} - if [ -z "${BISON}" ]; then + if [ -z "${YACC}" ]; then IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" for dir in $PATH; do test -z "$dir" && dir=. - if test -f $dir/byacc; then - BISON=byacc + if test -f $dir/bison; then + YACC="bison -y" break fi - if test -f $dir/bison; then - BISON=bison + if test -f $dir/byacc; then + YACC=byacc break fi if test -f $dir/yacc; then - BISON=yacc + YACC=yacc break fi done IFS="$save_ifs" - BISON=${BISON-bison} + if [ -z "${YACC}" ]; then + YACC="bison -y" + fi fi if [ -z "${LEX}" ]; then @@ -748,8 +936,11 @@ s/\\\n//g export AS export AR export CC_FOR_BUILD + export DLLTOOL + export LD export NM export RANLIB + export WINDRES else # If CC is still not set, try to get gcc. if [ -z "${CC}" ]; then @@ -758,6 +949,15 @@ else test -z "$dir" && dir=. if test -f $dir/gcc; then CC="gcc" + echo 'void f(){}' > conftest.c + if test -z "`${CC} -g -c conftest.c 2>&1`"; then + CFLAGS=${CFLAGS-"-g -O2"} + CXXFLAGS=${CFLAGS-"-g -O2"} + else + CFLAGS=${CFLAGS-"-O2"} + CXXFLAGS=${CFLAGS-"-O2"} + fi + rm -f conftest* break fi done @@ -765,11 +965,40 @@ else CC=${CC-cc} fi - CXX=${CXX-"g++ -O"} + CXX=${CXX-"c++"} + CFLAGS=${CFLAGS-"-g"} + CXXFLAGS=${CXXFLAGS-"-g -O2"} fi export CC export CXX +export CFLAGS +export CXXFLAGS + +# start-sanitize-gdbtk +# FIXME: This should be in configure.in, not configure +case "$host" in + *go32*) + enable_gdbtk=no ;; + *msdosdjgpp*) + enable_gdbtk=no ;; + *cygwin32*) + enable_gdbtk=no ;; +esac + +# FIXME: This should be in configure.in, not configure +# Determine whether gdb needs tk/tcl or not. +if [ "$enable_gdbtk" != "no" ]; then + GDB_TK="all-tcl all-tk all-itcl all-tix all-libgui" + # start-sanitize-ide + if [ "$enable_ide" = "yes" ]; then + GDB_TK="all-tcl all-tk all-itcl all-tix all-libgui all-libide" + fi + # end-sanitize-ide +else + GDB_TK="" +fi +# end-sanitize-gdbtk for subdir in . ${subdirs} ; do @@ -881,80 +1110,78 @@ EOF if [ -f ${srcdir}/${subdir}/${Makefile_in} ] ; then - # Conditionalize for this site from "Makefile.in" (or whatever it's called) into Makefile.tem - rm -f ${subdir}/Makefile.tem - case "${site}" in - "") cp ${srcdir}/${subdir}/${Makefile_in} ${subdir}/Makefile.tem ;; + # Conditionalize for this site. + rm -f ${Makefile} + case "${site}" in + "") cp ${srcdir}/${subdir}/${Makefile_in} ${Makefile} ;; *) site_makefile_frag=${srcdir}/config/ms-${site} if [ -f ${site_makefile_frag} ] ; then - sed -e "/^####/ r ${site_makefile_frag}" ${srcdir}/${subdir}/${Makefile_in} \ - > ${subdir}/Makefile.tem + sed -e "/^####/ r ${site_makefile_frag}" ${srcdir}/${subdir}/${Makefile_in} > ${Makefile} else - cp ${srcdir}/${subdir}/${Makefile_in} ${subdir}/Makefile.tem + cp ${srcdir}/${subdir}/${Makefile_in} ${Makefile} site_makefile_frag= fi ;; esac - # working copy now in ${subdir}/Makefile.tem + # working copy now in ${Makefile} # Conditionalize the makefile for this host. - rm -f ${Makefile} + rm -f ${subdir}/Makefile.tem case "${host_makefile_frag}" in - "") mv ${subdir}/Makefile.tem ${Makefile} ;; + "") mv ${Makefile} ${subdir}/Makefile.tem ;; *) if [ ! -f ${host_makefile_frag} ] ; then host_makefile_frag=${srcdir}/${host_makefile_frag} fi if [ -f ${host_makefile_frag} ] ; then - sed -e "/^####/ r ${host_makefile_frag}" ${subdir}/Makefile.tem > ${Makefile} + sed -e "/^####/ r ${host_makefile_frag}" ${Makefile} > ${subdir}/Makefile.tem else echo '***' Expected host makefile fragment \"${host_makefile_frag}\" 1>&2 echo '***' is missing in ${PWD=`pwd`}. 1>&2 - mv ${subdir}/Makefile.tem ${Makefile} + mv ${Makefile} ${subdir}/Makefile.tem fi esac - # working copy now in ${Makefile} + # working copy now in ${subdir)/Makefile.tem # Conditionalize the makefile for this target. - rm -f ${subdir}/Makefile.tem + rm -f ${Makefile} case "${target_makefile_frag}" in - "") mv ${Makefile} ${subdir}/Makefile.tem ;; + "") mv ${subdir}/Makefile.tem ${Makefile} ;; *) if [ ! -f ${target_makefile_frag} ] ; then target_makefile_frag=${srcdir}/${target_makefile_frag} fi if [ -f ${target_makefile_frag} ] ; then - sed -e "/^####/ r ${target_makefile_frag}" ${Makefile} > ${subdir}/Makefile.tem + sed -e "/^####/ r ${target_makefile_frag}" ${subdir}/Makefile.tem > ${Makefile} else - mv ${Makefile} ${subdir}/Makefile.tem + mv ${subdir}/Makefile.tem ${Makefile} target_makefile_frag= fi ;; esac - # real copy now in ${subdir}/Makefile.tem + # working copy now in ${Makefile} - # Conditionalize the makefile for this package. - rm -f ${Makefile} + # Conditionalize the makefile for this package from "Makefile.in" (or whatever it's called) into Makefile.tem. + rm -f ${subdir}/${Makefile}.tem case "${package_makefile_frag}" in - "") mv ${subdir}/Makefile.tem ${Makefile} ;; + "") mv ${Makefile} ${subdir}/Makefile.tem ;; *) if [ ! -f ${package_makefile_frag} ] ; then package_makefile_frag=${srcdir}/${package_makefile_frag} fi if [ -f ${package_makefile_frag} ] ; then - sed -e "/^####/ r ${package_makefile_frag}" ${subdir}/Makefile.tem > ${Makefile} - rm -f ${subdir}/Makefile.tem + sed -e "/^####/ r ${package_makefile_frag}" ${Makefile} > ${subdir}/${Makefile}.tem else echo '***' Expected package makefile fragment \"${package_makefile_frag}\" 1>&2 echo '***' is missing in ${PWD=`pwd`}. 1>&2 - mv ${subdir}/Makefile.tem ${Makefile} + mv ${Makefile} ${subdir}/Makefile.tem fi esac - # working copy now in ${Makefile} + # real copy now in ${subdir}/${Makefile}.tem - mv ${Makefile} ${subdir}/Makefile.tem + mv ${subdir}/${Makefile}.tem ${subdir}/Makefile.tem 2>/dev/null # real copy now in ${subdir}/Makefile.tem @@ -1008,40 +1235,81 @@ EOF echo site_makefile_frag = ${invsubdir}${site_makefile_frag} >>${Makefile} fi + # provide a proper gxx_include_dir to all subdirs. + # 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} + else + echo gxx_include_dir = ${with_gxx_include_dir} >> ${Makefile} + fi + # reset prefix, exec_prefix, srcdir, SUBDIRS, NONSUBDIRS, # remove any form feeds. if [ -z "${subdirs}" ]; then - rm -f ${subdir}/Makefile.tem2 + rm -f ${subdir}/Makefile.tm2 sed -e "s:^SUBDIRS[ ]*=.*$:SUBDIRS = ${configdirs}:" \ -e "s:^NONSUBDIRS[ ]*=.*$:NONSUBDIRS = ${noconfigdirs}:" \ - ${subdir}/Makefile.tem > ${subdir}/Makefile.tem2 + ${subdir}/Makefile.tem > ${subdir}/Makefile.tm2 rm -f ${subdir}/Makefile.tem - mv ${subdir}/Makefile.tem2 ${subdir}/Makefile.tem - fi - sed -e "s:^prefix[ ]*=.*$:prefix = ${prefix}:" \ - -e "s:^exec_prefix[ ]*=.*$:exec_prefix = ${exec_prefix}:" \ + mv ${subdir}/Makefile.tm2 ${subdir}/Makefile.tem + fi + sed -e "s|^prefix[ ]*=.*$|prefix = ${prefix}|" \ + -e "s|^exec_prefix[ ]*=.*$|exec_prefix = ${exec_prefix}|" \ + -e "s|^bindir[ ]*=.*$|bindir = ${bindir}|" \ + -e "s|^sbindir[ ]*=.*$|sbindir = ${sbindir}|" \ + -e "s|^libexecdir[ ]*=.*$|libexecdir = ${libexecdir}|" \ + -e "s|^datadir[ ]*=.*$|datadir = ${datadir}|" \ + -e "s|^sysconfdir[ ]*=.*$|sysconfdir = ${sysconfdir}|" \ + -e "s|^sharedstatedir[ ]*=.*$|sharedstatedir = ${sharedstatedir}|" \ + -e "s|^localstatedir[ ]*=.*$|localstatedir = ${localstatedir}|" \ + -e "s|^libdir[ ]*=.*$|libdir = ${libdir}|" \ + -e "s|^includedir[ ]*=.*$|includedir = ${includedir}|" \ + -e "s|^oldincludedir[ ]*=.*$|oldincludedir = ${oldincludedir}|" \ + -e "s|^infodir[ ]*=.*$|infodir = ${infodir}|" \ + -e "s|^mandir[ ]*=.*$|mandir = ${mandir}|" \ -e "/^CC[ ]*=/{ :loop1 /\\\\$/ N - /\\\\$/ b loop1 s/\\\\\\n//g + t loop1 s%^CC[ ]*=.*$%CC = ${CC}% }" \ -e "/^CXX[ ]*=/{ :loop2 /\\\\$/ N - /\\\\$/ b loop2 s/\\\\\\n//g + t loop2 s%^CXX[ ]*=.*$%CXX = ${CXX}% }" \ - -e "s:^SHELL[ ]*=.*$:SHELL = ${config_shell}:" \ - -e "s:^srcdir[ ]*=.*$:srcdir = ${makesrcdir}:" \ + -e "/^CFLAGS[ ]*=/{ + :loop3 + /\\\\$/ N + s/\\\\\\n//g + t loop3 + s%^CFLAGS[ ]*=.*$%CFLAGS = ${CFLAGS}% + }" \ + -e "/^CXXFLAGS[ ]*=/{ + :loop4 + /\\\\$/ N + s/\\\\\\n//g + t loop4 + s%^CXXFLAGS[ ]*=.*$%CXXFLAGS = ${CXXFLAGS}% + }" \ + -e "s|^SHELL[ ]*=.*$|SHELL = ${config_shell}|" \ + -e "s|^srcdir[ ]*=.*$|srcdir = ${makesrcdir}|" \ -e "s/ //" \ -e "s:^program_prefix[ ]*=.*$:program_prefix = ${program_prefix}:" \ -e "s:^program_suffix[ ]*=.*$:program_suffix = ${program_suffix}:" \ -e "s:^program_transform_name[ ]*=.*$:program_transform_name = ${program_transform_name}:" \ - -e "s:^tooldir[ ]*=.*$:tooldir = ${tooldir}:" \ + -e "s|^tooldir[ ]*=.*$|tooldir = ${tooldir}|" \ + -e "s:^DEFAULT_YACC[ ]*=.*$:DEFAULT_YACC = ${DEFAULT_YACC}:" \ + -e "s:^DEFAULT_LEX[ ]*=.*$:DEFAULT_LEX = ${DEFAULT_LEX}:" \ ${subdir}/Makefile.tem >> ${Makefile} + # start-sanitize-gdbtk + sed -e "s:^GDB_TK[ ]*=.*$:GDB_TK = ${GDB_TK}:" ${Makefile} >${Makefile}.tem + mv -f ${Makefile}.tem ${Makefile} + # end-sanitize-gdbtk # If this is a Canadian Cross, preset the values of many more # tools. @@ -1116,14 +1384,14 @@ ${progname}" ${arguments} " if [ -r ${subdir}/config.back ] ; then mv -f ${subdir}/config.back ${subdir}/config.status fi - ${moveifchange} ${subdir}/config.new ${subdir}/config.status + ${config_shell} ${moveifchange} ${subdir}/config.new ${subdir}/config.status ;; *) rm -f ${Makefile} ${subdir}/config.status ${links} ;; esac done -# If there are subdirectories, then recur. +# If there are subdirectories, then recur. if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then for configdir in ${configdirs} ; do @@ -1153,6 +1421,10 @@ if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then newsrcdir=${srcdir}/${configdir} srcdiroption="--srcdir=${newsrcdir}" ;; + ?:*) # absolute path on win32 + newsrcdir=${srcdir}/${configdir} + srcdiroption="--srcdir=${newsrcdir}" + ;; *) # otherwise relative newsrcdir=../${srcdir}/${configdir} srcdiroption="--srcdir=${newsrcdir}" @@ -1166,6 +1438,9 @@ if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then /*) # absolute path cache_file_option="--cache-file=${cache_file}" ;; + ?:*) # absolute path on win32 + cache_file_option="--cache-file=${cache_file}" + ;; *) # relative path cache_file_option="--cache-file=../${cache_file}" ;; @@ -1177,6 +1452,7 @@ if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then elif [ -f ${newsrcdir}/configure.in ] ; then case "${progname}" in /*) recprog=${progname} ;; + ?:*) recprog=${progname} ;; *) recprog=../${progname} ;; esac else @@ -1188,7 +1464,7 @@ if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then if [ ! -z "${recprog}" ] ; then if eval ${config_shell} ${recprog} ${verbose} ${buildopt} --host=${host_alias} --target=${target_alias} \ ${prefixoption} ${tmpdiroption} ${exec_prefixoption} \ - ${srcdiroption} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${withoptions} ${withoutoptions} ${enableoptions} ${disableoptions} ${cache_file_option} ${removing} ${other_options} ${redirect} ; then + ${srcdiroption} ${diroptions} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${withoptions} ${withoutoptions} ${enableoptions} ${disableoptions} ${floating_pointoption} ${cache_file_option} ${removing} ${other_options} ${redirect} ; then true else echo Configure in `pwd` failed, exiting. 1>&2