* config/tc-hppa.h (FAKE_LABEL_NAME): Define as L$0\001 so it's

[binutils.git] / configure

diff --git a/configure b/configure
index e8f8bfe98cae38e605bf764c7da8e4708f94f0f3..9dcc2946166b823c774ba1add340551588ad1599 100755 (executable)
--- a/configure
+++ b/configure
@@ -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
                         ;;
@@ -774,6 +796,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 +813,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:^srcdir[     ]*=.*$:srcdir = ${makesrcdir}:" \
                     -e "s/\f//" \
                     -e "s:^program_prefix[     ]*=.*$:program_prefix = ${program_prefix}:" \
@@ -902,7 +947,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