X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure;h=499d0eb3d02db9c24f092637b26c509509fb3cf5;hb=9d14250f9dd458e75fdb5da6072e791fe7b8b532;hp=20e2d56413444f3779de67e0c7e42103f49fb49f;hpb=dbb0309d6cd3ed12c1071a1473823c0eac92113a;p=deliverable%2Fbinutils-gdb.git diff --git a/configure b/configure index 20e2d56413..499d0eb3d0 100755 --- a/configure +++ b/configure @@ -3,7 +3,7 @@ ### WARNING: this file contains embedded tabs. Do not run untabify on this file. # Configuration script -# Copyright (C) 1988, 1990, 1991, 1992, 1993 Free Software Foundation, Inc. +# Copyright (C) 1988, 90, 91, 92, 93, 94 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 @@ -17,10 +17,13 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# Please email any bugs, comments, and/or additions to this file to: +# Please report any problems running this configure script to # configure@cygnus.com +# Please do not send reports about other problems to this address. See +# gdb/README, gas/README, etc., for info on where and how to report +# problems about particular tools. # This file was written by K. Richard Pixley. @@ -49,22 +52,20 @@ symbolic_link='ln -s' Makefile=Makefile Makefile_in=Makefile.in arguments=$* +build_alias= +cache_file= +cache_file_option= configdirs= exec_prefix= exec_prefixoption= fatal= floating_point=default gas=default -host_alias= +host_alias=NOHOST host_makefile_frag= moveifchange= -next_host= -next_prefix= -next_site= -next_srcdir= -next_target= -next_tmpdir= norecursion= +other_options= package_makefile_frag= prefix=/usr/local progname= @@ -82,9 +83,9 @@ site_option= srcdir= srctrigger= subdirs= -target_alias= +target_alias=NOTARGET target_makefile_frag= -undefinedargs= +undefs=NOUNDEFS version="$Revision$" x11=default @@ -115,307 +116,301 @@ case "${progname}" in ;; esac -for arg in $* +# Loop over all args + +while : do - # handle things that might have args following as separate words - if [ -n "${next_prefix}" ] ; then prefix=${arg} ; prefixoption="-prefix=${prefix}" ; next_prefix= - elif [ -n "${next_exec_prefix}" ] ; then - exec_prefix=${arg} - exec_prefixoption="-exec-prefix=${exec_prefix}" - next_exec_prefix= - elif [ -n "${next_site}" ] ; then site=${arg} ; site_option=-site=${site} ; next_site= - # remove any possible trailing slash from srcdir. See note below. - elif [ -n "${next_srcdir}" ] ; then srcdir=`echo ${arg} | sed -e 's:/$::'` ; next_srcdir= - elif [ -n "${next_program_prefix}" ] ; then - program_prefix=${arg} - program_prefixoption="-program_prefix=${program_prefix}" - next_program_prefix= - elif [ -n "${next_program_suffix}" ] ; then - program_suffix=${arg} - program_suffixoption="-program_suffix=${program_suffix}" - next_program_suffix= - elif [ -n "${next_program_transform_name}" ] ; then - # Double any backslashes or dollar signs in the argument - if [ -n "${arg}" ] ; then - program_transform_name="${program_transform_name} -e `echo ${arg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`" - fi - program_transform_nameoption="${program_transform_nameoption} --program-transform-name='${arg}'" - next_program_transform_name= - elif [ -n "${next_target}" ] ; then - next_target= - case "${target_alias}" in - "") - target_alias="${arg}" - ;; - *) - echo '***' Can only configure for one target at a time. 1>&2 - fatal=yes - ;; - esac - elif [ -n "${next_host}" ] ; then - next_host= - case "${host_alias}" in - "") - host_alias="${arg}" - ;; - *) - echo '***' Can only configure for one host at a time. 1>&2 - fatal=yes - ;; - esac - elif [ -n "${next_tmpdir}" ] ; then - next_tmpdir= - tmpdiroption="--tmpdir=${arg}" - TMPDIR=${arg} - else - case ${arg} in - -exec_prefix=* | --exec_prefix=* | --exec_prefi=* | --exec_pref=* | --exec_pre=* | --exec_pr=* | --exec_p=* | --exec_=* | --exec=* | --exe=* | --ex=* | --e=* | -exec-prefix=* | --exec-prefix=* | --exec-prefi=* | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* ) - exec_prefix=`echo ${arg} | sed 's/^[-a-z_]*=//'` - exec_prefixoption=${arg} - ;; - -exec_prefix | --exec_prefix | --exec_prefi | --exec_pref | --exec_pre | --exec_pr | --exec_p | --exec_ | --exec | --exe | --ex | --e | -exec-prefix | --exec-prefix | --exec-prefi | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec-) - next_exec_prefix=yes - ;; - -gas | --g*) - gas=yes - ;; - -help | --he*) - fatal=true - ;; - -host=* | --host=* | --hos=* | --ho=*) - case "${host_alias}" in - "") - host_alias="`echo ${arg} | sed 's/^[-a-z]*=//'`" - ;; - *) - echo '***' Can only configure for one host at a time. 1>&2 - fatal=yes - ;; - esac - ;; - -host=* | --host | --hos | --ho) - case "${host_alias}" in - "") - next_host=yes - ;; - *) - echo '***' Can only configure for one host at a time. 1>&2 - fatal=yes - ;; - esac - ;; - -nfp | --nf*) - floating_point=no - ;; - -norecursion | --no*) - norecursion=true - ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=*) - prefix=`echo ${arg} | sed 's/^[-a-z]*=//'` - prefixoption=${arg} - ;; - -prefix | --prefix | --prefi | --pref | --pre) - next_prefix=yes - ;; - -rm | --rm) removing=${arg} ;; - -program_prefix=* | --program_prefix=* | --program_prefi=* | --program_pref=* | --program_pre=* | --program_pr=* | --program_p=* | -program-prefix=* | --program-prefix=* | --program-prefi=* | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=`echo ${arg} | sed 's/^[-a-z_]*=//'` - program_prefixoption=${arg} - ;; - -program_prefix | --program_prefix | --program_prefi | --program_pref | --program_pre | --program_pr | --program_p | -program-prefix | --program-prefix | --program-prefi | --program-pref | --program-pre | --program-pr | --program-p) - next_program_prefix=yes - ;; - -program_suffix=* | --program_suffix=* | --program_suffi=* | --program_suff=* | --program_suf=* | --program_su=* | --program_s=* | -program-suffix=* | --program-suffix=* | --program-suffi=* | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=`echo ${arg} | sed 's/^[-a-z_]*=//'` - program_suffixoption=${arg} - ;; - -program_suffix | --program_suffix | --program_suffi | --program_suff | --program_suf | --program_su | --program_s |-program-suffix | --program-suffix | --program-suffi | --program-suff | --program-suf | --program-su | --program-s) - next_program_suffix=yes - ;; - -program_transform_name=* | --program_transform_name=* | --program_transform_nam=* | --program_transform_na=* | --program_transform_n=* | --program_transform_=* | --program_transform=* | --program_transfor=* | --program_transfo=* | --program_transf=* | --program_trans=* | --program_tran=* | --program_tra=* | --program_tr=* | --program_t=* | -program-transform-name=* | --program-transform-name=* | --program-transform-nam=* | --program-transform-na=* | --program-transform-n=* | --program-transform-=* | --program-transform=* | --program-transfor=* | --program-transfo=* | --program-transf=* | --program-trans=* | --program-tran=* | --program-tra=* | --program-tr=* | --program-t=*) - arg=`echo ${arg} | sed -e 's/^[-a-z_]*=//'` - # Double any \ or $ in the argument - if [ -n "${arg}" ] ; then - program_transform_name="${program_transform_name} -e `echo ${arg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`" - fi - program_transform_nameoption="${program_transform_nameoption} --program-transform-name='${arg}'" - ;; - -program_transform_name | --program_transform_name | --program_transform_nam | --program_transform_na | --program_transform_n | --program_transform_ | --program_transform | --program_transfor | --program_transfo | --program_transf | --program_trans | --program_tran | --program_tra | --program_tr | --program_t | -program-transform-name | --program-transform-name | --program-transform-nam | --program-transform-na | --program-transform-n | --program-transform- | --program-transform | --program-transfor | --program-transfo | --program-transf | --program-trans | --program-tran | --program-tra | --program-tr | --program-t) - next_program_transform_name=yes - ;; - -site=* | --site=* | --sit=* | --si=*) - site_option=${arg} - site=`echo ${arg} | sed 's/^[-a-z]*=//'` - ;; - -site | --site | --sit) - next_site=yes - ;; - # remove trailing slashes. Otherwise, when the file name gets - # bolted into an object file as debug info, it has two slashes in - # it. Ordinarily this is ok, but emacs takes double slash to - # mean "forget the first part". - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=`echo ${arg} | sed 's/^[-a-z]*=//' | sed -e 's:/$::'` - ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - next_srcdir=yes - ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=*) - case "${target_alias}" in - "") target_alias="`echo ${arg} | sed 's/^[-a-z]*=//'`" ;; - *) - echo '***' Can only configure for one target at a time. 1>&2 - fatal=yes - ;; - esac - ;; - -target | --target | --targe | --targ | --tar | --ta) - next_target=yes - ;; - -tmpdir=* | --tmpdir=* | --tmpdi=* | --tmpd=* | --tmp=* | --tm=*) - tmpdiroption=${arg} - TMPDIR=`echo ${arg} | sed 's/^[-a-z]*=//'` - ;; - -tmpdir | --tmpdir | --tmpdi | --tmpd | --tmp | --tm) - next_tmpdir=yes - ;; - -v | -verbose | --v) - redirect= - verbose=-v - ;; - -version | -V | --version | --V) - echo "This is Cygnus Configure version" `echo ${version} | sed 's/[ $:]//g'` - exit 0 - ;; - -with*=* | --with*=*) - withopt=`echo ${arg} | sed 's:^-*\(with[^=]*\)=.*$:\1:;s/-/_/g'` - withval=`echo ${arg} | sed 's:^-*with[^=]*=\(.*\)$:\1:'` - eval $withopt="$withval" - withoptions="$withoptions $arg" - ;; - -without* | --without*) - withopt=`echo ${arg} | sed 's:^-*without:with:;s/-/_/g'` - eval $withopt=no - withoutoptions="$withoutoptions $arg" - ;; - -with* | --with*) - withopt=`echo ${arg} | sed 's:^-*with:with:;s/-/_/g'` - eval $withopt=yes - withoptions="$withoptions $arg" - ;; - -x | --x) ;; - -* | --*) - (echo ; - echo "Unrecognized option: \"${arg}\"". ; - echo) 1>&2 - fatal=true - ;; - *) - case "${undefs}" in - "") - undefs="${arg}" - ;; - *) - echo '***' Can only configure for one host and one target at a time. 1>&2 - fatal=yes - ;; - esac - ;; - esac - fi +# Break out if there are no more args + case $# in + 0) + break + ;; + esac + +# Get the first arg, and shuffle + option=$1 + shift + +# Make all options have two hyphens + orig_option=$option # Save original for error messages + case $option in + --*) ;; + -*) option=-$option ;; + esac + +# Split out the argument for options that take them + case $option in + --*=*) + optarg=`echo $option | sed -e 's/^[^=]*=//'` + ;; +# 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-*) + optarg=$1 + shift + ;; + esac + +# Now, process the options + case $option in + + --build* | --b*) + case "$build_alias" in + "") build_alias=$optarg ;; + *) echo '***' Can only configure for one build machine at a time. 1>&2 + fatal=yes + ;; + esac + ;; + --cache*) + cache_file=$optarg + ;; + --disable-*) + enableopt=`echo ${option} | sed 's:^--disable-:enable_:;s:-:_:g'` + eval $enableopt=no + disableoptions="$disableoptions $option" + ;; + --enable-*) + case "$option" in + *=*) ;; + *) optarg=yes ;; + esac + + enableopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'` + eval $enableopt="$optarg" + enableoptions="$enableoptions $option" + ;; + --exec-prefix* | --ex*) + exec_prefix=$optarg + exec_prefixoption="--exec-prefix=$optarg" + ;; + --gas | --g*) + gas=yes + ;; + --help | --he*) + fatal=yes + ;; + --host* | --ho*) + case $host_alias in + NOHOST) host_alias=$optarg ;; + *) echo '***' Can only configure for one host at a time. 1>&2 + fatal=yes + ;; + esac + ;; + --nfp | --nf*) + floating_point=no + ;; + --norecursion | --no*) + norecursion=yes + ;; + --prefix* | --pre*) + prefix=$optarg + prefixoption="--prefix=$optarg" + ;; + --program-prefix* | --program-p*) + program_prefix=$optarg + program_prefixoption="--program-prefix=$optarg" + ;; + --program-suffix* | --program-s*) + program_suffix=$optarg + program_suffixoption="--program-suffix=$optarg" + ;; + --program-transform-name* | --program-t*) + # Double any backslashes or dollar signs in the argument + program_transform_name="${program_transform_name} -e `echo ${optarg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`" + program_transform_nameoption="${program_transform_nameoption} --program-transform-name='$optarg'" + ;; + --rm) + removing=--rm + ;; + --silent | --sil* | --quiet | --q*) + redirect=">/dev/null" + verbose=--silent + ;; + --site* | --sit*) + site=$optarg + site_option="--site=$optarg" + ;; + --srcdir*/ | --sr*/) + # Remove trailing slashes. Otherwise, when the file name gets + # bolted into an object file as debug info, it has two slashes + # in it. Ordinarily this is ok, but emacs takes double slash + # to mean "forget the first part". + srcdir=`echo $optarg | sed -e 's:/$::'` + ;; + --srcdir* | --sr*) + srcdir=$optarg + ;; + --target* | --ta*) + case $target_alias in + NOTARGET) target_alias=$optarg ;; + *) echo '***' Can only configure for one target at a time. 1>&2 + fatal=yes + ;; + esac + ;; + --tmpdir* | --tm*) + TMPDIR=$optarg + tmpdiroption="--tmpdir=$optarg" + ;; + --verbose | --v | --verb*) + redirect= + verbose=--verbose + ;; + --version | --V | --vers*) + echo "This is Cygnus Configure version" `echo ${version} | sed 's/[ $:]//g'` + exit 0 + ;; + --with-*) + case "$option" in + *=*) ;; + *) optarg=yes ;; + esac + + withopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'` + eval $withopt="$optarg" + withoptions="$withoptions $option" + ;; + --without-*) + withopt=`echo ${option} | sed 's:^--::;s:out::;s:-:_:g'` + eval $withopt=no + withoutoptions="$withoutoptions $option" + ;; + --x) with_x=yes + withoptions="$withoptions --with-x" + ;; + --x-i* | --x-l*) other_options="$other_options $orig_option" + ;; + --*) + echo "configure: Unrecognized option: \"$orig_option\"; use --help for usage." >&2 + exit 1 + ;; + *) + case $undefs in + NOUNDEFS) undefs=$option ;; + *) echo '***' Can only configure for one host and one target at a time. 1>&2 + fatal=yes + ;; + esac + ;; + esac done # process host and target + +# Do some error checking and defaulting for the host and target type. +# The inputs are: +# configure --host=HOST --target=TARGET UNDEFS +# +# The rules are: +# 1. You aren't allowed to specify --host, --target, and undefs at the +# same time. +# 2. Host defaults to undefs. +# 3. If undefs is not specified, then host defaults to the current host, +# as determined by config.guess. +# 4. Target defaults to undefs. +# 5. If undefs is not specified, then target defaults to host. + case "${fatal}" in "") -# # Complain if an arg is missing -# if [ -z "${host_alias}" ] ; then -# (echo ; -# echo "configure: No HOST specified." ; -# echo) 1>&2 -# fatal=true -# fi - -### This is a bit twisted. -### * if all three are specified, this is an error. -### * if we have neither hosts, nor unadorned args, guess with config.guess. -### * if no hosts are specified, then the unadorned args are hosts, but if -### there were none, this is an error. -### * if no targets are specified, then the unadorned args are targets, but if -### there were no unadorned args, then the hosts are also targets. - - if [ -n "${host_alias}" -a -n "${target_alias}" -a -n "${undefs}" ] - then - echo '***' Can only configure for one host and one target at a time. 1>&2 - fatal=yes - elif [ -z "${host_alias}" -a -z "${target_alias}" -a -z "${undefs}" ] - then - guesssys=`echo ${progname} | sed 's/configure$/config.guess/'` - if tmp_alias=`${guesssys}` ; then - echo "Configuring for a ${tmp_alias} host." 1>&2 - host_alias=${tmp_alias} - case "${target_alias}" in - "") target_alias=${tmp_alias} ;; - *) ;; - esac - arguments="--host=${host_alias} ${arguments}" - else - echo 'Config.guess failed to determine the host type. You need to specify one.' 1>&2 - fatal=yes - fi - else - case "${host_alias}" in - "") - case "${undefs}" in - "") host_alias=${target_alias} ;; - *) host_alias=${undefs} ;; - esac - ;; - *) ;; - esac - - case "${target_alias}" in - "") - case "${undefs}" in - "") target_alias=${host_alias} ;; - *) target_alias=${undefs} ;; - esac - ;; - *) ;; - esac - fi - ;; + # Make sure that host, target & undefs aren't all specified at the + # same time. + case $host_alias---$target_alias---$undefs in + NOHOST---*---* | *---NOTARGET---* | *---*---NOUNDEFS) + ;; + *) echo '***' Can only configure for one host and one target at a time. 1>&2 + fatal=yes + break 2 + ;; + esac + + # Now, do defaulting for host. + case $host_alias in + NOHOST) + case $undefs in + NOUNDEFS) + # Neither --host option nor undefs were present. + # Call config.guess. + guesssys=`echo ${progname} | sed 's/configure$/config.guess/'` + if host_alias=`${guesssys}` + then + # If the string we are going to use for + # the target is a prefix of the string + # we just guessed for the host, then + # assume we are running native, and force + # the same string for both target and host. + case $target_alias in + NOTARGET) ;; + *) + if expr $host_alias : $target_alias >/dev/null + then + host_alias=$target_alias + fi + ;; + esac + echo "Configuring for a ${host_alias} host." 1>&2 + arguments="--host=$host_alias $arguments" + else + echo 'Config.guess failed to determine the host type. You need to specify one.' 1>&2 + fatal=yes + fi + ;; + *) + host_alias=$undefs + ;; + esac + esac + + # Do defaulting for target. If --target option isn't present, default + # to undefs. If undefs isn't present, default to host. + case $target_alias in + NOTARGET) + case $undefs in + NOUNDEFS) + target_alias=$host_alias + ;; + *) + target_alias=$undefs + ;; + esac + esac + ;; *) ;; esac if [ -n "${fatal}" -o "${host_alias}" = "help" ] ; then - (echo "Usage: configure HOST" ; - echo ; - echo "Options: [defaults in brackets]" ; - echo " --prefix=MYDIR configure for installation of host dependent files into MYDIR. [\"/usr/local\"]" ; - echo " --exec-prefix=MYDIR configure for installation of host dependent files into MYDIR. [\"/usr/local\"]" ; - echo " --help print this message. [normal config]" ; - echo " --norecursion configure this directory only. [recurse]" ; - echo " --program-prefix=FOO install programs with FOO prepended to their names. [ \"\" ]" ; - echo " --program-suffix=FOO install programs with FOO appended to their names. [ \"\" ]" ; - echo " --program-transform-name=FOO install programs with names transformed by sed pattern FOO. [ \"\" ]" ; - echo " --site=SITE configure with site specific makefile for SITE" ; - echo " --srcdir=DIR find the sources in DIR. [\".\" or \"..\"]" ; - echo " --target=TARGET configure for TARGET. [TARGET = HOST]" ; - echo " --tmpdir=TMPDIR create temporary files in TMPDIR. [ TMPDIR = \"/tmp\" ]" ; - echo " --nfp configure the compilers default to soft floating point. [hard float]" ; - echo " --with-FOO, --with-FOO=BAR specify that FOO is available" - echo " --without-FOO specify that FOO is NOT available" - echo ; - echo "Where HOST and TARGET are something like \"vax\", \"sun3\", \"encore\", etc." ; - echo ; - ) 1>&2 - if [ -r config.status ] ; then - cat config.status - fi - - exit 1 + exec 1>&2 + echo Usage: configure [OPTIONS] [HOST] + echo + echo Options: [defaults in brackets] + echo ' --prefix=MYDIR install into MYDIR [/usr/local]' + echo ' --exec-prefix=MYDIR install host-dependent files into MYDIR [/usr/local]' + echo ' --help print this message [normal config]' + echo ' --build=BUILD configure for building on BUILD [BUILD=HOST]' + echo ' --host=HOST configure for HOST [determined via config.guess]' + echo ' --norecursion configure this directory only [recurse]' + echo ' --program-prefix=FOO prepend FOO to installed program names [""]' + echo ' --program-suffix=FOO append FOO to installed program names [""]' + echo ' --program-transform-name=P transform installed names by sed pattern P [""]' + echo ' --site=SITE configure with site-specific makefile for SITE' + echo ' --srcdir=DIR find the sources in DIR [. or ..]' + echo ' --target=TARGET configure for TARGET [TARGET=HOST]' + echo ' --tmpdir=TMPDIR create temporary files in TMPDIR [/tmp]' + echo ' --nfp configure for software floating point [hard float]' + echo ' --with-FOO, --with-FOO=BAR package FOO is available (parameter BAR)' + echo ' --without-FOO package FOO is NOT available' + echo ' --enable-FOO, --enable-FOO=BAR include feature FOO (parameter BAR)' + echo ' --disable-FOO do not include feature FOO' + echo + echo 'Where HOST and TARGET are something like "sparc-sunos", "mips-sgi-irix5", etc.' + echo + if [ -r config.status ] ; then + cat config.status + fi + + exit 1 fi configsub=`echo ${progname} | sed 's/configure$/config.sub/'` @@ -446,7 +441,7 @@ case "${srcdir}" in if [ -r ${progname}.in ] ; then srcdir=`echo ${progname} | sed 's:/configure$::'` else - echo '***' "Can't find configure.in. Try using -srcdir=some_dir" 1>&2 + echo '***' "Can't find configure.in. Try using --srcdir=some_dir" 1>&2 exit 1 fi fi @@ -466,7 +461,7 @@ case "${srcdir}" in esac # default exec_prefix -case "${exec_prefix}" in +case "${exec_prefixoption}" in "") exec_prefix="\$(prefix)" ;; *) ;; esac @@ -475,6 +470,34 @@ esac case "`grep '^# per\-host:' ${srcdir}/configure.in`" in "") echo '***' ${srcdir}/configure.in has no \"per-host:\" line. 1>&2 + # Check for a directory that's been converted to use autoconf since + # it was last configured. + if grep AC_OUTPUT ${srcdir}/configure.in >/dev/null ; then + echo '***' Hmm, looks like this directory has been autoconfiscated. 1>&2 + if [ -r ${srcdir}/configure ] ; then + echo '***' Running the local configure script. 1>&2 + case "${cache_file}" in + "") cache_file_option= ;; + *) cache_file_option="--cache-file=${cache_file}" ;; + esac + srcdiroption="--srcdir=${srcdir}" + case "${build_alias}" in + "") buildopt= ;; + *) buildopt="--build=${build_alias}" ;; + esac + eval exec ${config_shell} ${srcdir}/configure ${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} + else + echo '***' There is no configure script present though. 1>&2 + fi + fi exit 1 ;; *) ;; @@ -495,7 +518,12 @@ esac # keep this filename short for &%*%$*# 14 char file names tmpfile=${TMPDIR}/cONf$$ -trap "rm -f ${tmpfile}.com ${tmpfile}.tgt ${tmpfile}.hst ${tmpfile}.pos" 0 +# 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 +# the "exit 1". Don't use "exit 0" anywhere after this without resetting the +# trap handler, or you'll lose. +trap "rm -f Makefile.tem ${tmpfile}.com ${tmpfile}.tgt ${tmpfile}.hst ${tmpfile}.pos; exit 1" 0 1 2 15 # split ${srcdir}/configure.in into common, per-host, per-target, # and post-target parts. Post-target is optional. @@ -522,7 +550,36 @@ case "${srctrigger}" in *) ;; esac -result=`${configsub} ${host_alias}` +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=${host_cpu}-${host_vendor}-${host_os} + build_alias=${host_alias} + fi + ;; +*) + 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=${build_cpu}-${build_vendor}-${build_os} + else + echo "Unrecognized build system name ${build_alias}." 1>&2 + exit 1 + fi + ;; +esac + +if result=`${config_shell} ${configsub} ${host_alias}` ; then + true +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/'` @@ -530,7 +587,12 @@ host=${host_cpu}-${host_vendor}-${host_os} . ${tmpfile}.hst -result=`${configsub} ${target_alias}` +if result=`${config_shell} ${configsub} ${target_alias}` ; then + true +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/'` @@ -574,16 +636,56 @@ if [ "${host_alias}" != "${target_alias}" ] ; then fi fi -# Merge program_prefix and program_suffix onto program_transform_name -# Use a double $ so that make ignores it +# Merge program_prefix and program_suffix onto program_transform_name. +# (program_suffix used to use $, but it's hard to preserve $ through both +# make and sh.) if [ "${program_suffix}" != "" ] ; then - program_transform_name="-e s/\$\$/${program_suffix}/ ${program_transform_name}" + program_transform_name="-e s,\\\\(.*\\\\),\\\\1${program_suffix}, ${program_transform_name}" fi if [ "${program_prefix}" != "" ] ; then - program_transform_name="-e s/^/${program_prefix}/ ${program_transform_name}" + program_transform_name="-e s,^,${program_prefix}, ${program_transform_name}" +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 + sed -n -e ':loop +/\\$/ N +/\\$/ b loop +s/\\\n//g +/^CC[ ]*=/ s/CC[ ]*=\(.*\)/\1/p' < Makefile > Makefile.cc + CC=`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 +/^CXX[ ]*=/ s/CXX[ ]*=\(.*\)/\1/p' < Makefile > Makefile.cc + CXX=`tail -1 Makefile.cc` + rm -f Makefile.cc +fi + +# If CC is still not set, try to get gcc. +if [ -z "${CC}" ]; then + IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" + for dir in $PATH; do + test -z "$dir" && dir=. + if test -f $dir/gcc; then + CC="gcc" + break + fi + done + IFS="$save_ifs" + CC=${CC-cc} fi +CXX=${CXX-"g++ -O"} + for subdir in . ${subdirs} ; do # ${subdir} is relative path from . to the directory we're currently @@ -647,9 +749,15 @@ for subdir in . ${subdirs} ; do fi ${remove} -f ${link} - # Make a symlink if possible, otherwise try a hard link - ${symbolic_link} ${srcdir}/${file} ${link} 2>/dev/null || ${hard_link} ${srcdir}/${file} ${link} - + # Make a symlink if possible, otherwise try a hard link + if ${symbolic_link} ${srcdir}/${file} ${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} + fi if [ ! -r ${link} ] ; then echo '***' "${progname}: unable to link \"${link}\" to \"${srcdir}/${file}\"." 1>&2 exit 1 @@ -666,8 +774,8 @@ for subdir in . ${subdirs} ; do .) ;; *) cat > ${subdir}/.gdbinit < ${Makefile} + rm -f ${subdir}/Makefile.tem else echo '***' Expected package makefile fragment \"${package_makefile_frag}\" 1>&2 echo '***' is missing in ${PWD=`pwd`}. 1>&2 @@ -781,6 +890,17 @@ target_vendor = ${target_vendor} target_os = ${target_os} target_canonical = ${target_cpu}-${target_vendor}-${target_os} EOF + case "${build}" in + "") ;; + *) cat >> ${Makefile} << EOF +build_alias = ${build_alias} +build_cpu = ${build_cpu} +build_vendor = ${build_vendor} +build_os = ${build_os} +build_canonical = ${build_cpu}-${build_vendor}-${build_os} +EOF + esac + case "${package_makefile_frag}" in "") ;; /*) echo package_makefile_frag = ${package_makefile_frag} >>${Makefile} ;; @@ -803,11 +923,6 @@ EOF echo site_makefile_frag = ${invsubdir}${site_makefile_frag} >>${Makefile} fi - # make sure that some sort of reasonable default exists for these - # two variables - CXX=${CXX-"g++ -O"} - CC=${CC-cc} - # reset prefix, exec_prefix, srcdir, SUBDIRS, NONSUBDIRS, # remove any form feeds. if [ -z "${subdirs}" ]; then @@ -820,6 +935,24 @@ EOF fi sed -e "s:^prefix[ ]*=.*$:prefix = ${prefix}:" \ -e "s:^exec_prefix[ ]*=.*$:exec_prefix = ${exec_prefix}:" \ + -e "/^CC[ ]*=/{ + b chkcc + :contcc + N + :chkcc + s/\\\\$// + t contcc + s%^CC[ ]*=.*$%CC = ${CC}% + }" \ + -e "/^CXX[ ]*=/{ + b chkcxx + :contcxx + N + :chkcxx + s/\\\\$// + t contcxx + s%^CXX[ ]*=.*$%CXX = ${CXX}% + }" \ -e "s:^SHELL[ ]*=.*$:SHELL = ${config_shell}:" \ -e "s:^srcdir[ ]*=.*$:srcdir = ${makesrcdir}:" \ -e "s/ //" \ @@ -863,7 +996,7 @@ EOF # Makefiles. case "${norecursion}" in - "") arguments="${arguments} -norecursion" ;; + "") arguments="${arguments} --norecursion" ;; *) ;; esac @@ -920,14 +1053,26 @@ if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then ".") newsrcdir=${srcdir} ;; # no -srcdir option. We're building in place. /*) # absolute path newsrcdir=${srcdir}/${configdir} - srcdiroption="-srcdir=${newsrcdir}" + srcdiroption="--srcdir=${newsrcdir}" ;; *) # otherwise relative newsrcdir=../${srcdir}/${configdir} - srcdiroption="-srcdir=${newsrcdir}" + srcdiroption="--srcdir=${newsrcdir}" ;; esac + # Handle --cache-file=../XXX + case "${cache_file}" in + "") # empty + ;; + /*) # absolute path + cache_file_option="--cache-file=${cache_file}" + ;; + *) # relative path + cache_file_option="--cache-file=../${cache_file}" + ;; + esac + ### check for guested configure, otherwise fix possibly relative progname if [ -f ${newsrcdir}/configure ] ; then recprog=${newsrcdir}/configure @@ -943,11 +1088,12 @@ if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then ### The recursion line is here. if [ ! -z "${recprog}" ] ; then - if eval ${config_shell} ${recprog} ${verbose} --host=${host_alias} --target=${target_alias} \ + 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} ${removing} ${redirect} ; then + ${srcdiroption} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${withoptions} ${withoutoptions} ${enableoptions} ${disableoptions} ${cache_file_option} ${removing} ${other_options} ${redirect} ; then true else + echo Configure in `pwd` failed, exiting. 1>&2 exit 1 fi fi @@ -957,6 +1103,11 @@ if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then done fi +# Perform the same cleanup as the trap handler, minus the "exit 1" of course, +# and reset the trap handler. +rm -f ${tmpfile}.com ${tmpfile}.tgt ${tmpfile}.hst ${tmpfile}.pos +trap 0 + exit 0 #