In configure{.in} {host|target}_makefile_frag should name a file
[deliverable/binutils-gdb.git] / configure
index 6586640ed2b8b8859d74642e477d9e77154bf67a..6db69d31ffca14759ce95bbc949830417dcfa753 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Configuration script
-#   Copyright (C) 1988, 1990, 1991 Free Software Foundation, Inc.
+#   Copyright (C) 1988, 1990, 1991, 1992 Free Software Foundation, Inc.
 
 #This file is part of GNU.
 
@@ -19,8 +19,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-# $Id$
-
 # Please email any bugs, comments, and/or additions to this file to:
 # configure@cygnus.com
 
 #      config.status is removed.
 #
 
-set -e
+# NOTE: This script contains support for a Cygnus experimental feature, called
+# +subdirs, which is currently, tentatively, de-supported.
+
+export PATH || (echo "OOPS, this isn't sh.  Desperation time.  I will feed myself to sh."; sh $0 $argv; kill $$)
 
 remove=rm
 hard_link=ln
@@ -48,108 +49,40 @@ symbolic_link='ln -s'
 
 Makefile=Makefile
 Makefile_in=Makefile.in
-ansi=
 arguments=$*
 commontargets=
 configdirs=
+datadir=
+datadiroption=
 defaulttargets=
-destdir=
 fatal=
-hostsubdir=
+floating_point=default
+gas=default
+host_makefile_frag=
+hosts=
+next_host=
+next_prefix=
+next_site=
+next_srcdir=
+next_target=
+next_tmpdir=
 norecursion=
-objdir=
-objdiroption=
+prefix=/usr/local
 progname=
 recurring=
 removing=
+site_makefile_frag=
 srcdir=
 srctrigger=
 target=
+target_makefile_frag=
 targets=
-targetsubdir=
+undefinedargs=
 verbose=
+version="$Revision$"
+x11=default
 
-for arg in $*;
-do
-       case ${arg} in
-       -ansi | +a*)
-               ansi=true
-               clib=clib
-               ;;
-       -destdir=* | +destdir=* | +destdi=* | +destd=* | +dest=* | +des=* | +de=* | +d=*)
-               destdir=`echo ${arg} | sed 's/[+-]d[a-z]*=//'`
-               ;;
-       -languages=* | +languages=* | +language=* | +languag=* \
-               | +langua=* | +langu=* | +lang=* | +lan=* | +la=* \
-               | +l=*)
-               languages="${languages} `echo ${arg} | sed 's/[+-]l[a-z]*=//'`"
-               ;;
-       -gas | +g*)
-               gas=yes
-               ;;
-       -help | +h*)
-               fatal=true
-               ;;
-       -nfp | +nf*)
-               nfp=yes
-               ;;
-       -norecursion | +no*)
-               norecursion=true
-               ;;
-       -objdir=* | +objdir=* | +objdi=* | +objd=* | +obj=* | +ob=* | +o=*)
-               objdiroption=${arg}
-               objdir=`echo ${arg} | sed 's/[+-]o[a-z]*=//'`
-               ;;
-       -recurring | +recurring | +recurrin | +recurri | +recurr | +recur | +recu | +rec | +re)
-               recurring=true
-               ;;
-       -rm | +rm)
-               removing=${arg}
-               ;;
-       -site=* | +site=* | +sit=* | +si=*)
-               site=`echo ${arg} | sed 's/[+-]s[a-z]*=//'`
-               ;;
-#      -srcdir=* | +srcdir=* | +srcdi=* | +srcd=* | +src=* | +sr=*)
-#              srcdir=`echo ${arg} | sed 's/[+-]s[a-z]*=//'`
-#              ;;
-       -subdirs | +su*)
-               subdirs=${arg}
-               ;;
-       -target=* | +target=* | +targe=* | +targ=* | +tar=* | +ta=*)
-               if [ -n "${targets}" ] ; then
-                       subdirs="+subdirs"
-               fi
-
-               newtargets="${targets} `echo ${arg} | sed 's/[+-]t[a-z]*=//'`"
-               targets="${newtargets}"
-               ;;
-       -tmpdir=* | +tmpdir=* | +tmpdi=* | +tmpd=* | +tmp=* | +tm=*)
-               tmpdiroption=${arg}
-               TMPDIR=`echo ${arg} | sed 's/[+-]t[a-z]*=//'`
-               ;;
-       -v | -verbose | +v*)
-               verbose=${arg}
-               ;;
-       -* | +*)
-               (echo ;
-               echo "Unrecognized option: \"${arg}\"". ;
-               echo) 1>&2
-               fatal=true
-               ;;
-       *)
-               if [ -n "${hosts}" ] ; then
-                       subdirs="+subdirs"
-               fi
-
-               newhosts="${hosts} ${arg}"
-               hosts=${newhosts}
-               ;;
-       esac
-done
-
-if [ -n "${verbose}" ] ; then
-       echo $0 $*
-fi
+NO_EDIT="This file was generated automatically by configure.  Do not edit."
 
 ## this is a little touchy and won't always work, but...
 ##
@@ -163,57 +96,216 @@ fi
 ## path.
 ##
 
-if (echo $0 | grep '^/' > /dev/null) ; then
+PWD=`pwd`
+
+if echo $0 | grep '^/' > /dev/null ; then
        progname=$0
+elif echo $0 | grep '/' > /dev/null ; then
+       progname=${PWD}/$0
 else
-       if (echo $0 | grep '/' > /dev/null) ; then
-               progname=`pwd`/$0
-       else
-               progname=$0
-               PATH=$PATH:`pwd` ; export PATH
-       fi
+       progname=$0
+       PATH=$PATH:${PWD} ; export PATH
 fi
 
-configsub=`echo ${progname} | sed 's/configure\$/config.sub/'`
+for arg in $*;
+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_datadir}" ] ; then datadir=${arg} ; datadiroption="-datadir=${datadir}" ; next_datadir=
+       elif [ -n "${next_site}" ] ; then site=${arg} ; next_site=
+       elif [ -n "${next_srcdir}" ] ; then srcdir=${arg} ; next_srcdir=                
+       elif [ -n "${next_target}" ] ; then
+               next_target=
+               case "${targets}" in
+               "")
+                       newtargets="${targets} ${arg}"
+                       targets="${newtargets}"
+                       ;;
+               *)
+                       echo '***' Can only configure for one target at a time.
+                       fatal=yes
+                       ;;
+               esac
+       elif [ -n "${next_tmpdir}" ] ; then
+               next_tmpdir=
+               tmpdiroption="--tmpdir=${arg}"
+               TMPDIR=${arg}
 
-if [ ! -f ${configsub} ] ; then
-       echo '***' cannot find config.sub.
-       echo 1
-fi
+       else
+               case ${arg} in
+               -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* | --da=* | --d=*)
+                       datadir=`echo ${arg} | sed 's/^[-a-z]*=//'`
+                       datadiroption=${arg}
+                       ;;
+               -datadir | --datadir | --datadi | --datad | --data | --dat | --da | --d)
+                       next_datadir=yes
+                       ;;
+               -gas | --g*)
+                       gas=yes
+                       ;;
+               -help | --he*)
+                       fatal=true
+                       ;;
+               -host=* | --host=* | --hos=* | --ho=*)
+                       case "${hosts}" in
+                       "")
+                               newhosts="${hosts} `echo ${arg} | sed 's/^[-a-z]*=//'`"
+                               hosts="${newhosts}"
+                               ;;
+                       *)
+                               echo '***' Can only configure for one host at a time.
+                               fatal=yes
+                               ;;
+                       esac
+                       ;;
+               -nfp | --nf*)
+                       floating_point=no
+                       ;;
+               -norecursion | --no*)
+                       norecursion=true
+                       ;;
+               -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+                       prefix=`echo ${arg} | sed 's/^[-a-z]*=//'`
+                       prefixoption=${arg}
+                       ;;
+               -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+                       next_prefix=yes
+                       ;;
+               -recurring | --recurring | --recurrin | --recurri | --recurr | --recur | --recu | --rec | --re)
+                       recurring=true
+                       arguments=`echo ${arguments} | sed "s:${arg}::"`
+                       ;;
+               -rm | --rm)
+                       removing=${arg}
+                       ;;
+               -site=* | --site=* | --sit=* | --si=*)
+                       site=`echo ${arg} | sed 's/^[-a-z]*=//'`
+                       ;;
+               -site | --site | --sit | --si)
+                       next_site=yes
+                       ;;
+               -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+                       srcdir=`echo ${arg} | sed 's/^[-a-z]*=//'`
+                       ;;
+               -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+                       next_srcdir=yes
+                       ;;
+               -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=*)
+                       case "${targets}" in
+                       "")
+                               newtargets="${targets} `echo ${arg} | sed 's/^[-a-z]*=//'`"
+                               targets="${newtargets}"
+                               ;;
+                       *)
+                               echo '***' Can only configure for one target at a time.
+                               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)
+                       verbose=${arg}
+                       ;;
+               -version | -V | --version | --V)
+                       echo "This is Cygnus Configure version" `echo ${version} | sed 's/[ $:]//g'`
+                       exit 0
+                       ;;
+               -x | --x) ;;
+               -* | --*)
+                       (echo ;
+                       echo "Unrecognized option: \"${arg}\"". ;
+                       echo) 1>&2
+                       fatal=true
+                       ;;
+               *)
+                       case "${undefs}" in
+                       "")
+                               newundefs="${undefs} ${arg}"
+                               undefs=${newundefs}
+                               ;;
+                       *)
+                               echo '***' Can only configure for one host and one target at a time.
+                               fatal=yes
+                               ;;
+                       esac
+                       ;;
+               esac
+       fi
+done
 
-# process host and target only if not removing.
-if [ -z "${removing}" -a -z "${fatal}" ] ; then
-       # Complain if an arg is missing
-       if [ -z "${hosts}" ] ; then
-               (echo ;
-               echo "configure: No HOST specified." ;
-               echo) 1>&2
-               fatal=true
+# process host and target
+case "${fatal}" in
+"")
+#      # Complain if an arg is missing
+#      if [ -z "${hosts}" ] ; 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, this is an error.
+### * 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 "${hosts}" -a -n "${targets}" -a -n "${undefs}" ] ; then
+               echo '***' Can only configure for one host and one target at a time.
+               fatal=yes
+       elif [ -z "${hosts}" -a -z "${undefs}" ] ; then
+               echo '***' You must tell me for which host you want to configure.
+               fatal=yes
+       else
+               case "${hosts}" in
+               "") hosts=${undefs} ;;
+               *) ;;
+               esac
+
+               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" ;
        echo ;
        echo "Options: [defaults in brackets]" ;
-       echo " +ansi            configure w/ANSI library. [no ansi lib]" ;
-       echo " +destdir=MYDIR   configure for installation into MYDIR. [\"/usr/local\"]" ;
-       echo " +gas             configure the compilers for use with gas. [native as]" ;
-       echo " +help            print this message. [normal config]" ;
-       echo " +lang=LANG       configure to build LANG. [gcc]" ;
-       echo " +nfp             configure the compilers default to soft floating point. [hard float]" ;
-       echo " +norecursion     configure this directory only. [recurse]" ;
-       echo " +objdir=ODIR     configure in a parallel tree rooted in ODIR. [rooted in \".\"]" ;
-       echo " +rm              remove this configuration. [build a configuration]" ;
-       echo " +site            configure with site specific makefile" ;
-# This is correctly aligned in the output, even though it isn't here.
-       echo " +subdirs configure in subdirectories.  [in source directories]" ;
-       echo " +target=TARGET   configure for TARGET.  [TARGET = HOST]" ;
-       echo " +tmpdir=TMPDIR   create temporary files in TMPDIR.  [ TMPDIR = \"/tmp\" ]" ;
+       echo " -datadir=MYDIR   configure for installation of host dependent files into MYDIR. [\"/usr/local\"]" ;
+       echo " -gas             configure the compilers for use with gas. [native as]" ;
+       echo " -help            print this message. [normal config]" ;
+       echo " -lang=LANG       configure to build LANG. [gcc]" ;
+       echo " -nfp             configure the compilers default to soft floating point. [hard float]" ;
+       echo " -norecursion     configure this directory only. [recurse]" ;
+       echo " -prefix=MYDIR    configure for installation of host dependent files into MYDIR. [\"/usr/local\"]" ;
+       echo " -rm              remove this configuration. [build a configuration]" ;
+       echo " -site            configure with site specific makefile" ;
+       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 ;
        echo "Where HOST and TARGET are something like \"vax\", \"sun3\", \"encore\", etc." ;
-       echo "Asking for more than one \"+target\" implies \"+subdirs\".  Any other" ;
-       echo "options given will apply to all targets.") 1>&2
+       ) 1>&2
 
        if [ -r config.status ] ; then
                cat config.status
@@ -222,48 +314,84 @@ if [ -n "${fatal}" -o "${hosts}" = "help" ] ; then
        exit 1
 fi
 
-### break up configure.in.
-if [ -r configure.in ] ; then
-       if [ -z "`grep '^# per\-host:' configure.in`" ] ; then
-               echo '***' `pwd`/configure.in has no "per-host:" line. 1>&2
-               exit 1
-       fi
+configsub=`echo ${progname} | sed 's/configure$/config.sub/'`
+
+if ${configsub} `echo ${hosts} | sed -e 's/ .*//'` >/dev/null 2>&1 ; then
+       true
+else
+       echo '***' cannot find config.sub.
+       exit 1
+fi
 
-       if [ -z "`grep '^# per\-target:' configure.in`" ] ; then
-               echo '***' `pwd`/configure.in has no "per-target:" line. 1>&2
+case "${srcdir}" in
+"")
+       if [ -r configure.in ] ; then
+               srcdir=.
+       else
+               echo '***' "Can't find configure.in.  Try using -srcdir=some_dir"
                exit 1
        fi
+       ;;
+*) ;;
+esac
 
-       if [ -z "${TMPDIR}" ] ; then
-               TMPDIR=/tmp ; export TMPDIR
-       fi
 
-       # split configure.in into common, per-host, per-target,
-       # and post-target parts.  Post-target is optional.
-       sed -e '/^# per\-host:/,$d' configure.in > ${TMPDIR}/configure.$$.com
-       sed -e '1,/^# per\-host:/d' -e '/^# per\-target:/,$d' configure.in > ${TMPDIR}/configure.$$.hst
-       if grep -s '^# post-target:' configure.in ; then
-         sed -e '1,/^# per\-target:/d' -e '/^# post\-target:/,$d' configure.in > ${TMPDIR}/configure.$$.tgt
-         sed -e '1,/^# post\-target:/d' configure.in > ${TMPDIR}/configure.$$.pos
-       else
-         sed -e '1,/^# per\-target:/d' configure.in > ${TMPDIR}/configure.$$.tgt
-         echo >${TMPDIR}/configure.$$.pos
-       fi
+# default datadir
+case "${datadir}" in
+"") datadir="$(prefix)/lib" ;;
+*) ;;
+esac
 
-else
-       echo '***' No configure.in in `pwd`
+### break up ${srcdir}/configure.in.
+case "`grep '^# per\-host:' ${srcdir}/configure.in`" in
+"")
+       echo '***' ${srcdir}/configure.in has no "per-host:" line. 1>&2
+       exit 1
+       ;;
+*) ;;
+esac
+
+case "`grep '^# per\-target:' ${srcdir}/configure.in`" in
+"")
+       echo '***' ${srcdir}/configure.in has no "per-target:" line. 1>&2
        exit 1
+       ;;
+*) ;;
+esac
+
+case "${TMPDIR}" in
+"") TMPDIR=/tmp ; export TMPDIR ;;
+*) ;;
+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
+
+# split ${srcdir}/configure.in into common, per-host, per-target,
+# and post-target parts.  Post-target is optional.
+sed -e '/^# per\-host:/,$d' ${srcdir}/configure.in > ${tmpfile}.com
+sed -e '1,/^# per\-host:/d' -e '/^# per\-target:/,$d' ${srcdir}/configure.in > ${tmpfile}.hst
+if grep '^# post-target:' ${srcdir}/configure.in >/dev/null ; then
+  sed -e '1,/^# per\-target:/d' -e '/^# post\-target:/,$d' ${srcdir}/configure.in > ${tmpfile}.tgt
+  sed -e '1,/^# post\-target:/d' ${srcdir}/configure.in > ${tmpfile}.pos
+else
+  sed -e '1,/^# per\-target:/d' ${srcdir}/configure.in > ${tmpfile}.tgt
+  echo >${tmpfile}.pos
 fi
 
 ### do common part of configure.in
 
-. ${TMPDIR}/configure.$$.com
+. ${tmpfile}.com
 
 # some sanity checks on configure.in
-if [ -z "${srctrigger}" ] ; then
-       echo '***' srctrigger not set in `pwd`/configure.in.
+case "${srctrigger}" in
+"")
+       echo '***' srctrigger not set in ${PWD}/configure.in.
        exit 1
-fi
+       ;;
+*) ;;
+esac
 
 for host in ${hosts} ; do
        # Default other arg
@@ -279,9 +407,8 @@ 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/hmake-${host}
 
-       . ${TMPDIR}/configure.$$.hst
+       . ${tmpfile}.hst
 
        for target in ${targets} ; do
 
@@ -291,91 +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/tmake-${target}
-
-               . ${TMPDIR}/configure.$$.tgt
-
-               # Temporarily, we support only direct subdir builds.
-               hostsubdir=H-${host_alias}
-               targetsubdir=T-${target_alias}
-
-               if [ -n "${removing}" ] ; then
-                       if [ -n "${objdir}" ] ; then
-                               echo '***' +rm not supported for +objdir.  Just \"rm -rf ${objdir}\" by hand.
-                               exit 1
-                       fi
-
-                       if [ -n "${subdirs}" ] ; then
-                               if [ -d "${hostsubdir}" ] ; then
-                                       rm -rf ${hostsubdir}/${targetsubdir}
-
-                                       if [ -z "`(ls ${hostsubdir}) 2>&1 | grep T- | grep -v T-independent`" ] ; then
-                                               rm -rf ${hostsubdir}
-                                       fi
-                               else
-                                       echo Warning: no `pwd`/${hostsubdir} to remove.
-                               fi
-                       else
-                               rm -f ${Makefile} config.status ${links}
-                       fi
-               else
-                       if [ -n "${objdir}" ]; then
-                               srcdir=`pwd`
-                               cd ${objdir}
-                       fi
 
-                       if [ -n "${subdirs}" ] ; then
-                               # check for existing status before allowing forced subdirs.
-                               if [ -f ${Makefile} ] ; then
-                                       echo '***' "${Makefile} already exists in source directory.  `pwd` not configured." 1>&2
-                                       exit 1
-                               fi
+               . ${tmpfile}.tgt
 
-                               if [ ! -d ${hostsubdir} ] ; then mkdir ${hostsubdir} ; fi
-                               cd ${hostsubdir}
+               case "${host_alias}" in
+               "${target_alias}")      subdirname=H-${host_alias} ;;
+               *)                      subdirname=X-${host_alias}-${target_alias} ;;
+               esac
 
-                               if [ ! -d ${targetsubdir} ] ; then
-                                       if [ -z "${commontargets}" ] ; then
-                                               mkdir ${targetsubdir}
-                                       else
-                                               if [ ! -d T-independent ] ; then
-                                                       mkdir T-independent
-                                               fi
-
-                                               ${symbolic_link} T-independent ${targetsubdir}
-                                       fi # if target independent
-                               fi # if no target dir yet
-
-                               cd ${targetsubdir}
-
-                               if [ -z "${srcdir}" ] ; then
-                                       srcdir=../..
-                               fi
-                       else
-                               # if not subdir builds, then make sure none exist.
-                               if [ -n "`(ls .) 2>&1 | (grep H- ; true)`" ] ; then
-                                       echo '***' "Configured subdirs exist.  `pwd` not configured." 1>&2
-                                       exit 1
-                               else
-                                       true
-                               fi
-                       fi
+               case "${namesubdir}" in
+               "") ;;
+               *) subdirname=${namesubdir} ;;
+               esac
 
+               case "${removing}" in
+               "")
                        # Find the source files, if location was not specified.
-                       if [ -z "${srcdir}" ] ; then
+                       case "${srcdir}" in
+                       "")
                                srcdirdefaulted=1
                                srcdir=.
-                               if [ -n "${srctrigger}" -a ! -r ${srctrigger} ] ; then
+                               if [ ! -r ${srctrigger} ] ; then
                                        srcdir=..
                                fi
-                       fi
+                               ;;
+                       *) ;;
+                       esac
 
-                       if [ -n "${srctrigger}" -a ! -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
+                       if [ ! -r ${srcdir}/${srctrigger} ] ; then
+                               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
@@ -406,275 +480,239 @@ 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
                        # and tells GDB to look there for source files.
 
-                       case ${srcdir} in
-                       .)
-                               ;;
-                       *)
-                               echo "dir ." > .gdbinit
-                               echo "dir ${srcdir}" >> .gdbinit
-                               echo "source ${srcdir}/.gdbinit" >> .gdbinit
-                               ;;
-                       esac
+                       if [ -r ${srcdir}/.gdbinit ] ; then
+                               case ${srcdir} in
+                               .)
+                                       ;;
+                               *) cat > .gdbinit <<EOF
+# ${NO_EDIT} > .gdbinit
+dir .
+dir ${srcdir}
+source ${srcdir}/.gdbinit
+EOF
+                                       ;;
+                               esac
+                       fi
 
                        # 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.
+                       # code is order so as to try to sed the smallest input files we know.
 
-                       # Define macro CROSS_COMPILE in compilation if this is a cross-compiler.
-                       if [ "${host}" != "${target}" ] ; then
-                               echo "CROSS=-DCROSS_COMPILE" > ${Makefile}
-                               echo "ALL=start.encap" >> ${Makefile}
-                       else
-                               echo "ALL=all.internal" > ${Makefile}
-                       fi
+                       # 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.
 
-                       # 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}
-
-                       echo "target_alias = ${target_alias}" >> ${Makefile}
-                       echo "target_cpu = ${target_cpu}" >> ${Makefile}
-                       echo "target_vendor = ${target_vendor}" >> ${Makefile}
-                       echo "target_os = ${target_os}" >> ${Makefile}
-
-                       if [ -n "${subdirs}" ] ; then
-                               (echo "subdir = /${hostsubdir}/${targetsubdir}" ;
-                                       echo "unsubdir = ../..") >> ${Makefile}
-                       else
-                               (echo "subdir =" ;
-                                       echo "unsubdir = .") >> ${Makefile}
-                       fi
-
-               #       echo "workdir = `pwd`" >> ${Makefile}
-                       echo "VPATH = ${srcdir}" >> ${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}
 
-                       # add "Makefile.in" (or whatever it's called)
-                       cat ${srcdir}/${Makefile_in} >> ${Makefile}
+                               if [ -f ${site_makefile_frag} ] ; then
+                                       sed -e "/^####/  r ${site_makefile_frag}" ${srcdir}/${Makefile_in} \
+                                               >> Makefile.tem
+                               else
+                                       cp ${srcdir}/${Makefile_in} Makefile.tem
+                                       site_makefile_frag=
+                               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}" ; 
-                                       sed -e "/^####/  r ${srcdir}/${host_makefile_frag}" ${Makefile}) > Makefile.tem
-                               mv Makefile.tem ${Makefile}
-                       fi
-
-                       # Conditionalize the makefile for this target.
-                       if [ -f ${srcdir}/${target_makefile_frag} ] ; then
-                               (echo "target_makefile_frag = ${srcdir}/${target_makefile_frag}" ; 
-                                       sed -e "/^####/  r ${srcdir}/${target_makefile_frag}" ${Makefile}) > Makefile.tem
-                               mv Makefile.tem ${Makefile}
-                       fi
-
-                       # Conditionalize the makefile for this site.
-                       if [ -n "${site}" ] ; then
-                               site_makefile_frag=smake-${site}
-
-                               if [ -f ${srcdir}/${site_makefile_frag} ] ; then
-                                       (echo "site_makefile_frag = ${srcdir}/${site_makefile_frag}" ; 
-                                               sed -e "/^####/  r ${srcdir}/${site_makefile_frag}" ${Makefile}) > Makefile.tem
+                       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
-                       fi
-
-                       # set srcdir
-                       sed "s@^srcdir = \.@srcdir = ${srcdir}@" ${Makefile} > Makefile.tem
-                       mv Makefile.tem ${Makefile}
-
-                       # set destdir
-                       if [ -n "${destdir}" ] ; then
-                               sed "s:^destdir =.*$:destdir = ${destdir}:" ${Makefile} > Makefile.tem
-                               mv Makefile.tem ${Makefile}
-                       fi
-
-                       # reset SUBDIRS
-                       sed "s:^SUBDIRS =.*$:SUBDIRS = ${configdirs}:" ${Makefile} > Makefile.tem
-                       mv Makefile.tem ${Makefile}
-
-                       # reset NONSUBDIRS
-                       sed "s:^NONSUBDIRS =.*$:NONSUBDIRS = ${noconfigdirs}:" ${Makefile} > Makefile.tem
-                       mv Makefile.tem ${Makefile}
-
-                       # remove any form feeds.
-                       sed -e "s/\f//" ${Makefile} > Makefile.tem
-                       mv Makefile.tem ${Makefile}
-
-                       using=
-                       if [ -f ${srcdir}/${host_makefile_frag} ] ; then
-                               using=" using \"${host_makefile_frag}\""
-                       fi
+                       esac
+                       # working copy now in ${Makefile}
 
-                       if [ -f ${srcdir}/${target_makefile_frag} ] ; then
-                               if [ -z "${using}" ] ; then
-                                       andusing=" using \"${target_makefile_frag}\""
+                       # Conditionalize the makefile for this target.
+                       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
-                                       andusing="${using} and \"${target_makefile_frag}\""
+                                       mv ${Makefile} Makefile.tem
+                                       target_makefile_frag=
                                fi
-                       else
-                               andusing=${using}
-                       fi
+                               ;;
+                       esac
+                       # real copy now in Makefile.tem
+
+                       # 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
 
-                       if [ -f ${srcdir}/${site_makefile_frag} ] ; then
-                               if [ -z "${andusing}" ] ; then
-                                       andandusing=" using \"${site_makefile_frag}\""
-                               else
-                                       andandusing="${andusing} and \"${site_makefile_frag}\""
-                               fi
-                       else
-                               andandusing=${andusing}
-                       fi
+                       # 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}
+
+                       rm Makefile.tem
 
                        if [ -n "${verbose}" -o -z "${recurring}" ] ; then
-                               echo "Created \"${Makefile}\"" in `pwd`${andandusing}.
+                               case "${host_makefile_frag}" in
+                               "") using= ;;
+                               *) using="and \"${host_makefile_frag}\"" ;;
+                               esac
+
+                               case "${target_makefile_frag}" in
+                               "") ;;
+                               *) using="${using} and \"${target_makefile_frag}\"" ;;
+                               esac
+
+                               case "${site_makefile_frag}" in
+                               "") ;;
+                               *) using="${using} and \"${site_makefile_frag}\"" ;;
+                               esac
+
+                               echo "Created \"${Makefile}\" in" ${PWD} `echo "${using}" | sed 's/and/using/'`
                        fi
 
-                       if [ -f ${TMPDIR}/configure.$$.pos ] ; then
-                               . ${TMPDIR}/configure.$$.pos
-                       fi
+                       . ${tmpfile}.pos
 
                        # describe the chosen configuration in config.status.
                        # Make that file a shellscript which will reestablish
                        # the same configuration.  Used in Makefiles to rebuild
                        # Makefiles.
 
+                       case "${norecursion}" in
+                       "") arguments="${arguments} -norecursion" ;;
+                       *) ;;
+                       esac
+
                        echo "#!/bin/sh
-# `pwd` was configured as follows:
-(cd ${srcdir} ; ${progname}" ${arguments} `if [ -z "${norecursion}" ] ; then echo +norecursion ; else true ; fi` ")" > config.status
+# ${NO_EDIT}
+# ${PWD} was configured as follows:
+${progname}" ${arguments}  "
+# ${using}" > config.status
                        chmod a+x config.status
+                       ;;
+               *)      rm -f ${Makefile} config.status ${links} ;;
+               esac
 
-                       originaldir=`pwd`
-                       cd ${srcdir}
-               fi
-
-               # If there are subdirectories, then recurse. 
+               # 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
-
-                               if [ -d ${configdir} ] ; then
-                                       if [ -n "${objdir}" ] ; then
-                                               if [ ! -d ${objdir}/${configdir} ] ; then
-                                                       mkdir ${objdir}/${configdir}
+                               case "${verbose}" in
+                               "") ;;
+                               *) echo Configuring ${configdir}... ;;
+                               esac
+
+                               if [ -d ${srcdir}/${configdir} ] ; then
+                                       case "${srcdir}" in
+                                       ".") ;;
+                                       *)
+                                               if [ ! -d ./${configdir} ] ; then
+                                                       mkdir ./${configdir}
                                                fi
-                                       fi
+                                               ;;
+                                       esac
 
-                                       POPDIR=`pwd`
+                                       POPDIR=${PWD}
                                        cd ${configdir} 
 
-                                       ${progname} +recurring ${host_alias} +target=${target_alias} \
-                                               ${verbose} ${subdirs} ${removing} +destdir=${destdir} \
-                                               `if [ -n "${objdir}" ] ; then echo +objdir=${objdir}/${configdir} ; fi` \
-                                               ${tmpdiroption}
+### figure out what to do with srcdir & guest configure
+                                       case "${srcdir}" in
+                                       ".") 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 ${newsrcdir}/configure ] ; then
+                                               recprog=${newsrcdir}/configure
+                                       else
+                                               recprog=${progname}
+                                       fi
 
-                                       cd ${POPDIR}
+                                       if ${recprog} -recurring ${host_alias} -target=${target_alias} \
+                                               ${verbose} ${subdirs} ${removing} ${prefixoption} \
+                                               ${tmpdiroption} ${namesubdiroption} ${datadiroption} \
+                                               ${srcdiroption} ; then
+                                               true
+                                       else
+                                               exit 1
+                                       fi
 
-#                                      (cd ${configdir} ;
-#                                              if (${progname} +recurring ${host_alias} +target=${target_alias} \
-#                                                      ${verbose} ${subdirs} ${removing} +destdir=${destdir} \
-#                                                      `if [ -n "${objdir}" ] ; then echo +objdir=${objdir}/${configdir} ; fi` \
-#                                                      ${tmpdiroption}) ; then true ; else exit 1 ; fi) \
-#                                              | sed 's/^/     /'
+                                       cd ${POPDIR}
                                else
-                                       if [ -n "${verbose}" ] ; then
-                                               echo Warning: directory \"${configdir}\" is missing.
-                                       fi
+                                       case "${verbose}" in
+                                       "") ;;
+                                       *) echo Warning: source directory \"${srcdir}/${configdir}\" is missing. ;;
+                                       esac
                                fi
                        done
                fi
        done # for each target
-
-       # Now build a Makefile for this host.
-       if [ -n "${subdirs}" -a ! -n "${removing}" ] ; then
-               push=`pwd`
-
-               if [ -n "${objdir}" ] ; then
-                       cd ${objdir}
-               fi
-
-               cd ${hostsubdir}
-               cat > GNUmakefile << E!O!F
-# Makefile generated by configure for host ${host_alias}.
-
-ALL := $(shell ls -d T-*)
-
-%:
-       $(foreach subdir,$(ALL),$(MAKE) -C $(subdir) \$@ &&) true
-
-all:
-E!O!F
-               cd ${push}
-       fi
 done # for each host
 
 ### clean up.
 
-rm -f ${TMPDIR}/configure.$$.com ${TMPDIR}/configure.$$.tgt ${TMPDIR}/configure.$$.hst ${TMPDIR}/configure.$$.pos
+# trap cmd above handles this now:
+#rm -f ${tmpfile}.com ${tmpfile}.tgt ${tmpfile}.hst ${tmpfile}.pos
 
 exit 0
 
-#
-#
-# $Log$
-# Revision 1.55  1991/10/10 04:57:23  rich
-# * Die when sub-configure's do.
-# * get the makefile building message line correct.
-# * set -e
-#
-# Revision 1.54  1991/10/10  01:04:42  rich
-# Backed out the "/bin/sh config.sub" change.  Fails when config.sub was
-# on PATH.
-#
-# Revision 1.53  1991/10/10  00:38:08  rich
-# Call config.sub as "/bin/sh config.sub" instead of directly.  This
-# protects us from the case where config.sub isn't executable.
-#
-# Revision 1.52  1991/10/09  00:48:26  rich
-# Another patch from jim.
-#
-# Revision 1.51  1991/10/08  06:07:58  wilson
-# Fix bug in smake- file code.
-#
-# Revision 1.50  1991/10/04  23:49:37  rich
-# Per's patch for my config.sub botch.
-#
-# Revision 1.49  1991/10/04  22:52:09  rich
-# Use john's heuristic for finding ourselves.  kinda like hare krishna.
-#
-# Revision 1.48  1991/10/02  13:17:28  rich
-# take out the set -e for now
-#
-# Revision 1.47  1991/10/02  10:02:23  rich
-# * temporary files in TMPDIR
-# * +objdir
-#
-# Revision 1.46  1991/10/02  06:29:53  rich
-# Added +site=foo option for naming site specific Makefile fragments.
-#
-# Revision 1.45  1991/10/02  06:15:13  rich
-# Removed +f option.  Used to stand for +forcesubdirs which is now
-# called +subdirs.
-#
-# Revision 1.44  1991/10/02  06:02:35  rich
-# Added rcs log line.
-#
-#
-#
-
 #
 # Local Variables:
 # fill-column: 131
This page took 0.037892 seconds and 4 git commands to generate.