In configure{.in} {host|target}_makefile_frag should name a file
[deliverable/binutils-gdb.git] / configure
index 906e273ce6606079360a8c9429ca37fe27dca7f9..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,7 +19,8 @@
 # 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
 
 #
 # Shell script to create proper links to machine-dependent files in
 #      config.status is removed.
 #
 
+# 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
 symbolic_link='ln -s'
@@ -39,134 +45,267 @@ symbolic_link='ln -s'
 #hard_link="echo ln"
 #symbolic_link="echo ln -s"
 
-progname=$0
-
 # clear some things potentially inherited from environment.
-ansi=
+
+Makefile=Makefile
+Makefile_in=Makefile.in
 arguments=$*
+commontargets=
+configdirs=
+datadir=
+datadiroption=
 defaulttargets=
-destdir=
 fatal=
-hostsubdir=
-Makefile=Makefile
-Makefile_in=Makefile.in
+floating_point=default
+gas=default
+host_makefile_frag=
+hosts=
+next_host=
+next_prefix=
+next_site=
+next_srcdir=
+next_target=
+next_tmpdir=
 norecursion=
+prefix=/usr/local
+progname=
 recurring=
 removing=
+site_makefile_frag=
 srcdir=
 srctrigger=
 target=
+target_makefile_frag=
 targets=
-commontargets=
-configdirs=
-targetsubdir=
-template=
+undefinedargs=
 verbose=
+version="$Revision$"
+x11=default
+
+NO_EDIT="This file was generated automatically by configure.  Do not edit."
+
+## this is a little touchy and won't always work, but...
+##
+## if the argv[0] starts with a slash then it is an absolute name that can be
+## used as is.
+##
+## otherwise, if argv[0] has no slash in it, we can assume that it is on the
+## path.  Since PATH might include "." we also add `pwd` to the end of PATH.
+##
+## otherwise we prepend `pwd` to $0 and hope that will give us an absolute
+## path.
+##
+
+PWD=`pwd`
+
+if echo $0 | grep '^/' > /dev/null ; then
+       progname=$0
+elif echo $0 | grep '/' > /dev/null ; then
+       progname=${PWD}/$0
+else
+       progname=$0
+       PATH=$PATH:${PWD} ; export PATH
+fi
 
 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
-               ;;
-       -recurring | +recurring | +recurrin | +recurri | +recurr | +recur | +recu | +rec | +re)
-               recurring=true
-               ;;
-       -rm | +rm)
-               removing=${arg}
-               ;;
-#      -srcdir=* | +srcdir=* | +srcdi=* | +srcd=* | +src=* | +sr=* | +s=*)
-#              srcdir=`echo ${arg} | sed 's/[+-]s[a-z]*=//'`
-#              ;;
-       -subdirs | +f* | +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}"
-               ;;
-       -template=* | +template=* | +templat=* | +templa=* | +templ=* | +temp=* | +tem=* | +te=*)
-               template=`echo ${arg} | sed 's/[+-]template=//'`
-               ;;
-       -v | -verbose | +v*)
-               verbose=${arg}
-               ;;
-       -* | +*)
-               (echo ;
-               echo "Unrecognized option: \"${arg}\"". ;
-               echo) 1>&2
-               fatal=true
-               ;;
-       *)
-               if [ -n "${hosts}" ] ; then
-                       subdirs="+subdirs"
-               fi
+       # 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}
 
-               newhosts="${hosts} ${arg}"
-               hosts=${newhosts}
-               ;;
-       esac
+       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
 
-if [ -n "${verbose}" ] ; then
-       echo `pwd`/configure $*
-fi
-
-# process host and target only if not rebuilding configure itself or removing.
-if [ -z "${template}" -a -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 " +subdirs         configure in subdirectories.  [in source directories]" ;
-       echo " +lang=LANG       configure to build LANG. [gcc]" ;
-       echo " +help            print this message. [normal config]" ;
-       echo " +gas             configure the compilers for use with gas. [native as]" ;
-       echo " +nfp             configure the compilers default to soft floating point. [hard float]" ;
-       echo " +norecursion     configure this directory only. [recurse]" ;
-       echo " +rm              remove this configuration. [build a configuration]" ;
-       echo " +target=TARGET   configure for TARGET.  [TARGET = HOST]" ;
-       echo " +template=TEM    rebuild configure using TEM. [normal config]" ;
+       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
@@ -175,139 +314,84 @@ if [ -n "${fatal}" -o "${hosts}" = "help" ] ; then
        exit 1
 fi
 
-#### configure.in common parts come in here.
-# This file is a shell script fragment that supplies the information
-# necessary to tailor a template configure script into the configure
-# script appropriate for this directory.  For more information, check
-# any existing configure script.
-
-configdirs="libiberty bfd binutils bison gcc readline ld gas gnulib ${clib} gdb emacs make grep diff rcs gdbm cvs prms"
-srctrigger=README.configure
-srcname="gnu development package"
+configsub=`echo ${progname} | sed 's/configure$/config.sub/'`
 
-## end of common part.
-
-# are we rebuilding config itself?
-if [ -n "${template}" ] ; then
-       if [ ! -r ${template} ] ; then
-               echo '***' "Can't find template ${template}." 1>&2
-               exit 1
-       fi
-
-# prep the template
-       sed -e '/^#### configure.in common parts come in here.$/,/^## end of common part.$/c\
-#### configure.in common parts come in here.\
-## end of common part.' \
-       -e '/^#### configure.in per-host parts come in here.$/,/^## end of per-host part.$/c\
-#### configure.in per-host parts come in here.\
-## end of per-host part.' \
-       -e '/^#### configure.in per-target parts come in here.$/,/^## end of per-target part.$/c\
-#### configure.in per-target parts come in here.\
-## end of per-target part.' \
-       -e '/^#### configure.in post-target parts come in here.$/,/^## end of post-target part.$/c\
-#### configure.in post-target parts come in here.\
-## end of post-target part.' \
-       < ${template} > template.new
+if ${configsub} `echo ${hosts} | sed -e 's/ .*//'` >/dev/null 2>&1 ; then
+       true
+else
+       echo '***' cannot find config.sub.
+       exit 1
+fi
 
+case "${srcdir}" 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
-
-               if [ -z "`grep '^# per\-target:' configure.in`" ] ; then
-                       echo '***' `pwd`/configure.in has no "per-target:" line. 1>&2
-                       exit 1
-               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 > configure.com
-               sed -e '1,/^# per\-host:/d' -e '/^# per\-target:/,$d' configure.in > configure.hst
-               if grep -s '^# post-target:' configure.in ; then
-                 sed -e '1,/^# per\-target:/d' -e '/^# post\-target:/,$d' configure.in > configure.tgt
-                 sed -e '1,/^# post\-target:/d' configure.in > configure.pos
-               else
-                 sed -e '1,/^# per\-target:/d' configure.in > configure.tgt
-                 echo >configure.pos
-               fi
-
-               # and insert them
-               sed -e '/^#### configure.in common parts come in here.$/  r configure.com' \
-                       -e '/^#### configure.in per\-host parts come in here.$/  r configure.hst' \
-                       -e '/^#### configure.in per\-target parts come in here.$/  r configure.tgt' \
-                       -e '/^#### configure.in post\-target parts come in here.$/  r configure.pos' \
-                       template.new > configure.new
-
-               rm -f configure.com configure.tgt configure.hst configure.pos
+               srcdir=.
        else
-               echo Warning: no configure.in in `pwd`
-               cat ${template} >> configure
+               echo '***' "Can't find configure.in.  Try using -srcdir=some_dir"
+               exit 1
        fi
+       ;;
+*) ;;
+esac
 
-       chmod a+x configure.new
-       rm template.new
-#      mv configure configure.old
-       mv configure.new configure
 
-       if [ -n "${verbose}" ] ; then
-               echo Rebuilt configure in `pwd`
-       fi
-
-       # Now update config.sub from the template directory.
-       if echo "$template" | grep -s 'configure$' ; then
-               cp `echo "$template" | sed s/configure$/config.sub/` ./config.sub.new
-       #       mv config.sub config.sub.old
-               mv config.sub.new config.sub
+# default datadir
+case "${datadir}" in
+"") datadir="$(prefix)/lib" ;;
+*) ;;
+esac
 
-               if [ -n "${verbose}" ] ; then
-                       echo Rebuilt config.sub in `pwd`
-               fi
-       fi
+### 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
 
-       if [ -z "${norecursion}" ] ; then
-               # If template is relative path, make it absolute for recurring.
-               if echo "${template}" | grep -s '^/' ; then
-                  true
-               else
-                  template=`pwd`/${template}
-               fi
+case "`grep '^# per\-target:' ${srcdir}/configure.in`" in
+"")
+       echo '***' ${srcdir}/configure.in has no "per-target:" line. 1>&2
+       exit 1
+       ;;
+*) ;;
+esac
 
-               while [ -n "${configdirs}" ] ; do
-                       # set configdir to car of configdirs, configdirs to cdr of configdirs
-                       set ${configdirs}; configdir=$1; shift; configdirs=$*
+case "${TMPDIR}" in
+"") TMPDIR=/tmp ; export TMPDIR ;;
+*) ;;
+esac
 
-                       if [ "`echo ${configdir}.*`" != "${configdir}.*" ] ; then
-                               targetspecificdirs=${configdir}.*
-                       else
-                               targetspecificdirs=
-                       fi
+# 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
 
-                       for i in ${configdir} ${targetspecificdirs} ; do
-                               if [ -d $i ] ; then
-                                       if [ -r $i/configure ] ; then
-                                               (cd $i ;
-                                                       ./configure +template=${template} ${verbose})
-                                       else
-                                               echo Warning: No configure script in `pwd`/$i
-                                       fi
-                               else
-                                       if [ -n "${verbose}" ] ; then
-                                         echo Warning: directory $i is missing.
-                                       fi
-                               fi
-                       done
-               done
-       fi
+### do common part of configure.in
 
-       exit 0
-fi
+. ${tmpfile}.com
 
 # some sanity checks on configure.in
-if [ -z "${srctrigger}" ] ; then
-       echo Warning: srctrigger not set in configure.in. `pwd` not configured.
+case "${srctrigger}" in
+"")
+       echo '***' srctrigger not set in ${PWD}/configure.in.
        exit 1
-fi
+       ;;
+*) ;;
+esac
 
 for host in ${hosts} ; do
        # Default other arg
@@ -318,111 +402,54 @@ for host in ${hosts} ; do
 
        host_alias=${host}
 
-       result=`/bin/sh ./config.sub ${host}`
+       result=`${configsub} ${host}`
        host_cpu=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
        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}
-
-#### configure.in per-host parts come in here.
-
-# XXX - FIXME there needs to be a case for hmake-dgux
-
-case "${host_os}" in
-sysv* | irix*) host_makefile_frag=config/hmake-sysv ;;
-esac
 
-## end of per-host part.
+       . ${tmpfile}.hst
 
        for target in ${targets} ; do
 
                target_alias=${target}
-               result=`/bin/sh ./config.sub ${target}`
+               result=`${configsub} ${target}`
                target_cpu=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
                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}
-
-#### configure.in per-target parts come in here.
-
-# XXX - FIXME there needs to be a case for tmake-a29k
-
-#
-# Local Variables:
-# fill-column: 131
-# End:
-#
-## end of per-target part.
-
-               # Temporarily, we support only direct subdir builds.
-               hostsubdir=H-${host_alias}
-               targetsubdir=T-${target_alias}
 
-               if [ -n "${removing}" ] ; then
-                       if [ -n "${subdirs}" ] ; then
-                               if [ -d "${hostsubdir}" ] ; then
-                                       rm -rf ${hostsubdir}/${targetsubdir}
+               . ${tmpfile}.tgt
 
-                                       if [ -z "`(ls ${hostsubdir}) 2>&1 | grep Target- | grep -v Target-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 "${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
+               case "${host_alias}" in
+               "${target_alias}")      subdirname=H-${host_alias} ;;
+               *)                      subdirname=X-${host_alias}-${target_alias} ;;
+               esac
 
-                               if [ ! -d ${hostsubdir} ] ; then mkdir ${hostsubdir} ; fi
-                               cd ${hostsubdir}
-
-                               if [ ! -d ${targetsubdir} ] ; then
-                                       if [ -z "${commontargets}" ] ; then
-                                               mkdir ${targetsubdir}
-                                       else
-                                               if [ ! -d Target-independent ] ; then
-                                                       mkdir Target-independent
-                                               fi
-
-                                               ${symbolic_link} Target-independent ${targetsubdir}
-                                       fi # if target independent
-                               fi # if no target dir yet
-
-                               cd ${targetsubdir}
-
-                               srcdir=../..
-                       else
-                               # if not subdir builds, then make sure none exist.
-                               if [ -n "`(ls .) 2>&1 | grep Host-`" ] ; then
-                                       echo '***' "Configured subdirs exist.  `pwd` not configured." 1>&2
-                                       exit 1
-                               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
@@ -453,173 +480,236 @@ esac
                                        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
-
-                       # 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}" >> ${Makefile}
-                       else
-                               echo "subdir =" >> ${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.
 
-               #       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
+                       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}" ; 
-                                       sed -e "/^####/  r ${srcdir}/${target_makefile_frag}" ${Makefile}) > Makefile.tem
-                               mv Makefile.tem ${Makefile}
-                       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}
-
-                       using=
-                       if [ -f ${srcdir}/${host_makefile_frag} ] ; then
-                               using=" using \"${host_makefile_frag}\""
-                       fi
-
-                       # remove any form feeds.
-                       sed -e "s/\f//" ${Makefile} > Makefile.tem
-                       mv Makefile.tem ${Makefile}
-
-                       if [ -f ${srcdir}/${target_makefile_frag} ] ; then
-                               if [ -z "${using}" ] ; then
-                                       andusing=" using \"${target_makefile_frag}\""
+                       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
+
+                       # 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`${andusing}.
+                               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
 
-#### configure.in post-target parts come in here.
-
-## end of post-target part.
+                       . ${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
-# ${srcname} was configured as follows:
-${srcdir}/configure" ${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
+                               case "${verbose}" in
+                               "") ;;
+                               *) echo Configuring ${configdir}... ;;
+                               esac
+
+                               if [ -d ${srcdir}/${configdir} ] ; then
+                                       case "${srcdir}" in
+                                       ".") ;;
+                                       *)
+                                               if [ ! -d ./${configdir} ] ; then
+                                                       mkdir ./${configdir}
+                                               fi
+                                               ;;
+                                       esac
+
+                                       POPDIR=${PWD}
+                                       cd ${configdir} 
+
+### 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
 
-                               if [ -d ${configdir} ] ; then
-                                       (cd ${configdir} ;
-                                               ./configure +recurring ${host_alias} +target=${target_alias} \
-                                                       ${verbose} ${subdirs} ${removing} +destdir=${destdir}) \
-                                               | sed 's/^/     /'
-                               else
-                                       if [ -n "${verbose}" ] ; then
-                                               echo Warning: directory \"${configdir}\" is missing.
+                                       if ${recprog} -recurring ${host_alias} -target=${target_alias} \
+                                               ${verbose} ${subdirs} ${removing} ${prefixoption} \
+                                               ${tmpdiroption} ${namesubdiroption} ${datadiroption} \
+                                               ${srcdiroption} ; then
+                                               true
+                                       else
+                                               exit 1
                                        fi
+
+                                       cd ${POPDIR}
+                               else
+                                       case "${verbose}" in
+                                       "") ;;
+                                       *) echo Warning: source directory \"${srcdir}/${configdir}\" is missing. ;;
+                                       esac
                                fi
                        done
                fi
        done # for each target
+done # for each host
 
-       # Now build a Makefile for this host.
-       if [ -n "${subdirs}" -a ! -n "${removing}" ] ; then
-               cd ${hostsubdir}
-               cat > GNUmakefile << E!O!F
-# Makefile generated by configure for host ${host_alias}.
-
-ALL := $(shell ls -d Target-*)
-
-%:
-       $(foreach subdir,$(ALL),$(MAKE) -C $(subdir) \$@ &&) true
+### clean up.
 
-all:
-E!O!F
-               cd ..
-       fi
-done # for each host
+# trap cmd above handles this now:
+#rm -f ${tmpfile}.com ${tmpfile}.tgt ${tmpfile}.hst ${tmpfile}.pos
 
 exit 0
 
This page took 0.035612 seconds and 4 git commands to generate.