* printcmd.c (print_address_symbolic): If set print fast-symbolic-addr

[binutils.git] / configure

diff --git a/configure b/configure
index e8f8bfe98cae38e605bf764c7da8e4708f94f0f3..20e2d56413444f3779de67e0c7e42103f49fb49f 100755 (executable)
--- a/configure
+++ b/configure
@@ -90,7 +90,7 @@ x11=default
 
 ### we might need to use some other shell than /bin/sh for running subshells
 #
-config_shell=${CONFIG_SHELL-}
+config_shell=${CONFIG_SHELL-/bin/sh}
 
 NO_EDIT="This file was generated automatically by configure.  Do not edit."
 
@@ -152,6 +152,17 @@ do
                         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}"
@@ -183,6 +194,17 @@ do
                                 ;;
                         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
                         ;;
@@ -317,16 +339,18 @@ case "${fatal}" in
 
 ### This is a bit twisted.
 ### * if all three are specified, this is an error.
-### * if we have neither hosts, nor unadorned args, 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
+        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 "${undefs}" ] ; then
+        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
@@ -342,7 +366,12 @@ case "${fatal}" in
                 fi
         else
                 case "${host_alias}" in
-                "") host_alias=${undefs} ;;
+                "")
+                        case "${undefs}" in
+                        "")     host_alias=${target_alias} ;;
+                        *)      host_alias=${undefs} ;;
+                        esac
+                        ;;
                 *) ;;
                 esac
 
@@ -445,7 +474,7 @@ esac
 ### break up ${srcdir}/configure.in.
 case "`grep '^# per\-host:' ${srcdir}/configure.in`" in
 "")
-        echo '***' ${srcdir}/configure.in has no "per-host:" line. 1>&2
+        echo '***' ${srcdir}/configure.in has no \"per-host:\" line. 1>&2
         exit 1
         ;;
 *) ;;
@@ -453,7 +482,7 @@ esac
 
 case "`grep '^# per\-target:' ${srcdir}/configure.in`" in
 "")
-        echo '***' ${srcdir}/configure.in has no "per-target:" line. 1>&2
+        echo '***' ${srcdir}/configure.in has no \"per-target:\" line. 1>&2
         exit 1
         ;;
 *) ;;
@@ -774,6 +803,11 @@ 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
@@ -786,6 +820,7 @@ EOF
             fi
             sed -e "s:^prefix[         ]*=.*$:prefix = ${prefix}:" \
                     -e "s:^exec_prefix[        ]*=.*$:exec_prefix = ${exec_prefix}:" \
+                   -e "s:^SHELL[        ]*=.*$:SHELL = ${config_shell}:" \
                     -e "s:^srcdir[     ]*=.*$:srcdir = ${makesrcdir}:" \
                     -e "s/\f//" \
                     -e "s:^program_prefix[     ]*=.*$:program_prefix = ${program_prefix}:" \
@@ -902,7 +937,7 @@ if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then
                                 *)      recprog=../${progname} ;;
                                 esac
                        else
-                               echo No configuration information in ${configdir} ${redirect}
+                               eval echo No configuration information in ${configdir} ${redirect}
                                recprog=
                         fi