changes from Minh Tran-Le <TRANLE@INTELLICORP.COM> to support i386
[deliverable/binutils-gdb.git] / configure
index a9d54f2fbf71de40ca8f7522e76c63e135e6e7c0..6db69d31ffca14759ce95bbc949830417dcfa753 100755 (executable)
--- a/configure
+++ b/configure
@@ -58,9 +58,10 @@ defaulttargets=
 fatal=
 floating_point=default
 gas=default
+host_makefile_frag=
 hosts=
-next_prefix=
 next_host=
+next_prefix=
 next_site=
 next_srcdir=
 next_target=
@@ -70,9 +71,11 @@ prefix=/usr/local
 progname=
 recurring=
 removing=
+site_makefile_frag=
 srcdir=
 srctrigger=
 target=
+target_makefile_frag=
 targets=
 undefinedargs=
 verbose=
@@ -113,13 +116,16 @@ do
        elif [ -n "${next_srcdir}" ] ; then srcdir=${arg} ; next_srcdir=                
        elif [ -n "${next_target}" ] ; then
                next_target=
-               if [ -z "${targets}" ] ; then
+               case "${targets}" in
+               "")
                        newtargets="${targets} ${arg}"
                        targets="${newtargets}"
-               else
+                       ;;
+               *)
                        echo '***' Can only configure for one target at a time.
                        fatal=yes
-               fi
+                       ;;
+               esac
        elif [ -n "${next_tmpdir}" ] ; then
                next_tmpdir=
                tmpdiroption="--tmpdir=${arg}"
@@ -141,13 +147,16 @@ do
                        fatal=true
                        ;;
                -host=* | --host=* | --hos=* | --ho=*)
-                       if [ -z "${hosts}" ] ; then
+                       case "${hosts}" in
+                       "")
                                newhosts="${hosts} `echo ${arg} | sed 's/^[-a-z]*=//'`"
                                hosts="${newhosts}"
-                       else
+                               ;;
+                       *)
                                echo '***' Can only configure for one host at a time.
                                fatal=yes
-                       fi
+                               ;;
+                       esac
                        ;;
                -nfp | --nf*)
                        floating_point=no
@@ -182,13 +191,16 @@ do
                        next_srcdir=yes
                        ;;
                -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=*)
-                       if [ -z "${targets}" ] ; then
+                       case "${targets}" in
+                       "")
                                newtargets="${targets} `echo ${arg} | sed 's/^[-a-z]*=//'`"
                                targets="${newtargets}"
-                       else
+                               ;;
+                       *)
                                echo '***' Can only configure for one target at a time.
                                fatal=yes
-                       fi
+                               ;;
+                       esac
                        ;;
                -target | --target | --targe | --targ | --tar | --ta)
                        next_target=yes
@@ -215,20 +227,24 @@ do
                        fatal=true
                        ;;
                *)
-                       if [ -z "${undefs}" ] ; then
+                       case "${undefs}" in
+                       "")
                                newundefs="${undefs} ${arg}"
                                undefs=${newundefs}
-                       else
+                               ;;
+                       *)
                                echo '***' Can only configure for one host and one target at a time.
                                fatal=yes
-                       fi
+                               ;;
+                       esac
                        ;;
                esac
        fi
 done
 
 # process host and target
-if [ -z "${fatal}" ] ; then
+case "${fatal}" in
+"")
 #      # Complain if an arg is missing
 #      if [ -z "${hosts}" ] ; then
 #              (echo ;
@@ -252,19 +268,24 @@ if [ -z "${fatal}" ] ; then
                echo '***' You must tell me for which host you want to configure.
                fatal=yes
        else
-               if [ -z "${hosts}" ] ; then
-                       hosts=${undefs}
-               fi
+               case "${hosts}" in
+               "") hosts=${undefs} ;;
+               *) ;;
+               esac
 
-               if [ -z "${targets}" ] ; then
-                       if [ -n "${undefs}" ] ; then
-                               targets=${undefs}
-                       else
-                               targets=${hosts}
-                       fi
-               fi
+               case "${targets}" in
+               "")
+                       case "${undefs}" in
+                       "")     targets=${hosts} ;;
+                       *)      targets=${undefs} ;;
+                       esac
+                       ;;
+               *) ;;
+               esac
        fi
-fi
+       ;;
+*) ;;
+esac
 
 if [ -n "${fatal}" -o "${hosts}" = "help" ] ; then
        (echo "Usage: configure HOST" ;
@@ -302,30 +323,46 @@ else
        exit 1
 fi
 
-if [ -z "${srcdir}" ] ; then
+case "${srcdir}" in
+"")
        if [ -r configure.in ] ; then
                srcdir=.
        else
                echo '***' "Can't find configure.in.  Try using -srcdir=some_dir"
                exit 1
        fi
-fi
+       ;;
+*) ;;
+esac
 
 
+# default datadir
+case "${datadir}" in
+"") datadir="$(prefix)/lib" ;;
+*) ;;
+esac
+
 ### break up ${srcdir}/configure.in.
-if [ -z "`grep '^# per\-host:' ${srcdir}/configure.in`" ] ; then
+case "`grep '^# per\-host:' ${srcdir}/configure.in`" in
+"")
        echo '***' ${srcdir}/configure.in has no "per-host:" line. 1>&2
        exit 1
-fi
+       ;;
+*) ;;
+esac
 
-if [ -z "`grep '^# per\-target:' ${srcdir}/configure.in`" ] ; then
+case "`grep '^# per\-target:' ${srcdir}/configure.in`" in
+"")
        echo '***' ${srcdir}/configure.in has no "per-target:" line. 1>&2
        exit 1
-fi
+       ;;
+*) ;;
+esac
 
-if [ -z "${TMPDIR}" ] ; then
-       TMPDIR=/tmp ; export TMPDIR
-fi
+case "${TMPDIR}" in
+"") TMPDIR=/tmp ; export TMPDIR ;;
+*) ;;
+esac
 
 # keep this filename short for &%*%$*# 14 char file names
 tmpfile=${TMPDIR}/cONf$$
@@ -348,10 +385,13 @@ fi
 . ${tmpfile}.com
 
 # some sanity checks on configure.in
-if [ -z "${srctrigger}" ] ; then
+case "${srctrigger}" in
+"")
        echo '***' srctrigger not set in ${PWD}/configure.in.
        exit 1
-fi
+       ;;
+*) ;;
+esac
 
 for host in ${hosts} ; do
        # Default other arg
@@ -367,11 +407,6 @@ for host in ${hosts} ; do
        host_vendor=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
        host_os=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
        host=${host_cpu}-${host_vendor}-${host_os}
-       host_makefile_frag=config/mh-${host}
-       if [ ! -f ${host_makefile_frag} ]
-       then
-               host_makefile_frag=config/mh-${host_alias}
-       fi
 
        . ${tmpfile}.hst
 
@@ -383,42 +418,38 @@ for host in ${hosts} ; do
                target_vendor=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
                target_os=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
                target=${target_cpu}-${target_vendor}-${target_os}
-               target_makefile_frag=config/mt-${target}
-               if [ ! -f ${target_makefile_frag} ]
-               then
-                       target_makefile_frag=config/mt-${target_alias}
-               fi
 
                . ${tmpfile}.tgt
 
-               if [ "${host_alias}" = "${target_alias}" ] ; then
-                       subdirname=H-${host_alias}
-               else
-                       subdirname=X-${host_alias}-${target_alias}
-               fi
+               case "${host_alias}" in
+               "${target_alias}")      subdirname=H-${host_alias} ;;
+               *)                      subdirname=X-${host_alias}-${target_alias} ;;
+               esac
 
-               if [ -n "${namesubdir}" ] ; then
-                       subdirname=${namesubdir}
-               fi
+               case "${namesubdir}" in
+               "") ;;
+               *) subdirname=${namesubdir} ;;
+               esac
 
-               if [ -n "${removing}" ] ; then
-                               rm -f ${Makefile} config.status ${links}
-               else
+               case "${removing}" in
+               "")
                        # Find the source files, if location was not specified.
-                       if [ -z "${srcdir}" ] ; then
+                       case "${srcdir}" in
+                       "")
                                srcdirdefaulted=1
                                srcdir=.
                                if [ ! -r ${srctrigger} ] ; then
                                        srcdir=..
                                fi
-                       fi
+                               ;;
+                       *) ;;
+                       esac
 
                        if [ ! -r ${srcdir}/${srctrigger} ] ; then
-                               if [ -z "${srcdirdefaulted}" ] ; then
-                                       echo '***' "${progname}: Can't find ${srcname} sources in ${PWD}/${srcdir}" 1>&2
-                               else
-                                       echo '***' "${progname}: Can't find ${srcname} sources in ${PWD}/. or ${PWD}/.." 1>&2
-                               fi
+                               case "${srcdirdefaulted}" in
+                               "") echo '***' "${progname}: Can't find ${srcname} sources in ${PWD}/${srcdir}" 1>&2 ;;
+                               *)  echo '***' "${progname}: Can't find ${srcname} sources in ${PWD}/. or ${PWD}/.." 1>&2 ;;
+                               esac
 
                                echo '***' \(At least ${srctrigger} is missing.\) 1>&2
                                exit 1
@@ -449,9 +480,10 @@ for host in ${hosts} ; do
                                        exit 1
                                fi
 
-                               if [ -n "${verbose}" ] ; then
-                                       echo "Linked \"${link}\" to \"${srcdir}/${file}\"."
-                               fi
+                               case "${verbose}" in
+                               "") ;;
+                               *)  echo "Linked \"${link}\" to \"${srcdir}/${file}\"." ;;
+                               esac
                        done
 
                        # Create a .gdbinit file which runs the one in srcdir
@@ -461,11 +493,12 @@ for host in ${hosts} ; do
                                case ${srcdir} in
                                .)
                                        ;;
-                               *)
-                                       echo "# "${NO_EDIT} > .gdbinit
-                                       echo "dir ." >> .gdbinit
-                                       echo "dir ${srcdir}" >> .gdbinit
-                                       echo "source ${srcdir}/.gdbinit" >> .gdbinit
+                               *) cat > .gdbinit <<EOF
+# ${NO_EDIT} > .gdbinit
+dir .
+dir ${srcdir}
+source ${srcdir}/.gdbinit
+EOF
                                        ;;
                                esac
                        fi
@@ -473,121 +506,120 @@ for host in ${hosts} ; do
                        # Install a makefile, and make it set VPATH
                        # if necessary so that the sources are found.
                        # Also change its value of srcdir.
+                       # NOTE: Makefile generation constitutes the majority of the time in configure.  Hence, this section has
+                       # been somewhat optimized and is perhaps a bit twisty.
 
-               # FIXME-someday: This business of always writing to .tem and mv back
-               # is so that I don't screw things up while developing.  Once this
-               # template is stable, these should be optimized. xoxorich.
-
-                       # Define macro CROSS_COMPILE in compilation if this is a cross-compiler.
-                       if [ "${host}" != "${target}" ] ; then
-                               echo "CROSS=-DCROSS_COMPILE" > ${Makefile}
-                               echo "ALL=all.cross" >> ${Makefile}
-                       else
-                               echo "ALL=all.internal" > ${Makefile}
-                       fi
+                       # code is order so as to try to sed the smallest input files we know.
 
-                       # set target, host, VPATH
-                       echo "host_alias = ${host_alias}" >> ${Makefile}
-                       echo "host_cpu = ${host_cpu}" >> ${Makefile}
-                       echo "host_vendor = ${host_vendor}" >> ${Makefile}
-                       echo "host_os = ${host_os}" >> ${Makefile}
+                       # the three makefile fragments MUST end up in the resulting Makefile in this order: target, host, and site.
+                       # so do these separately because I don't trust the order of sed -e expressions.
 
-                       echo "target_alias = ${target_alias}" >> ${Makefile}
-                       echo "target_cpu = ${target_cpu}" >> ${Makefile}
-                       echo "target_vendor = ${target_vendor}" >> ${Makefile}
-                       echo "target_os = ${target_os}" >> ${Makefile}
+                       # Conditionalize for this site from "Makefile.in" (or whatever it's called) into Makefile.tem
+                       case "${site}" in
+                       "") cp ${srcdir}/${Makefile_in} Makefile.tem ;;
+                       *)
+                               site_makefile_frag=${srcdir}/config/ms-${site}
 
-                               echo "subdir =" >> ${Makefile}
-                               echo "unsubdir = ." >> ${Makefile}
-
-                       echo "VPATH = ${srcdir}" >> ${Makefile}
-
-                       # add "Makefile.in" (or whatever it's called)
-                       cat ${srcdir}/${Makefile_in} >> ${Makefile}
-
-                       # Conditionalize the makefile for this site.
-                       if [ -n "${site}" ] ; then
-                               site_makefile_frag=config/ms-${site}
-
-                               if [ -f ${srcdir}/${site_makefile_frag} ] ; then
-                                       echo "site_makefile_frag = ${srcdir}/${site_makefile_frag}" > Makefile.tem
-                                       sed -e "/^####/  r ${srcdir}/${site_makefile_frag}" ${Makefile} >> Makefile.tem
+                               if [ -f ${site_makefile_frag} ] ; then
+                                       sed -e "/^####/  r ${site_makefile_frag}" ${srcdir}/${Makefile_in} \
+                                               >> Makefile.tem
                                else
-                                       echo "site_makefile_frag =" > Makefile.tem
-                                       cat ${Makefile} >> Makefile.tem
+                                       cp ${srcdir}/${Makefile_in} Makefile.tem
+                                       site_makefile_frag=
                                fi
-                               mv Makefile.tem ${Makefile}
-                       fi
+                               ;;
+                       esac
+                       # working copy now in Makefile.tem
 
                        # Conditionalize the makefile for this host.
-                       if [ -f ${srcdir}/${host_makefile_frag} ] ; then
-                               echo "host_makefile_frag = ${srcdir}/${host_makefile_frag}" > Makefile.tem
-                               sed -e "/^####/  r ${srcdir}/${host_makefile_frag}" ${Makefile} >> Makefile.tem
-                       else
-                               echo "host_makefile_frag =" > Makefile.tem
-                               cat ${Makefile} >> Makefile.tem
-                       fi
-                       mv Makefile.tem ${Makefile}
+                       case "${host_makefile_frag}" in
+                       "") mv Makefile.tem ${Makefile} ;;
+                       *)
+                               host_makefile_frag=${srcdir}/${host_makefile_frag}
+                               if [ -f ${host_makefile_frag} ] ; then
+                                       sed -e "/^####/  r ${host_makefile_frag}" Makefile.tem > ${Makefile}
+                               else
+                                       echo '***' Expected host makefile fragment \"${host_makefile_frag}\" 1>&2
+                                       echo '***' is missing in ${PWD}. 1>&2
+                                       mv Makefile.tem ${Makefile}
+                               fi
+                       esac
+                       # working copy now in ${Makefile}
 
                        # Conditionalize the makefile for this target.
-                       if [ -f ${srcdir}/${target_makefile_frag} ] ; then
-                               echo "target_makefile_frag = ${srcdir}/${target_makefile_frag}" > Makefile.tem
-                               sed -e "/^####/  r ${srcdir}/${target_makefile_frag}" ${Makefile} >> Makefile.tem
-                       else
-                               echo "target_makefile_frag =" > Makefile.tem
-                               cat ${Makefile} >> Makefile.tem
-                       fi
-                       mv Makefile.tem ${Makefile}
-
-                       # set srcdir
-                       sed "s:^srcdir[         ]*=.*$:srcdir = ${srcdir}:" ${Makefile} > Makefile.tem
-                       mv Makefile.tem ${Makefile}
-
-                       # set prefix
-                       if [ -n "${prefix}" ] ; then
-                               sed "s:^prefix[         ]*=.*$:prefix = ${prefix}:" ${Makefile} > Makefile.tem
-                               mv Makefile.tem ${Makefile}
-                       fi
+                       case "${target_makefile_frag}" in
+                       "") mv ${Makefile} Makefile.tem ;;
+                       *)
+                               target_makefile_frag=${srcdir}/${target_makefile_frag}
+                               if [ -f ${target_makefile_frag} ] ; then
+                                       sed -e "/^####/  r ${target_makefile_frag}" ${Makefile} >> Makefile.tem
+                               else
+                                       mv ${Makefile} Makefile.tem
+                                       target_makefile_frag=
+                               fi
+                               ;;
+                       esac
+                       # real copy now in Makefile.tem
 
-                       # set datadir
-                       if [ -n "${datadir}" ] ; then
-                               sed "s:^datadir[        ]*=.*$:datadir = ${datadir}:" ${Makefile} > Makefile.tem
-                               mv Makefile.tem ${Makefile}
-                       fi
+                       # prepend warning about editting, and a bunch of variables.
+                       # fixme-someday: remove the subdir/unsubdir lines.
+                       cat > ${Makefile} <<EOF
+# ${NO_EDIT}
+host_alias = ${host_alias}
+host_cpu = ${host_cpu}
+host_vendor = ${host_vendor}
+host_os = ${host_os}
+target_alias = ${target_alias}
+target_cpu = ${target_cpu}
+target_vendor = ${target_vendor}
+target_os = ${target_os}
+target_makefile_frag = ${target_makefile_frag}
+host_makefile_frag = ${host_makefile_frag}
+site_makefile_frag = ${site_makefile_frag}
+VPATH = ${srcdir}
+subdir =
+unsubdir = .
+EOF
+
+                       # fixme: this shouldn't be in configure.
+                       # Define macro CROSS_COMPILE in compilation if this is a cross-compiler.
+                       case "${host}" in
+                       "${target}") echo "ALL=all.internal" >> ${Makefile} ;;
+                       *)
+                               echo "CROSS=-DCROSS_COMPILE" >> ${Makefile}
+                               echo "ALL=all.cross" >> ${Makefile}
+                               ;;
+                       esac
 
-                       # reset SUBDIRS
-                       sed "s:^SUBDIRS[        ]*=.*$:SUBDIRS = ${configdirs}:" ${Makefile} > Makefile.tem
-                       mv Makefile.tem ${Makefile}
+                       # reset prefix, datadir, srcdir, SUBDIRS, NONSUBDIRS, remove any form
+                       # feeds.
+                       sed -e "s:^prefix[      ]*=.*$:prefix = ${prefix}:" \
+                               -e "s:^datadir[         ]*=.*$:datadir = ${datadir}:" \
+                               -e "s:^srcdir[  ]*=.*$:srcdir = ${srcdir}:" \
+                               -e "s:^SUBDIRS[         ]*=.*$:SUBDIRS = ${configdirs}:" \
+                               -e "s:^NONSUBDIRS[      ]*=.*$:NONSUBDIRS = ${noconfigdirs}:" \
+                               -e "s/\f//" Makefile.tem >> ${Makefile}
+                       # final copy now in ${Makefile}
 
-                       # reset NONSUBDIRS
-                       sed "s:^NONSUBDIRS[     ]*=.*$:NONSUBDIRS = ${noconfigdirs}:" ${Makefile} > Makefile.tem
-                       mv Makefile.tem ${Makefile}
+                       rm Makefile.tem
 
-                       # remove any form feeds.
-                       sed -e "s/\f//" ${Makefile} > Makefile.tem
-                       mv Makefile.tem ${Makefile}
+                       if [ -n "${verbose}" -o -z "${recurring}" ] ; then
+                               case "${host_makefile_frag}" in
+                               "") using= ;;
+                               *) using="and \"${host_makefile_frag}\"" ;;
+                               esac
 
-                       # prepend warning about editting.
-                       echo "# "${NO_EDIT} > ${Makefile}.tem
-                       cat ${Makefile} >> ${Makefile}.tem
-                       mv Makefile.tem ${Makefile}
+                               case "${target_makefile_frag}" in
+                               "") ;;
+                               *) using="${using} and \"${target_makefile_frag}\"" ;;
+                               esac
 
-                       using=
-                       if [ -f ${srcdir}/${host_makefile_frag} ] ; then
-                               using="${using} and \"${host_makefile_frag}\""
-                       fi
-                       if [ -f ${srcdir}/${target_makefile_frag} ] ; then
-                               using="${using} and \"${target_makefile_frag}\""
-                       fi
-                       if [ -n "${site}" -a \
-                            -f ${srcdir}/${site_makefile_frag} ] ; then
-                               using="${using} and \"${site_makefile_frag}\""
-                       fi
-                       using=`echo "${using}" | sed 's/and/using/'`
-                       using="Created \"${Makefile}\" in ${PWD}${using}."
+                               case "${site_makefile_frag}" in
+                               "") ;;
+                               *) using="${using} and \"${site_makefile_frag}\"" ;;
+                               esac
 
-                       if [ -n "${verbose}" -o -z "${recurring}" ] ; then
-                               echo ${using}
+                               echo "Created \"${Makefile}\" in" ${PWD} `echo "${using}" | sed 's/and/using/'`
                        fi
 
                        . ${tmpfile}.pos
@@ -597,9 +629,10 @@ for host in ${hosts} ; do
                        # the same configuration.  Used in Makefiles to rebuild
                        # Makefiles.
 
-                       if [ -z "${norecursion}" ] ; then
-                               arguments="${arguments} -norecursion"
-                       fi
+                       case "${norecursion}" in
+                       "") arguments="${arguments} -norecursion" ;;
+                       *) ;;
+                       esac
 
                        echo "#!/bin/sh
 # ${NO_EDIT}
@@ -607,36 +640,47 @@ for host in ${hosts} ; do
 ${progname}" ${arguments}  "
 # ${using}" > config.status
                        chmod a+x config.status
-
-               fi
+                       ;;
+               *)      rm -f ${Makefile} config.status ${links} ;;
+               esac
 
                # If there are subdirectories, then recur. 
                if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then 
                        for configdir in ${configdirs} ; do
-                               if [ -n "${verbose}" ] ; then
-                                       echo Configuring ${configdir}...
-                               fi
+                               case "${verbose}" in
+                               "") ;;
+                               *) echo Configuring ${configdir}... ;;
+                               esac
 
                                if [ -d ${srcdir}/${configdir} ] ; then
-                                       if [ "${srcdir}" != "." ] ; then
+                                       case "${srcdir}" in
+                                       ".") ;;
+                                       *)
                                                if [ ! -d ./${configdir} ] ; then
                                                        mkdir ./${configdir}
                                                fi
-                                       fi
+                                               ;;
+                                       esac
 
                                        POPDIR=${PWD}
                                        cd ${configdir} 
 
-### figure out what to do with srcdir
+### figure out what to do with srcdir & guest configure
                                        case "${srcdir}" in
-                                       ".") ;; # do nothing.  We're building in place.
-                                       /*) srcdiroption="-srcdir=${srcdir}/${configdir}" ;; # absolute path
-                                       *) srcdiroption="-srcdir=../${srcdir}/${configdir}" ;; # otherwise relative
+                                       ".") newsrcdir=${srcdir} ;; # no -srcdir option.  We're building in place.
+                                       /*) # absolute path
+                                               newsrcdir=${srcdir}/${configdir}
+                                               srcdiroption="-srcdir=${newsrcdir}"
+                                               ;;
+                                       *) # otherwise relative
+                                               newsrcdir=../${srcdir}/${configdir}
+                                               srcdiroption="-srcdir=${newsrcdir}"
+                                               ;;
                                        esac
 
 ### The recursion line is here.
-                                       if [ -f configure ] ; then
-                                               recprog=`pwd`/configure
+                                       if [ -f ${newsrcdir}/configure ] ; then
+                                               recprog=${newsrcdir}/configure
                                        else
                                                recprog=${progname}
                                        fi
@@ -651,8 +695,11 @@ ${progname}" ${arguments}  "
                                        fi
 
                                        cd ${POPDIR}
-                               elif [ -n "${verbose}" ] ; then
-                                       echo Warning: source directory \"${srcdir}/${configdir}\" is missing.
+                               else
+                                       case "${verbose}" in
+                                       "") ;;
+                                       *) echo Warning: source directory \"${srcdir}/${configdir}\" is missing. ;;
+                                       esac
                                fi
                        done
                fi
This page took 0.033737 seconds and 4 git commands to generate.