Change svr4 references to sysv4.
[deliverable/binutils-gdb.git] / configure
index 9572ae85d871f780a2e3be887ff3dcb559efcda4..b2ad6022a41675e803f383bfd6d38aa12c841043 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,11 +1,6 @@
-#!/bin/sh
-# Please do not edit this file.  It is generated automatically from
-# configure.in and a configure template.
-configdirs=
-
 #!/bin/sh
 
-# Configuration script template
+# Configuration script
 #   Copyright (C) 1988, 1990, 1991 Free Software Foundation, Inc.
 
 #This file is part of GNU.
@@ -26,6 +21,9 @@ configdirs=
 
 # $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
 # preparation for compilation.
@@ -35,6 +33,11 @@ configdirs=
 #      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'
@@ -44,110 +47,272 @@ symbolic_link='ln -s'
 #hard_link="echo ln"
 #symbolic_link="echo ln -s"
 
-progname=$0
-
 # clear some things potentially inherited from environment.
-ansi=
-defaulttargets=
-destdir=
-fatal=
-hostsubdir=
+
 Makefile=Makefile
 Makefile_in=Makefile.in
-norecurse=
-recursing=
+arguments=$*
+commontargets=
+configdirs=
+datadir=
+datadiroption=
+defaulttargets=
+fatal=
+floating_point=default
+gas=default
+hosts=
+#hostsubdir=
+#namesubdir=
+next_prefix=
+next_host=
+#next_namesubdir=
+#next_objdir=
+next_site=
+next_srcdir=
+next_target=
+next_tmpdir=
+norecursion=
+#objdir=
+#objdiroption=
+prefix=/usr/local
+progname=
+recurring=
 removing=
 srcdir=
 srctrigger=
 target=
 targets=
-commontargets=
-targetsubdir=
-template=
+#targetsubdir=
+undefinedargs=
 verbose=
+version="$Revision$"
+x11=default
+
+# or maybe grab from gcc/version.c
+version_path=
+next_version_path=
+
+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
-               ;;
-       -norecurse | +no*)
-               norecurse=true
-               ;;
-       -recursing)
-               recursing=true
-               ;;
-       -rm | +r*)
-               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"
+       # 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_namesubdir}" ] ; then \
+#              namesubdir=${arg} ; namesubdiroption="--namesubdir=${namesubdir}" ; next_namesubdir=
+#      elif [ -n "${next_objdir}" ] ; then objdir=${arg} ; objdiroption="--objdir=${objdir}" ; next_objdir=
+       elif [ -n "${next_version_path}" ] ; then version_path=${arg} ; next_version_path=
+       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=
+               if [ -z "${targets}" ] ; then
+                       newtargets="${targets} ${arg}"
+                       targets="${newtargets}"
+               else
+                       echo '***' Can only configure for one target at a time.
+                       fatal=yes
                fi
+       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=*)
+#                      if [ -n "${hosts}" ] ; then
+#                              subdirs="--subdirs"
+#                      fi
+
+                       if [ -z "${hosts}" ] ; then
+                               newhosts="${hosts} `echo ${arg} | sed 's/^[-a-z]*=//'`"
+                               hosts="${newhosts}"
+                       else
+                               echo '***' Can only configure for one host at a time.
+                               fatal=yes
+                       fi
+                       ;;
+#              -namesubdir | --namesubdir | --namesubdi | --namesubd | --namesub | --namesu | --names | --name | --nam | --na)
+#                      next_namesubdir=yes
+#                      ;;
+#              -namesubdir=* | --namesubdir=* | --namesubdi=* | --namesubd=* | --namesub=* | --namesu=* | --names=* | --name=* | --nam=* | --na=*)
+#                      namesubdir=`echo ${arg} | sed 's/^[-a-z]*=//'`
+#                      namesubdiroption=${arg}
+#                      ;;
+               -nfp | --nf*)
+                       floating_point=no
+                       ;;
+               -norecursion | --no*)
+                       norecursion=true
+                       ;;
+#              -objdir=* | --objdir=* | --objdi=* | --objd=* | --obj=* | --ob=* | --o=*)
+#                      objdiroption=${arg}
+#                      objdir=`echo ${arg} | sed 's/^[-a-z]*=//'`
+#                      ;;
+#              -objdir | --objdir | --objdi | --objd | --obj | --ob | --o)
+#                      next_objdir=yes
+#                      ;;
+               -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
+                       ;;
+#              -subdirs | --su*)
+#                      subdirs=${arg}
+#                      ;;
+               -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=*)
+#                      if [ -n "${targets}" ] ; then
+#                              subdirs="--subdirs"
+#                      fi
+
+                       if [ -z "${targets}" ] ; then
+                               newtargets="${targets} `echo ${arg} | sed 's/^[-a-z]*=//'`"
+                               targets="${newtargets}"
+                       else
+                               echo '***' Can only configure for one target at a time.
+                               fatal=yes
+                       fi
+                       ;;
+               -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
+                       ;;
+               *)
+#                      if [ -n "${hosts}" ] ; then
+#                              subdirs="--subdirs"
+#                      fi
+
+                       if [ -z "${undefs}" ] ; then
+                               newundefs="${undefs} ${arg}"
+                               undefs=${newundefs}
+                       else
+                               echo '***' Can only configure for one host and one target at a time.
+                               fatal=yes
+                       fi
+                       ;;
+               esac
+       fi
 done
 
 if [ -n "${verbose}" ] ; then
-       echo `pwd`/configure $*
+       echo $0 $*
 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
+if [ -z "${fatal}" ] ; then
+#      # 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
+               if [ -z "${hosts}" ] ; then
+                       hosts=${undefs}
+               fi
+
+               if [ -z "${targets}" ] ; then
+                       if [ -n "${undefs}" ] ; then
+                               targets=${undefs}
+                       else
+                               targets=${hosts}
+                       fi
+               fi
        fi
 fi
 
@@ -155,21 +320,26 @@ 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 " +norecurse       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 " -objdir=ODIR     configure in a parallel tree rooted in ODIR. [rooted in \".\"]" ;
+       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 \"..\"]" ;
+# 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 ;
        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
+#      echo "Asking for more than one \"--target\" implies \"--subdirs\".  Any other" ;
+#      echo "options given will apply to all targets."
+       ) 1>&2
 
        if [ -r config.status ] ; then
                cat config.status
@@ -178,137 +348,65 @@ 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 make grep diff prms "
-srctrigger=README.configure
-srcname="gnu development package"
-
-## end of common part.
+configsub=`echo ${progname} | sed 's/configure$/config.sub/'`
 
-# 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
 
+if [ -z "${srcdir}" ] ; then
        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=.
+       elif [ -r ../configure.in ] ; then
+               srcdir=..
        else
-               echo Warning: no configure.in in `pwd`
-               cat ${template} >> configure
-       fi
-
-       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`
+               echo '***' "Can't find configure.in.  Try using -srcdir=some_dir"
+               exit 1
        fi
+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
 
-               if [ -n "${verbose}" ] ; then
-                       echo Rebuilt config.sub in `pwd`
-               fi
-       fi
+### break up ${srcdir}/configure.in.
+if [ -z "`grep '^# per\-host:' ${srcdir}/configure.in`" ] ; then
+       echo '***' ${srcdir}/configure.in has no "per-host:" line. 1>&2
+       exit 1
+fi
 
-       if [ -z "${norecurse}" ] ; then
-               # If template is relative path, make it absolute for recursing.
-               if echo "${template}" | grep -s '^/' ; then
-                  true
-               else
-                  template=`pwd`/${template}
-               fi
+if [ -z "`grep '^# per\-target:' ${srcdir}/configure.in`" ] ; then
+       echo '***' ${srcdir}/configure.in has no "per-target:" line. 1>&2
+       exit 1
+fi
 
-               while [ -n "${configdirs}" ] ; do
-                       # set configdir to car of configdirs, configdirs to cdr of configdirs
-                       set ${configdirs}; configdir=$1; shift; configdirs=$*
+if [ -z "${TMPDIR}" ] ; then
+       TMPDIR=/tmp ; export TMPDIR
+fi
 
-                       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.
+       echo '***' srctrigger not set in ${PWD}/configure.in.
        exit 1
 fi
 
@@ -319,101 +417,119 @@ for host in ${hosts} ; do
                defaulttargets=true
        fi
 
-       result=`/bin/sh ./config.sub ${host}`
+       host_alias=${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.
+       host_makefile_frag=config/mh-${host}
+       if [ ! -f ${host_makefile_frag} ]
+       then
+               host_makefile_frag=config/mh-${host_alias}
+       fi
 
-## end of per-host part.
+       . ${tmpfile}.hst
 
        for target in ${targets} ; do
 
-               result=`/bin/sh ./config.sub ${target}`
+               target_alias=${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}
+               target_makefile_frag=config/mt-${target}
+               if [ ! -f ${target_makefile_frag} ]
+               then
+                       target_makefile_frag=config/mt-${target_alias}
+               fi
 
-#### configure.in per-target parts come in here.
+               . ${tmpfile}.tgt
 
-#
-# Local Variables:
-# fill-column: 131
-# End:
-#
-## end of per-target part.
+               if [ "${host_alias}" = "${target_alias}" ] ; then
+                       subdirname=H-${host_alias}
+               else
+                       subdirname=X-${host_alias}-${target_alias}
+               fi
 
-               # Temporarily, we support only direct subdir builds.
-               hostsubdir=Host-${host}
-               targetsubdir=Target-${target}
+               if [ -n "${namesubdir}" ] ; then
+                       subdirname=${namesubdir}
+               fi
 
                if [ -n "${removing}" ] ; then
-                       if [ -n "${subdirs}" ] ; then
-                               if [ -d "${hostsubdir}" ] ; then
-                                       rm -rf ${hostsubdir}/${targetsubdir}
-
-                                       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
+#                      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 "${subdirname}" ] ; then
+#                                      rm -rf ${hostsubdir}
+#                              else
+#                                      echo Warning: no ${PWD}/${hostsubdir} to remove.
+#                              fi
+#                      else
                                rm -f ${Makefile} config.status ${links}
-                       fi
+#                      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
-
-                               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
+#                      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
+#
+#                              # use a subdir common to all targets for this host iff: this is a cross AND
+#                              # this tool does not claim to be target dependent AND we have not been asked to name the subdir.
+#                              if [ ${host_alias} != ${target_alias} -a -z "${target_dependent}" -a -z "${namesubdiroption}" ]
+#                              then
+#                                      if [ ! -d H-${host_alias} ] ; then mkdir H-${host_alias} ; fi
+#
+#                                      if (${symbolic_link} ${subdirname} H-${host_alias} 2> /dev/null) ; then
+#                                              true
+#                                      else # just give up. they lose.
+#                                              rmdir H-${host_alias}
+#                                              if [ ! -d ${subdirname} ] ; then mkdir ${subdirname} ; fi
+#                                      fi
+#                              elif [ ! -d ${subdirname} ] ; then
+#                                      mkdir ${subdirname}
+#                              fi
+#
+#                              cd ${subdirname}
+#
+#                              if [ -z "${srcdir}" ] ; then
+#                                      srcdir=..
+#                              fi
+#                      elif [ "`echo H-*`" != "H-*" -a "`echo X-*`" != "X-*" ] ; then
+#                              # if not subdir builds, then make sure none exist.
+#                              # We might miss if there are explicitly named subdirs.
+#                              echo '***' "Configured subdirs exist.  ${PWD} not configured." 1>&2
+#                              exit 1
+#                      else
+#                              true
+#                      fi
 
                        # Find the source files, if location was not specified.
                        if [ -z "${srcdir}" ] ; then
                                srcdirdefaulted=1
                                srcdir=.
-                               if [ -n "${srctrigger}" -a ! -r ${srctrigger} ] ; then
+                               if [ ! -r ${srctrigger} ] ; then
                                        srcdir=..
                                fi
                        fi
 
-                       if [ -n "${srctrigger}" -a ! -r ${srcdir}/${srctrigger} ] ; then
+                       if [ ! -r ${srcdir}/${srctrigger} ] ; then
                                if [ -z "${srcdirdefaulted}" ] ; then
-                                       echo '***' "${progname}: Can't find ${srcname} sources in `pwd`/${srcdir}" 1>&2
+                                       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
+                                       echo '***' "${progname}: Can't find ${srcname} sources in ${PWD}/. or ${PWD}/.." 1>&2
                                fi
 
                                echo '***' \(At least ${srctrigger} is missing.\) 1>&2
@@ -453,15 +569,18 @@ for host in ${hosts} ; do
                        # 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
+                               .)
+                                       ;;
+                               *)
+                                       echo "# "${NO_EDIT} > .gdbinit
+                                       echo "dir ." >> .gdbinit
+                                       echo "dir ${srcdir}" >> .gdbinit
+                                       echo "source ${srcdir}/.gdbinit" >> .gdbinit
+                                       ;;
+                               esac
+                       fi
 
                        # Install a makefile, and make it set VPATH
                        # if necessary so that the sources are found.
@@ -474,46 +593,83 @@ for host in ${hosts} ; do
                        # 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}
+                               echo "ALL=all.cross" >> ${Makefile}
                        else
                                echo "ALL=all.internal" > ${Makefile}
                        fi
 
                        # set target, host, VPATH
-                       echo "host = ${host}" >> ${Makefile}
-                       echo "target = ${target}" >> ${Makefile}
-
-                       if [ -n "${subdirs}" ] ; then
-                               echo "subdir = /${hostsubdir}/${targetsubdir}" >> ${Makefile}
-                       else
-                               echo "subdir =" >> ${Makefile}
-                       fi
-
-               #       echo "workdir = `pwd`" >> ${Makefile}
+                       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 "version_path = ${version_path}" >> ${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 = /${subdirname}" ;
+#                                      echo "unsubdir = ..") >> ${Makefile}
+#                      else
+                               (echo "subdir =" ;
+                                       echo "unsubdir = .") >> ${Makefile}
+#                      fi
+
+               #       echo "workdir = ${PWD}" >> ${Makefile}
                        echo "VPATH = ${srcdir}" >> ${Makefile}
 
                        # add "Makefile.in" (or whatever it's called)
                        cat ${srcdir}/${Makefile_in} >> ${Makefile}
 
+                       # Conditionalize the makefile for this site.
+                       if [ -n "${site}" ] ; then
+                               site_makefile_frag=config/ms-${site}
+
+                               if [ -f ${srcdir}/${site_makefile_frag} ] ; then
+                                       (echo "site_makefile_frag = ${srcdir}/${site_makefile_frag}" ; 
+                                               sed -e "/^####/  r ${srcdir}/${site_makefile_frag}" ${Makefile}) > Makefile.tem
+                               else
+                                       (echo "site_makefile_frag =" ; 
+                                               cat ${Makefile}) > Makefile.tem
+                               fi
+                               mv Makefile.tem ${Makefile}
+                       fi
+
                        # Conditionalize the makefile for this host.
                        if [ -f ${srcdir}/${host_makefile_frag} ] ; then
-                               sed -e "/^####/  r ${srcdir}/${host_makefile_frag}" ${Makefile} > Makefile.tem
-                               mv Makefile.tem ${Makefile}
+                               (echo "host_makefile_frag = ${srcdir}/${host_makefile_frag}" ;
+                                       sed -e "/^####/  r ${srcdir}/${host_makefile_frag}" ${Makefile}) > Makefile.tem
+                       else
+                               (echo "host_makefile_frag =" ;
+                                       cat ${Makefile}) > Makefile.tem
                        fi
+                       mv Makefile.tem ${Makefile}
 
                        # Conditionalize the makefile for this target.
                        if [ -f ${srcdir}/${target_makefile_frag} ] ; then
-                               sed -e "/^####/  r ${srcdir}/${target_makefile_frag}" ${Makefile} > Makefile.tem
-                               mv Makefile.tem ${Makefile}
+                               (echo "target_makefile_frag = ${srcdir}/${target_makefile_frag}" ; 
+                                       sed -e "/^####/  r ${srcdir}/${target_makefile_frag}" ${Makefile}) > Makefile.tem
+                       else
+                               (echo "target_makefile_frag =" ; 
+                                       cat ${Makefile}) > Makefile.tem
                        fi
+                       mv Makefile.tem ${Makefile}
 
                        # 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
+                       # set prefix
+                       if [ -n "${prefix}" ] ; then
+                               sed "s:^prefix =.*$:prefix = ${prefix}:" ${Makefile} > Makefile.tem
+                               mv Makefile.tem ${Makefile}
+                       fi
+
+                       # set datadir
+                       if [ -n "${datadir}" ] ; then
+                               sed "s:^datadir =.*$:datadir = ${datadir}:" ${Makefile} > Makefile.tem
                                mv Makefile.tem ${Makefile}
                        fi
 
@@ -525,189 +681,126 @@ for host in ${hosts} ; do
                        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}
+
+                       # prepend warning about editting.
+                       echo "# "${NO_EDIT} > ${Makefile}.tem
+                       cat ${Makefile} >> ${Makefile}.tem
+                       mv Makefile.tem ${Makefile}
+
                        using=
                        if [ -f ${srcdir}/${host_makefile_frag} ] ; then
-                               using=" using \"${host_makefile_frag}\""
+                               using="${using} and \"${host_makefile_frag}\""
                        fi
-
                        if [ -f ${srcdir}/${target_makefile_frag} ] ; then
-                               if [ -z "${using}" ] ; then
-                                       andusing=" using \"${target_makefile_frag}\""
-                               else
-                                       andusing="${using} and \"${target_makefile_frag}\""
-                               fi
-                       else
-                               andusing=${using}
+                               using="${using} and \"${target_makefile_frag}\""
+                       fi
+                       if [ -n "${site}" -a \
+                            -f ${srcdir}/${site_makefile_frag} ] ; then
+                               using="${using} and \"${site_makefile_frag}\""
                        fi
+                       using=`echo "${using}" | sed 's/and/using/'`
+                       using="Created \"${Makefile}\" in ${PWD}${using}."
 
-                       if [ -n "${verbose}" -o -z "${recursing}" ] ; then
-                               echo "Created \"${Makefile}\"" in `pwd`${andusing}.
+                       if [ -n "${verbose}" -o -z "${recurring}" ] ; then
+                               echo ${using}
                        fi
 
-#### configure.in post-target parts come in here.
+                       . ${tmpfile}.pos
 
-## end of post-target part.
+                       # describe the chosen configuration in config.status.
+                       # Make that file a shellscript which will reestablish
+                       # the same configuration.  Used in Makefiles to rebuild
+                       # Makefiles.
 
-                       if [ "${host}" = "${target}" ] ; then
-                               echo "Links are now set up for use with a ${target}." \
-                                       > config.status
-               #                       | tee ${srcdir}/config.status
-                       else
-                               echo "Links are now set up for host ${host} and target ${target}." \
-                                       > config.status
-               #                       | tee ${srcdir}/config.status
+                       if [ -z "${norecursion}" ] ; then
+                               arguments="${arguments} -norecursion"
                        fi
 
-                       originaldir=`pwd`
-                       cd ${srcdir}
+                       echo "#!/bin/sh
+# ${NO_EDIT}
+# ${PWD} was configured as follows:
+${progname}" ${arguments}  "
+# ${using}" > config.status
+                       chmod a+x config.status
+
+#                      originaldir=${PWD}
+#                      cd ${srcdir}
                fi
 
-               # If there are subdirectories, then recurse
-               if [ -z "${norecurse}" -a -n "${configdirs}" ] ; then 
+               # 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
-                                       (cd ${configdir} ;
-                                               ./configure -recursing ${host} +target=${target} \
-                                                       ${verbose} ${subdirs} ${removing} +destdir=${destdir}) \
-                                               | sed 's/^/     /'
-                               else
-                                       if [ -n "${verbose}" ] ; then
-                                               echo Warning: directory \"${configdir}\" is missing.
+                               if [ -d ${srcdir}/${configdir} ] ; then
+                                       if [ "${srcdir}" != "." ] ; then
+                                               if [ ! -d ./${configdir} ] ; then
+                                                       mkdir ./${configdir}
+                                               fi
                                        fi
+
+                                       POPDIR=${PWD}
+                                       cd ${configdir} 
+
+### figure out what to do with srcdir
+                                       case "${srcdir}" in
+                                       ".") ;; # do nothing.  We're building in place.
+                                       /*) srcdiroption="-srcdir=${srcdir}/${configdir}" ;; # absolute path
+                                       *) srcdiroption="-srcdir=../${srcdir}/${configdir}" ;; # otherwise relative
+                                       esac
+
+### The recursion line is here.
+                                       if (${progname} -recurring ${host_alias} -target=${target_alias} \
+                                               ${verbose} ${subdirs} ${removing} ${prefixoption} \
+                                               ${tmpdiroption} ${namesubdiroption} ${datadiroption} \
+                                               ${srcdiroption}) ; then
+                                               true
+                                       else
+                                               exit 1
+                                       fi
+
+                                       cd ${POPDIR}
+                               elif [ -n "${verbose}" ] ; then
+                                       echo Warning: source directory \"${srcdir}/${configdir}\" is missing.
                                fi
                        done
                fi
        done # for each target
 
        # 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}.
-
-ALL := $(shell ls -d Target-*)
-
-%:
-       $(foreach subdir,$(ALL),$(MAKE) -C $(subdir) \$@ &&) true
-
-all:
-E!O!F
-               cd ..
-       fi
-done # for each host
-
-exit 0
-
-#
-# $Log$
-# Revision 1.33  1991/08/25 21:48:38  rich
-# Adding diff to the fray.
-#
-# Revision 1.32  1991/08/25  20:18:20  rich
-# Adding grep to the fray.
-#
-# Revision 1.31  1991/08/23  04:50:57  rich
-# Minor config polish.
-#
-# Revision 1.22  1991/08/23  03:31:43  rich
-# Minor polish & config mapping.
-#
-# Revision 1.30  1991/08/22  07:15:51  rich
-# Three part names, etc.
-#
-# Revision 1.29  1991/08/20  04:56:51  rich
-# revisiting error messages
-#
-# Revision 1.28  1991/08/16  19:22:17  rich
-# This is the commontargets change and should be considered
-# experimental.
-#
-# Revision 1.27  1991/08/08  01:14:13  rich
-# allow +f to stand in for +subdirs
-#
-# Revision 1.26  1991/08/07  19:21:32  rich
-# +forcesubdirs -> +subdirs
-#
-# Revision 1.25  1991/08/07  07:05:30  rich
-# Added make.
-#
-# Revision 1.24  1991/08/06  19:26:01  rich
-# revised option parsing.
-#
-# Revision 1.23  1991/08/06  19:12:32  rich
-# Host-level GNUmakefiles.
+#      if [ -n "${subdirs}" -a ! -n "${removing}" ] ; then
+#              push=${PWD}
 #
-# Revision 1.22  1991/07/20  01:22:30  rich
-# propogate gdb changes and destdir fix
+#              if [ -n "${objdir}" ] ; then
+#                      cd ${objdir}
+#              fi
 #
-# Revision 1.21  1991/07/20  00:55:20  gnu
-# Roll in new configure that handles GDB.  Make sure that the "configure"
-# that is checked-in reflects the latest "configure.in", which includes gdb.
-#
-# Revision 1.9  1991/07/06  04:35:51  gnu
-# Fix bug in configure when iterating targets.
-# Depend on alldeps.mak, not ${srcdir}/alldeps.mak, so it can be found
-# in either spot.
-#
-# Revision 1.8  1991/07/05  00:04:58  gnu
-# Thu Jul  4 14:47:06 1991  John Gilmore  (gnu at cygint.cygnus.com)
-#
-#         * configure.in, Makefile.in:  Avoid rebuilding "depend" as much.
-#         Avoid declaring Makefile dependencies, because GNU Make stupidly
-#         tries to update it if we do.
-#
-#         * coffread.c:  Revise for minor changes to bfd internal coff
-#         indexes.
-#
-#         * configure:  If -template= is given a relative path, make it
-#         absolute before recurring in subdirectories.
-#
-# Revision 1.7  1991/07/04  15:59:46  gnu
-# Make gdb work with configure.  Only thing that doesn't work is the -list
-# option (as far as I know).
-#
-# Revision 1.6  1991/06/04  07:28:16  gnu
-# Change GDB over to GNU General Public License version 2.
-#
-# Revision 1.5  1991/05/19  07:26:54  rich
-# configure changes and -opcode.h movement.
-#
-# Revision 1.4  1991/05/19  00:16:45  rich
-# Configure for gdb.
-#
-# Revision 1.10  1991/05/04  00:58:38  rich
-# Fix program name bug.
-#
-# Revision 1.9  1991/05/03  19:14:18  rich
-# Changed getopt to libiberty, commented out an aborted attempt at host
-# level Makefiles because it caused errors on +rm, add a warning for
-# directories expected to be removed on +rm but that don't exist.
-#
-# Revision 1.8  1991/04/24  16:50:59  rich
-# Three staging checkpoint.
-#
-# Revision 1.7  1991/04/17  01:34:47  rich
-# Added getopt for binutils, fixed problem with host dependancies in
-# configure.template.
-#
-# Revision 1.6  1991/04/16  00:18:44  rich
-# Now handles multiple hosts and targets.
-#
-# Revision 1.5  1991/04/15  23:43:44  rich
-# Now handles multiple hosts and targets.
-#
-# Revision 1.4  1991/04/13  02:11:03  rich
-# Config cut 3.  We now almost install a29k.
-#
-# Revision 1.3  1991/04/11  02:41:54  rich
-# Cut 2 config.  Subdirs.
+#              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.
+
+# trap cmd above handles this now:
+#rm -f ${tmpfile}.com ${tmpfile}.tgt ${tmpfile}.hst ${tmpfile}.pos
+
+exit 0
 
 #
 # Local Variables:
@@ -715,4 +808,4 @@ exit 0
 # End:
 #
 
-# end of configure.template
+# end of configure
This page took 0.03649 seconds and 4 git commands to generate.