X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure;h=06bd1a1308dcef33f324a859d577d5473b4ec542;hb=93d2d69ce2e97f7b5ac8a3a5a0690fa0c48eee00;hp=0af67edb987e4abf17496c2cdf38d0a70752eac9;hpb=d9f3f187da7bb80a24995cc5ab0434ab4895b4aa;p=deliverable%2Fbinutils-gdb.git diff --git a/configure b/configure index 0af67edb98..06bd1a1308 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, 97, 98, 1999 +# 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 @@ -47,20 +48,25 @@ Makefile=Makefile Makefile_in=Makefile.in arguments= build_alias= -cache_file= +cache_file=config.cache cache_file_option= configdirs= +extraconfigdirs= +diroptions= exec_prefix= exec_prefixoption= fatal= floating_point=default gas=default +gcc_version= +gcc_version_trigger= host_alias=NOHOST host_makefile_frag= moveifchange= norecursion= other_options= package_makefile_frag= +package_makefile_rules_frag= prefix=/usr/local progname= program_prefix= @@ -69,7 +75,7 @@ program_suffix= program_suffixoption= program_transform_name= program_transform_nameoption= -redirect=">/dev/null" +redirect= removing= site= site_makefile_frag= @@ -82,9 +88,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." @@ -157,6 +206,10 @@ do # Now, process the options case $option in + --bi*) + bindir=$optarg + diroptions="$diroptions --bindir=$optarg" + ;; --build* | --bu*) case "$build_alias" in "") build_alias=$optarg ;; @@ -168,6 +221,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 @@ -201,6 +258,30 @@ 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" @@ -208,6 +289,10 @@ do --norecursion | --no*) norecursion=yes ;; + --ol*) + oldincludedir=$optarg + diroptions="$diroptions --oldincludedir=$optarg" + ;; --prefix* | --pre*) prefix=$optarg prefixoption="--prefix=$optarg" @@ -228,6 +313,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 @@ -246,6 +339,10 @@ do --srcdir* | --sr*) srcdir=$optarg ;; + --sy*) + sysconfdir=$optarg + diroptions="$diroptions --sysconfdir=$optarg" + ;; --target* | --ta*) case $target_alias in NOTARGET) target_alias=$optarg ;; @@ -286,9 +383,6 @@ do ;; --x-i* | --x-l*) other_options="$other_options $orig_option" ;; - --bi* | --sb* | --li* | --da* | --sy* | --sh* | --lo* | --in* | --ol* | --ma*) - # These options were added to autoconf for emacs. - ;; --*) echo "configure: Unrecognized option: \"$orig_option\"; use --help for usage." >&2 exit 1 @@ -424,6 +518,8 @@ 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 @@ -480,12 +576,35 @@ case "${srcdir}" in fi esac + # default exec_prefix case "${exec_prefixoption}" in "") exec_prefix="\$(prefix)" ;; *) ;; esac +# Define the trigger file to make sure configure will re-run whenever +# the gcc version number changes. +if [ "${with_gcc_version_trigger+set}" = set ]; then + gcc_version_trigger="$with_gcc_version_trigger" + gcc_version=`grep version_string ${with_gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'` +else + # If gcc's sources are available, define the trigger file. + if [ -f ${topsrcdir}/gcc/version.c ] ; then + gcc_version_trigger=${topsrcdir}/gcc/version.c + gcc_version=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'` + case "$arguments" in + *--with-gcc-version-trigger=$gcc_version_trigger* ) + ;; + * ) + # Make sure configure.in knows about this. + arguments="--with-gcc-version-trigger=$gcc_version_trigger $arguments" + ;; + esac + withoptions="--with-gcc-version-trigger=$gcc_version_trigger $withoptions" + fi +fi + ### break up ${srcdir}/configure.in. case "`grep '^# per\-host:' ${srcdir}/configure.in`" in "") @@ -508,7 +627,7 @@ 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} \ @@ -536,8 +655,8 @@ case "${TMPDIR}" in *) ;; esac -# keep this filename short for &%*%$*# 14 char file names -tmpfile=${TMPDIR}/cONf$$ +# keep this filename short for &%*%$*# 14 char file names and 8+3 file names +tmpfile=${TMPDIR}/cNf$$ # Note that under many versions of sh a trap handler for 0 will *override* any # exit status you explicitly specify! At this point, the only non-error exit # is at the end of the script; these actions are duplicated there, minus @@ -559,8 +678,24 @@ fi ### do common part of configure.in +# If the language specific compiler does not exist, but the "gcc" directory does, +# we will skip this directory; in this case the sub-directory's common part +# of configure.in will create a small shell script "skip-this-dir" containing +# commands to completely clean up any temporary or created files. + . ${tmpfile}.com +if test -f skip-this-dir; then + # Perform the same cleanup as the trap handler, minus the "exit 1" of course, + # and reset the trap handler. + trap 0 + rm -f Makefile* ${tmpfile}.com ${tmpfile}.tgt ${tmpfile}.hst ${tmpfile}.pos + # Execute the final clean-up actions + ${config_shell} skip-this-dir + # and stop configuring this directory. + exit 0 +fi + # some sanity checks on configure.in case "${srctrigger}" in "") @@ -573,9 +708,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 @@ -583,9 +718,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 @@ -600,9 +735,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 @@ -613,9 +748,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 @@ -670,7 +805,7 @@ 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. -if [ -z "${CC}" -a -r Makefile ]; then +if [ -z "${CC}" ] && [ -r Makefile ]; then sed -n -e ':loop /\\$/ N s/\\\n//g @@ -680,7 +815,17 @@ t loop rm -f Makefile.cc fi -if [ -z "${CXX}" -a -r Makefile ]; then +if [ -z "${CFLAGS}" ] && [ -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}" ] && [ -r Makefile ]; then sed -n -e ':loop /\\$/ N s/\\\n//g @@ -690,6 +835,16 @@ t loop rm -f Makefile.cc fi +if [ -z "${CXXFLAGS}" ] && [ -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. @@ -709,6 +864,25 @@ do test -n "$DEFAULT_YACC" && break done +# Generate a default definition for M4. This is used if the makefile can't +# locate m4 in objdir. + +for prog in gm4 gnum4 m4 +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_M4="$prog" + break + fi + done + IFS="$save_ifs" + + test -n "$DEFAULT_M4" && break +done + # Generate a default definition for LEX. This is used if the makefile can't # locate flex in objdir. @@ -734,12 +908,13 @@ if [ "${build}" != "${host}" ]; then tools="AR AR_FOR_TARGET AS AS_FOR_TARGET BISON CC_FOR_BUILD" tools="${tools} CC_FOR_TARGET CXX_FOR_TARGET" - tools="${tools} DLLTOOL DLLTOOL_FOR_TARGET HOST_PREFIX" + 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 + if [ -z "`eval 'echo $'"${var}"`" ] && [ -r Makefile ]; then sed -n -e ':loop /\\$/ N s/\\\n//g @@ -758,13 +933,17 @@ t loop 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} @@ -774,26 +953,30 @@ t loop 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 @@ -821,6 +1004,7 @@ t loop export LD export NM export RANLIB + export WINDRES else # If CC is still not set, try to get gcc. if [ -z "${CC}" ]; then @@ -828,30 +1012,63 @@ else for dir in $PATH; do test -z "$dir" && dir=. if test -f $dir/gcc; then - CC="gcc -O2" + CC="gcc" + echo 'void f(){}' > conftest.c + if test -z "`${CC} -g -c conftest.c 2>&1`"; then + CFLAGS=${CFLAGS-"-g -O2"} + CXXFLAGS=${CXXFLAGS-"-g -O2"} + else + CFLAGS=${CFLAGS-"-O2"} + CXXFLAGS=${CXXFLAGS-"-O2"} + fi + rm -f conftest* break fi done IFS="$save_ifs" CC=${CC-cc} + else + if test -z "${CFLAGS}"; then + # Here CC is set but CFLAGS is not. Use a quick hack to use -O2 if CC + # is set to a version of gcc. + case "${CC}" in + *gcc) + echo 'void f(){}' > conftest.c + if test -z "`${CC} -g -c conftest.c 2>&1`"; then + CFLAGS=${CFLAGS-"-g -O2"} + CXXFLAGS=${CXXFLAGS-"-g -O2"} + else + CFLAGS=${CFLAGS-"-O2"} + CXXFLAGS=${CXXFLAGS-"-O2"} + fi + rm -f conftest* + ;; + esac + fi fi - CXX=${CXX-"gcc"} + CXX=${CXX-"c++"} + CFLAGS=${CFLAGS-"-g"} + CXXFLAGS=${CXXFLAGS-"-g -O2"} fi export CC export CXX +export CFLAGS +export CXXFLAGS +# FIXME: This should be in configure.in, not configure case "$host" in *go32*) enable_gdbtk=no ;; - *cygwin32*) + *msdosdjgpp*) 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" + GDB_TK="all-tcl all-tk all-itcl all-tix all-libgui" else GDB_TK="" fi @@ -913,27 +1130,34 @@ for subdir in . ${subdirs} ; do set ${links}; link=$1; shift; links=$* if [ ! -r ${srcdir}/${file} ] ; then + if [ ! -r ${file} ] ; then + echo '***' "${progname}: cannot create a link \"${link}\"," 1>&2 echo '***' "since the file \"${srcdir}/${file}\" does not exist." 1>&2 exit 1 + else + srcfile=${file} + fi + else + srcfile=${srcdir}/${file} fi ${remove} -f ${link} # Make a symlink if possible, otherwise try a hard link - if ${symbolic_link} ${srcdir}/${file} ${link} >/dev/null 2>&1 ; then + if ${symbolic_link} ${srcfile} ${link} >/dev/null 2>&1 ; then true else # We need to re-remove the file because Lynx leaves a # very strange directory there when it fails an NFS symlink. ${remove} -r -f ${link} - ${hard_link} ${srcdir}/${file} ${link} + ${hard_link} ${srcfile} ${link} fi if [ ! -r ${link} ] ; then - echo '***' "${progname}: unable to link \"${link}\" to \"${srcdir}/${file}\"." 1>&2 + echo '***' "${progname}: unable to link \"${link}\" to \"${srcfile}\"." 1>&2 exit 1 fi - echo "Linked \"${link}\" to \"${srcdir}/${file}\"." + echo "Linked \"${link}\" to \"${srcfile}\"." done # Create a .gdbinit file which runs the one in srcdir @@ -959,88 +1183,101 @@ EOF # been somewhat optimized and is perhaps a bit twisty. # code is order so as to try to sed the smallest input files we know. + # so do these separately because I don't trust the order of sed -e expressions. - # the four makefile fragments MUST end up in the resulting Makefile in this order: - # package, target, host, and site. so do these separately because I don't trust the - # order of sed -e expressions. + # the five makefile fragments MUST end up in the resulting Makefile in this order: + # package macros, target, host, site, and package rules. 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 + # 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_rules_frag}" in "") cp ${srcdir}/${subdir}/${Makefile_in} ${subdir}/Makefile.tem ;; + *) + if [ ! -f ${package_makefile_rules_frag} ] ; then + package_makefile_rules_frag=${srcdir}/${package_makefile_rules_frag} + fi + if [ -f ${package_makefile_rules_frag} ] ; then + sed -e "/^####/ r ${package_makefile_rules_frag}" ${srcdir}/${subdir}/${Makefile_in} > ${Makefile}.tem + else + echo '***' Expected package makefile rules fragment \"${package_makefile_rules_frag}\" 1>&2 + echo '***' is missing in ${PWD=`pwd`}. 1>&2 + cp ${srcdir}/${subdir}/${Makefile_in} ${subdir}/Makefile.tem + fi + esac + # working copy now in ${Makefile}.tem + + # Conditionalize for this site. + rm -f ${Makefile} + case "${site}" in + "") mv ${subdir}/Makefile.tem ${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}" ${subdir}/Makefile.tem \ + > ${Makefile} else - cp ${srcdir}/${subdir}/${Makefile_in} ${subdir}/Makefile.tem + mv ${subdir}/Makefile.tem ${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} + # Emit the default values of this package's macros. + 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 '***' Expected package makefile fragment \"${package_makefile_rules_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} - - mv ${Makefile} ${subdir}/Makefile.tem - # real copy now in ${subdir}/Makefile.tem # prepend warning about editting, and a bunch of variables. @@ -1093,18 +1330,49 @@ EOF echo site_makefile_frag = ${invsubdir}${site_makefile_frag} >>${Makefile} fi + # record if we want to build shared libs. + if test -z "${enable_shared}"; then + echo enable_shared = no >> ${Makefile} + 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 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, # 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 @@ -1119,17 +1387,34 @@ EOF t loop2 s%^CXX[ ]*=.*$%CXX = ${CXX}% }" \ - -e "s:^SHELL[ ]*=.*$:SHELL = ${config_shell}:" \ - -e "s:^GDB_TK[ ]*=.*$:GDB_TK = ${GDB_TK}:" \ - -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}:" \ + -e "s:^DEFAULT_M4[ ]*=.*$:DEFAULT_M4 = ${DEFAULT_M4}:" \ ${subdir}/Makefile.tem >> ${Makefile} + + sed -e "s:^GDB_TK[ ]*=.*$:GDB_TK = ${GDB_TK}:" ${Makefile} >${Makefile}.tem + mv -f ${Makefile}.tem ${Makefile} # If this is a Canadian Cross, preset the values of many more # tools. @@ -1204,27 +1489,41 @@ ${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 [ -z "${norecursion}" -a -n "${configdirs}" ] ; then - for configdir in ${configdirs} ; do +# If there are subdirectories, then recur. +if [ -z "${norecursion}" ] && [ -n "${configdirs}" ] ; then + for configdir in ${configdirs} ${extraconfigdirs} ; do + + # If configdir contains ',' it is + # srcdir,builddir,target_alias + # These come from extraconfigdirs. + case ${configdir} in + *,*) + eval `echo ${configdir} | sed -e 's/\([^,]*\),\([^,]*\),\(.*\)/cfg_dir=\1 bld_dir=\2 tgt_alias=\3/'` + ;; + *) + cfg_dir=${configdir} + bld_dir=${configdir} + tgt_alias=${target_alias} + ;; + esac - if [ -d ${srcdir}/${configdir} ] ; then + if [ -d ${srcdir}/${cfg_dir} ] ; then eval echo Configuring ${configdir}... ${redirect} case "${srcdir}" in ".") ;; *) - if [ ! -d ./${configdir} ] ; then - if mkdir ./${configdir} ; then + if [ ! -d ./${bld_dir} ] ; then + if mkdir ./${bld_dir} ; then true else - echo '***' "${progname}: could not make ${PWD=`pwd`}/${configdir}" 1>&2 + echo '***' "${progname}: could not make ${PWD=`pwd`}/${bld_dir}" 1>&2 exit 1 fi fi @@ -1232,17 +1531,21 @@ if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then esac POPDIR=${PWD=`pwd`} - cd ${configdir} + cd ${bld_dir} ### figure out what to do with srcdir case "${srcdir}" in ".") newsrcdir=${srcdir} ;; # no -srcdir option. We're building in place. /*) # absolute path - newsrcdir=${srcdir}/${configdir} + newsrcdir=${srcdir}/${cfg_dir} + srcdiroption="--srcdir=${newsrcdir}" + ;; + ?:*) # absolute path on win32 + newsrcdir=${srcdir}/${cfg_dir} srcdiroption="--srcdir=${newsrcdir}" ;; *) # otherwise relative - newsrcdir=../${srcdir}/${configdir} + newsrcdir=../${srcdir}/${cfg_dir} srcdiroption="--srcdir=${newsrcdir}" ;; esac @@ -1254,6 +1557,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}" ;; @@ -1265,18 +1571,19 @@ if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then elif [ -f ${newsrcdir}/configure.in ] ; then case "${progname}" in /*) recprog=${progname} ;; + ?:*) recprog=${progname} ;; *) recprog=../${progname} ;; esac else - eval echo No configuration information in ${configdir} ${redirect} + eval echo No configuration information in ${cfg_dir} ${redirect} recprog= fi ### The recursion line is here. if [ ! -z "${recprog}" ] ; then - if eval ${config_shell} ${recprog} ${verbose} ${buildopt} --host=${host_alias} --target=${target_alias} \ + if eval ${config_shell} ${recprog} ${verbose} ${buildopt} --host=${host_alias} --target=${tgt_alias} \ ${prefixoption} ${tmpdiroption} ${exec_prefixoption} \ - ${srcdiroption} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${withoptions} ${withoutoptions} ${enableoptions} ${disableoptions} ${floating_pointoption} ${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