Catch up to changes recorded in GDB ChangeLog, to wit:
[deliverable/binutils-gdb.git] / configure
index a4a2178f7a38215ccfa3e4d3af6f70a26bf8cc1d..6586640ed2b8b8859d74642e477d9e77154bf67a 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,31 +1,29 @@
-#!/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.
 
-#GNU CC is free software; you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation; either version 1, or (at your option)
-#any later version.
-
-#GNU CC is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-
-#You should have received a copy of the GNU General Public License
-#along with GNU CC; see the file COPYING.  If not, write to
-#the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# 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
 # preparation for compilation.
@@ -35,6 +33,8 @@ configdirs=
 #      config.status is removed.
 #
 
+set -e
+
 remove=rm
 hard_link=ln
 symbolic_link='ln -s'
@@ -45,68 +45,89 @@ symbolic_link='ln -s'
 #symbolic_link="echo ln -s"
 
 # clear some things potentially inherited from environment.
+
+Makefile=Makefile
+Makefile_in=Makefile.in
 ansi=
+arguments=$*
+commontargets=
+configdirs=
 defaulttargets=
 destdir=
 fatal=
 hostsubdir=
-norecurse=
+norecursion=
+objdir=
+objdiroption=
+progname=
+recurring=
 removing=
 srcdir=
 srctrigger=
 target=
 targets=
 targetsubdir=
-template=
 verbose=
 
 for arg in $*;
 do
        case ${arg} in
-       -ansi | +ansi)
+       -ansi | +a*)
                ansi=true
+               clib=clib
                ;;
        -destdir=* | +destdir=* | +destdi=* | +destd=* | +dest=* | +des=* | +de=* | +d=*)
                destdir=`echo ${arg} | sed 's/[+-]d[a-z]*=//'`
                ;;
-       -forcesubdirs | +forcesubdirs | +f)
-               forcesubdirs=${arg}
-               ;;
        -languages=* | +languages=* | +language=* | +languag=* \
                | +langua=* | +langu=* | +lang=* | +lan=* | +la=* \
                | +l=*)
                languages="${languages} `echo ${arg} | sed 's/[+-]l[a-z]*=//'`"
                ;;
-       -gas | +gas | +ga | +g)
+       -gas | +g*)
                gas=yes
                ;;
-       -help | +h | +help)
+       -help | +h*)
                fatal=true
                ;;
-       -nfp | +nfp | +nf | +n)
+       -nfp | +nf*)
                nfp=yes
                ;;
-       -norecurse | +norecurse)
-               norecurse=true
+       -norecursion | +no*)
+               norecursion=true
+               ;;
+       -objdir=* | +objdir=* | +objdi=* | +objd=* | +obj=* | +ob=* | +o=*)
+               objdiroption=${arg}
+               objdir=`echo ${arg} | sed 's/[+-]o[a-z]*=//'`
+               ;;
+       -recurring | +recurring | +recurrin | +recurri | +recurr | +recur | +recu | +rec | +re)
+               recurring=true
                ;;
        -rm | +rm)
                removing=${arg}
                ;;
-#      -srcdir=* | +srcdir=* | +srcdi=* | +srcd=* | +src=* | +sr=* | +s=*)
+       -site=* | +site=* | +sit=* | +si=*)
+               site=`echo ${arg} | sed 's/[+-]s[a-z]*=//'`
+               ;;
+#      -srcdir=* | +srcdir=* | +srcdi=* | +srcd=* | +src=* | +sr=*)
 #              srcdir=`echo ${arg} | sed 's/[+-]s[a-z]*=//'`
 #              ;;
-       -target=* | +target=* | +targe=* | +targ=* | +tar=* | +ta=* | +t=*)
+       -subdirs | +su*)
+               subdirs=${arg}
+               ;;
+       -target=* | +target=* | +targe=* | +targ=* | +tar=* | +ta=*)
                if [ -n "${targets}" ] ; then
-                       forcesubdirs="+forcesubdirs"
+                       subdirs="+subdirs"
                fi
 
                newtargets="${targets} `echo ${arg} | sed 's/[+-]t[a-z]*=//'`"
                targets="${newtargets}"
                ;;
-       -template=* | +template=*)
-               template=`echo ${arg} | sed 's/[+-]template=//'`
+       -tmpdir=* | +tmpdir=* | +tmpdi=* | +tmpd=* | +tmp=* | +tm=*)
+               tmpdiroption=${arg}
+               TMPDIR=`echo ${arg} | sed 's/[+-]t[a-z]*=//'`
                ;;
-       +verbose | +verbos | +verbo | +verb | +ver | +ve | +v)
+       -v | -verbose | +v*)
                verbose=${arg}
                ;;
        -* | +*)
@@ -117,7 +138,7 @@ do
                ;;
        *)
                if [ -n "${hosts}" ] ; then
-                       forcesubdirs="+forcesubdirs"
+                       subdirs="+subdirs"
                fi
 
                newhosts="${hosts} ${arg}"
@@ -127,17 +148,46 @@ do
 done
 
 if [ -n "${verbose}" ] ; then
-       echo `pwd`/configure $*
-       echo targets=\"${targets}\"
+       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
+## 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.
+##
+
+if (echo $0 | grep '^/' > /dev/null) ; then
+       progname=$0
+else
+       if (echo $0 | grep '/' > /dev/null) ; then
+               progname=`pwd`/$0
+       else
+               progname=$0
+               PATH=$PATH:`pwd` ; export PATH
+       fi
+fi
+
+configsub=`echo ${progname} | sed 's/configure\$/config.sub/'`
+
+if [ ! -f ${configsub} ] ; then
+       echo '***' cannot find config.sub.
+       echo 1
+fi
+
+# process host and target only if not removing.
+if [ -z "${removing}" -a -z "${fatal}" ] ; then
        # Complain if an arg is missing
        if [ -z "${hosts}" ] ; then
                (echo ;
                echo "configure: No HOST specified." ;
-               echo) 2>&1
+               echo) 1>&2
                fatal=true
        fi
 fi
@@ -147,19 +197,22 @@ if [ -n "${fatal}" -o "${hosts}" = "help" ] ; then
        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 " +forcesubdirs    configure in subdirectories.  [in source directories]" ;
-       echo " +lang=LANG       configure to build LANG. [gcc]" ;
-       echo " +help            print this message. [normal config]" ;
+       echo " +destdir=MYDIR   configure for installation into MYDIR. [\"/usr/local\"]" ;
        echo " +gas             configure the compilers for use with gas. [native as]" ;
+       echo " +help            print this message. [normal config]" ;
+       echo " +lang=LANG       configure to build LANG. [gcc]" ;
        echo " +nfp             configure the compilers default to soft floating point. [hard float]" ;
-       echo " +norecurse       configure this directory only. [recurse]" ;
+       echo " +norecursion     configure this directory only. [recurse]" ;
+       echo " +objdir=ODIR     configure in a parallel tree rooted in ODIR. [rooted in \".\"]" ;
        echo " +rm              remove this configuration. [build a configuration]" ;
+       echo " +site            configure with site specific makefile" ;
+# This is correctly aligned in the output, even though it isn't here.
+       echo " +subdirs configure in subdirectories.  [in source directories]" ;
        echo " +target=TARGET   configure for TARGET.  [TARGET = HOST]" ;
-       echo " +template=TEM    rebuild configure using TEM. [normal config]" ;
+       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 \"+forcesubdirs\".  Any other" ;
+       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
@@ -169,92 +222,46 @@ 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 ld gas gcc gnulib clib"
-srctrigger=README.configure
-srcname="gnu development package"
-
-## end of common part
-
-# are we rebuilding config itself?
-if [ -n "${template}" ] ; then
-       if [ ! -r ${template} ] ; then
-               echo "Can't find template ${template}."
+### break up configure.in.
+if [ -r configure.in ] ; then
+       if [ -z "`grep '^# per\-host:' configure.in`" ] ; then
+               echo '***' `pwd`/configure.in has no "per-host:" line. 1>&2
                exit 1
        fi
 
-       mv configure configure.old
-       echo "#!/bin/sh" > configure
-       echo "# Please do not edit this file.  It is generated automatically from" >> configure
-       echo "# configure.in and a configure template." >> configure
-       echo "configdirs=" >> configure
-       echo >> configure
-
-       if [ -r configure.in ] ; then
-               if [ -z "`grep '^# per\-host:' configure.in`" ] ; then
-                       echo `pwd`/configure.in has no "per-host:" line.
-                       exit 1
-               fi
-
-               if [ -z "`grep '^# per\-target:' configure.in`" ] ; then
-                       echo `pwd`/configure.in has no "per-target:" line.
-                       exit 1
-               fi
-
-               # split configure.in into common, per-host, and per-target parts
-               sed -e '/^# per\-host:/,$d' configure.in > configure.com
-               sed -e '1,/^# per\-host:/d' -e '/^# per\-target:/,$d' configure.in > configure.hst
-               sed -e '1,/^# per\-target:/d' configure.in > configure.tgt
+       if [ -z "`grep '^# per\-target:' configure.in`" ] ; then
+               echo '***' `pwd`/configure.in has no "per-target:" line. 1>&2
+               exit 1
+       fi
 
-               # and insert them
-               sed -e '/^#### configure.in common part/  r configure.com' \
-                       -e '/^#### configure.in per\-host part/  r configure.hst' \
-                       -e '/^#### configure.in per\-target part/  r configure.tgt' \
-                       ${template} >> configure
+       if [ -z "${TMPDIR}" ] ; then
+               TMPDIR=/tmp ; export TMPDIR
+       fi
 
-               rm -f configure.com configure.tgt configure.hst
+       # split configure.in into common, per-host, per-target,
+       # and post-target parts.  Post-target is optional.
+       sed -e '/^# per\-host:/,$d' configure.in > ${TMPDIR}/configure.$$.com
+       sed -e '1,/^# per\-host:/d' -e '/^# per\-target:/,$d' configure.in > ${TMPDIR}/configure.$$.hst
+       if grep -s '^# post-target:' configure.in ; then
+         sed -e '1,/^# per\-target:/d' -e '/^# post\-target:/,$d' configure.in > ${TMPDIR}/configure.$$.tgt
+         sed -e '1,/^# post\-target:/d' configure.in > ${TMPDIR}/configure.$$.pos
        else
-               echo Warning: no configure.in in `pwd`
-               cat ${template} >> configure
+         sed -e '1,/^# per\-target:/d' configure.in > ${TMPDIR}/configure.$$.tgt
+         echo >${TMPDIR}/configure.$$.pos
        fi
 
-       chmod a+x configure
-       rm configure.old
-       echo Rebuilt configure in `pwd`
+else
+       echo '***' No configure.in in `pwd`
+       exit 1
+fi
 
-       if [ -z "${norecurse}" ] ; then
-               while [ -n "${configdirs}" ] ; do
-                       # set configdir to car of configdirs, configdirs to cdr of configdirs
-                       set ${configdirs}; configdir=$1; shift; configdirs=$*
+### do common part of configure.in
 
-                       if [ "`echo ${configdir}.*`" != "${configdir}.*" ] ; then
-                               targetspecificdirs=${configdir}.*
-                       else
-                               targetspecificdirs=
-                       fi
-
-                       for i in ${configdir} ${targetspecificdirs} ; do
-                               if [ -r $i/configure ] ; then
-                                       (cd $i ;
-                                               ./configure +template=${template} ${verbose})
-                               else
-                                       echo No configure script in `pwd`/$i
-                               fi
-                       done
-               done
-       fi
-
-       exit 0
-fi
+. ${TMPDIR}/configure.$$.com
 
 # some sanity checks on configure.in
 if [ -z "${srctrigger}" ] ; then
-       echo srctrigger not set in configure.in. `pwd` not configured.
+       echo '***' srctrigger not set in `pwd`/configure.in.
        exit 1
 fi
 
@@ -265,59 +272,92 @@ for host in ${hosts} ; do
                defaulttargets=true
        fi
 
-#### configure.in per-host parts come in here.
+       host_alias=${host}
 
-## end of per-target part
+       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}
 
+       . ${TMPDIR}/configure.$$.hst
 
        for target in ${targets} ; do
 
-               if [ -n "${verbose}" ] ; then
-                       echo "  "target=\"${target}\"
-               fi
-
-#### configure.in per-target parts come in here.
+               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}
 
-## end of per-target part
+               . ${TMPDIR}/configure.$$.tgt
 
                # Temporarily, we support only direct subdir builds.
-               hostsubdir=Host-${host}
-               targetsubdir=Target-${target}
+               hostsubdir=H-${host_alias}
+               targetsubdir=T-${target_alias}
 
                if [ -n "${removing}" ] ; then
-                       if [ -n "${forcesubdirs}" ] ; then
+                       if [ -n "${objdir}" ] ; then
+                               echo '***' +rm not supported for +objdir.  Just \"rm -rf ${objdir}\" by hand.
+                               exit 1
+                       fi
+
+                       if [ -n "${subdirs}" ] ; then
                                if [ -d "${hostsubdir}" ] ; then
                                        rm -rf ${hostsubdir}/${targetsubdir}
 
-                                       if [ -z "`(ls ${hostsubdir}) 2>&1 | grep Target-`" ] ; then
+                                       if [ -z "`(ls ${hostsubdir}) 2>&1 | grep T- | grep -v T-independent`" ] ; then
                                                rm -rf ${hostsubdir}
                                        fi
                                else
                                        echo Warning: no `pwd`/${hostsubdir} to remove.
                                fi
                        else
-                               rm -f Makefile config.status ${links}
+                               rm -f ${Makefile} config.status ${links}
                        fi
                else
-                       if [ -n "${forcesubdirs}" ] ; then
+                       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."
+                               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 mkdir ${targetsubdir} ; fi
+                               if [ ! -d ${targetsubdir} ] ; then
+                                       if [ -z "${commontargets}" ] ; then
+                                               mkdir ${targetsubdir}
+                                       else
+                                               if [ ! -d T-independent ] ; then
+                                                       mkdir T-independent
+                                               fi
+
+                                               ${symbolic_link} T-independent ${targetsubdir}
+                                       fi # if target independent
+                               fi # if no target dir yet
+
                                cd ${targetsubdir}
 
-                               srcdir=../..
+                               if [ -z "${srcdir}" ] ; then
+                                       srcdir=../..
+                               fi
                        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."
+                               if [ -n "`(ls .) 2>&1 | (grep H- ; true)`" ] ; then
+                                       echo '***' "Configured subdirs exist.  `pwd` not configured." 1>&2
                                        exit 1
+                               else
+                                       true
                                fi
                        fi
 
@@ -332,12 +372,12 @@ for host in ${hosts} ; do
 
                        if [ -n "${srctrigger}" -a ! -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
+                               echo '***' \(At least ${srctrigger} is missing.\) 1>&2
                                exit 1
                        fi
 
@@ -351,8 +391,8 @@ for host in ${hosts} ; do
                                set ${links}; link=$1; shift; links=$*
 
                                if [ ! -r ${srcdir}/${file} ] ; then
-                                       echo "${progname}: cannot create a link \"${link}\"," 1>&2
-                                       echo "since the file \"${file}\" does not exist." 1>&2
+                                       echo '***' "${progname}: cannot create a link \"${link}\"," 1>&2
+                                       echo '***' "since the file \"${file}\" does not exist." 1>&2
                                        exit 1
                                fi
 
@@ -362,10 +402,13 @@ for host in ${hosts} ; do
                                ${symbolic_link} ${srcdir}/${file} ${link} 2>/dev/null || ${hard_link} ${srcdir}/${file} ${link}
 
                                if [ ! -r ${link} ] ; then
-                                       echo "${progname}: unable to link \"${link}\" to \"${srcdir}/${file}\"." 1>&2
+                                       echo '***' "${progname}: unable to link \"${link}\" to \"${srcdir}/${file}\"." 1>&2
                                        exit 1
                                fi
-                               echo "Linked \"${link}\" to \"${srcdir}/${file}\"."
+
+                               if [ -n "${verbose}" ] ; then
+                                       echo "Linked \"${link}\" to \"${srcdir}/${file}\"."
+                               fi
                        done
 
                        # Create a .gdbinit file which runs the one in srcdir
@@ -391,210 +434,243 @@ 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 "CROSS=-DCROSS_COMPILE" > ${Makefile}
+                               echo "ALL=start.encap" >> ${Makefile}
                        else
-                               echo "ALL=all.internal" > Makefile
+                               echo "ALL=all.internal" > ${Makefile}
                        fi
 
                        # set target, host, VPATH
-                       echo "host = ${host}" >> Makefile
-                       echo "target = ${target}" >> Makefile
-
-                       if [ -n "${forcesubdirs}" ] ; then
-                               echo "subdir = /${hostsubdir}/${targetsubdir}" >> 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 "target_alias = ${target_alias}" >> ${Makefile}
+                       echo "target_cpu = ${target_cpu}" >> ${Makefile}
+                       echo "target_vendor = ${target_vendor}" >> ${Makefile}
+                       echo "target_os = ${target_os}" >> ${Makefile}
+
+                       if [ -n "${subdirs}" ] ; then
+                               (echo "subdir = /${hostsubdir}/${targetsubdir}" ;
+                                       echo "unsubdir = ../..") >> ${Makefile}
                        else
-                               echo "subdir =" >> Makefile
+                               (echo "subdir =" ;
+                                       echo "unsubdir = .") >> ${Makefile}
                        fi
 
-               #       echo "workdir = `pwd`" >> Makefile
-                       echo "VPATH = ${srcdir}" >> Makefile
-
-                       # add Makefile.in
-                       cat ${srcdir}/Makefile.in >> Makefile
+               #       echo "workdir = `pwd`" >> ${Makefile}
+                       echo "VPATH = ${srcdir}" >> ${Makefile}
 
-                       # and shake thoroughly.
-                       host_var_file=hmake-${host}
-                       target_var_file=tmake-${target}
+                       # add "Makefile.in" (or whatever it's called)
+                       cat ${srcdir}/${Makefile_in} >> ${Makefile}
 
                        # Conditionalize the makefile for this host.
-                       if [ -f ${srcdir}/config/${host_var_file} ] ; then
-                               sed -e "/^####/  r ${srcdir}/config/${host_var_file}" Makefile > Makefile.tem
-                               mv Makefile.tem Makefile
+                       if [ -f ${srcdir}/${host_makefile_frag} ] ; then
+                               (echo "host_makefile_frag = ${srcdir}/${host_makefile_frag}" ; 
+                                       sed -e "/^####/  r ${srcdir}/${host_makefile_frag}" ${Makefile}) > Makefile.tem
+                               mv Makefile.tem ${Makefile}
                        fi
 
                        # Conditionalize the makefile for this target.
-                       if [ -f ${srcdir}/config/${target_var_file} ] ; then
-                               sed -e "/^####/  r ${srcdir}/config/${target_var_file}" Makefile > Makefile.tem
-                               mv Makefile.tem Makefile
+                       if [ -f ${srcdir}/${target_makefile_frag} ] ; then
+                               (echo "target_makefile_frag = ${srcdir}/${target_makefile_frag}" ; 
+                                       sed -e "/^####/  r ${srcdir}/${target_makefile_frag}" ${Makefile}) > Makefile.tem
+                               mv Makefile.tem ${Makefile}
+                       fi
+
+                       # Conditionalize the makefile for this site.
+                       if [ -n "${site}" ] ; then
+                               site_makefile_frag=smake-${site}
+
+                               if [ -f ${srcdir}/${site_makefile_frag} ] ; then
+                                       (echo "site_makefile_frag = ${srcdir}/${site_makefile_frag}" ; 
+                                               sed -e "/^####/  r ${srcdir}/${site_makefile_frag}" ${Makefile}) > Makefile.tem
+                                       mv Makefile.tem ${Makefile}
+                               fi
                        fi
 
                        # set srcdir
-                       sed "s@^srcdir = \.@srcdir = ${srcdir}@" Makefile > Makefile.tem
-                       mv Makefile.tem Makefile
+                       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
+                               sed "s:^destdir =.*$:destdir = ${destdir}:" ${Makefile} > Makefile.tem
+                               mv Makefile.tem ${Makefile}
                        fi
 
-                       # Remove all formfeeds, since some Makes get confused by them.
-                       sed "s/\f//" Makefile >> Makefile.tem
-                       mv Makefile.tem Makefile
-
                        # reset SUBDIRS
-                       sed "s:^SUBDIRS =.*$:SUBDIRS = ${configdirs}:" Makefile > Makefile.tem
-                       mv Makefile.tem Makefile
+                       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
+                       sed "s:^NONSUBDIRS =.*$:NONSUBDIRS = ${noconfigdirs}:" ${Makefile} > Makefile.tem
+                       mv Makefile.tem ${Makefile}
+
+                       # remove any form feeds.
+                       sed -e "s/\f//" ${Makefile} > Makefile.tem
+                       mv Makefile.tem ${Makefile}
 
                        using=
-                       if [ -f ${srcdir}/config/${host_var_file} ] ; then
-                               using=" using \"${host_var_file}\""
+                       if [ -f ${srcdir}/${host_makefile_frag} ] ; then
+                               using=" using \"${host_makefile_frag}\""
                        fi
 
-                       if [ -f ${srcdir}/config/${target_var_file} ] ; then
+                       if [ -f ${srcdir}/${target_makefile_frag} ] ; then
                                if [ -z "${using}" ] ; then
-                                       andusing=" using \"${target_var_file}\""
+                                       andusing=" using \"${target_makefile_frag}\""
                                else
-                                       andusing="${using} and \"${target_var_file}\""
+                                       andusing="${using} and \"${target_makefile_frag}\""
                                fi
                        else
                                andusing=${using}
                        fi
 
-                       echo "Created \"Makefile\"" in `pwd`${andusing}.
-
-                       if [ "${host}" = "${target}" ] ; then
-                               echo "Links are now set up for use with a ${target}." \
-                                       > config.status
-               #                       | tee ${srcdir}/config.status
+                       if [ -f ${srcdir}/${site_makefile_frag} ] ; then
+                               if [ -z "${andusing}" ] ; then
+                                       andandusing=" using \"${site_makefile_frag}\""
+                               else
+                                       andandusing="${andusing} and \"${site_makefile_frag}\""
+                               fi
                        else
-                               echo "Links are now set up for host ${host} and target ${target}." \
-                                       > config.status
-               #                       | tee ${srcdir}/config.status
+                               andandusing=${andusing}
+                       fi
+
+                       if [ -n "${verbose}" -o -z "${recurring}" ] ; then
+                               echo "Created \"${Makefile}\"" in `pwd`${andandusing}.
                        fi
 
+                       if [ -f ${TMPDIR}/configure.$$.pos ] ; then
+                               . ${TMPDIR}/configure.$$.pos
+                       fi
+
+                       # describe the chosen configuration in config.status.
+                       # Make that file a shellscript which will reestablish
+                       # the same configuration.  Used in Makefiles to rebuild
+                       # Makefiles.
+
+                       echo "#!/bin/sh
+# `pwd` was configured as follows:
+(cd ${srcdir} ; ${progname}" ${arguments} `if [ -z "${norecursion}" ] ; then echo +norecursion ; else true ; fi` ")" > config.status
+                       chmod a+x config.status
+
                        originaldir=`pwd`
                        cd ${srcdir}
                fi
+
+               # If there are subdirectories, then recurse. 
+               if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then 
+                       for configdir in ${configdirs} ; do
+                               if [ -n "${verbose}" ] ; then
+                                       echo Configuring ${configdir}...
+                               fi
+
+                               if [ -d ${configdir} ] ; then
+                                       if [ -n "${objdir}" ] ; then
+                                               if [ ! -d ${objdir}/${configdir} ] ; then
+                                                       mkdir ${objdir}/${configdir}
+                                               fi
+                                       fi
+
+                                       POPDIR=`pwd`
+                                       cd ${configdir} 
+
+                                       ${progname} +recurring ${host_alias} +target=${target_alias} \
+                                               ${verbose} ${subdirs} ${removing} +destdir=${destdir} \
+                                               `if [ -n "${objdir}" ] ; then echo +objdir=${objdir}/${configdir} ; fi` \
+                                               ${tmpdiroption}
+
+                                       cd ${POPDIR}
+
+#                                      (cd ${configdir} ;
+#                                              if (${progname} +recurring ${host_alias} +target=${target_alias} \
+#                                                      ${verbose} ${subdirs} ${removing} +destdir=${destdir} \
+#                                                      `if [ -n "${objdir}" ] ; then echo +objdir=${objdir}/${configdir} ; fi` \
+#                                                      ${tmpdiroption}) ; then true ; else exit 1 ; fi) \
+#                                              | sed 's/^/     /'
+                               else
+                                       if [ -n "${verbose}" ] ; then
+                                               echo Warning: directory \"${configdir}\" is missing.
+                                       fi
+                               fi
+                       done
+               fi
        done # for each target
 
-#      # Now build a Makefile for this host.
-#      if [ -n "${forcesubdirs}" ] ; then
-#              cd ${hostsubdir}
-#              cat > GNUmakefile << E!O!F
-## Makefile generated by configure for host ${host}.
-#
-#%:
-#      for i in ${targets} ; do \
-#              $(MAKE) -C Target-\$i \$@
-#
-#all clean stage1 stage2 stage3 stage4etags tags TAGS
-#E!O!F
-#      fi
-done # for each host
+       # Now build a Makefile for this host.
+       if [ -n "${subdirs}" -a ! -n "${removing}" ] ; then
+               push=`pwd`
 
-# If there are subdirectories, then recurse. 
+               if [ -n "${objdir}" ] ; then
+                       cd ${objdir}
+               fi
 
-if [ -n "${norecurse}" -o -z "${configdirs}" ] ; then exit 0 ; fi
+               cd ${hostsubdir}
+               cat > GNUmakefile << E!O!F
+# Makefile generated by configure for host ${host_alias}.
 
-# configdirs is not null
-for configdir in ${configdirs} ; do
-       echo Configuring ${configdir}...
-       specifics=
-       commons=
+ALL := $(shell ls -d T-*)
 
-       if [ -n "${defaulttargets}" ] ; then
-               for host in ${hosts} ; do
-                       if [ -d ${configdir}.${host} ] ; then
-                               newspecifics="${specifics} ${host}"
-                               specifics=${newspecifics}
-                       else
-                               newcommons="${commons} ${host}"
-                               commons=${newcommons}
-                       fi # if target specific
-               done # for each host
-
-               if [ -n "${commons}" ] ; then
-                       (cd ${configdir} ;
-                               ./configure ${commons} ${verbose} ${forcesubdirs} ${removing}) \
-                               | sed 's/^/     /'
-               fi # if any common hosts
-
-               if [ -n "${specifics}" ] ; then
-                       for host in ${specifics} ; do
-                               echo Configuring target specific directory ${configdir}.${host}...
-                               (cd ${configdir}.${host} ;
-                                       ./configure ${host} ${verbose} ${forcesubdirs} ${removing}) \
-                                       | sed 's/^/     /'
-                       done # for host in specifics
-               fi # if there are any specifics
-       else
+%:
+       $(foreach subdir,$(ALL),$(MAKE) -C $(subdir) \$@ &&) true
 
-               for target in ${targets} ; do
-                       if [ -d ${configdir}.${target} ] ; then
-                               newspecifics="${specifics} ${target}"
-                               specifics=${newspecifics}
-                       else
-                               newcommons="${commons} +target=${target}"
-                               commons=${newcommons}
-                       fi
+all:
+E!O!F
+               cd ${push}
+       fi
+done # for each host
 
-               done # check for target specific dir override
-
-               if [ -n "${verbose}" ] ; then
-                       echo "  "commons=\"${commons}\"
-                       echo "  "specifics=\"${specifics}\"
-               fi # if verbose
-
-               if [ -n "${commons}" ] ; then
-                       (cd ${configdir} ;
-                               ./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} ${commons}) \
-                               | sed 's/^/     /'
-               fi # if any commons
-
-               if [ -n "${specifics}" ] ; then
-                       for target in ${specifics} ; do
-                               echo Configuring target specific directory ${configdir}.${target}...
-                               (cd ${configdir}.${target} ;
-                                       ./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} "+target=${target}") \
-                                       | sed 's/^/     /'
-                       done
-               fi # if any specifics
-       fi # not default targets
-done
+### clean up.
+
+rm -f ${TMPDIR}/configure.$$.com ${TMPDIR}/configure.$$.tgt ${TMPDIR}/configure.$$.hst ${TMPDIR}/configure.$$.pos
 
 exit 0
 
+#
 #
 # $Log$
-# Revision 1.10  1991/05/03 19:14:21  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.55  1991/10/10 04:57:23  rich
+# * Die when sub-configure's do.
+# * get the makefile building message line correct.
+# * set -e
+#
+# Revision 1.54  1991/10/10  01:04:42  rich
+# Backed out the "/bin/sh config.sub" change.  Fails when config.sub was
+# on PATH.
+#
+# Revision 1.53  1991/10/10  00:38:08  rich
+# Call config.sub as "/bin/sh config.sub" instead of directly.  This
+# protects us from the case where config.sub isn't executable.
+#
+# Revision 1.52  1991/10/09  00:48:26  rich
+# Another patch from jim.
+#
+# Revision 1.51  1991/10/08  06:07:58  wilson
+# Fix bug in smake- file code.
+#
+# Revision 1.50  1991/10/04  23:49:37  rich
+# Per's patch for my config.sub botch.
 #
-# Revision 1.8  1991/04/24  16:50:59  rich
-# Three staging checkpoint.
+# Revision 1.49  1991/10/04  22:52:09  rich
+# Use john's heuristic for finding ourselves.  kinda like hare krishna.
 #
-# Revision 1.7  1991/04/17  01:34:47  rich
-# Added getopt for binutils, fixed problem with host dependancies in
-# configure.template.
+# Revision 1.48  1991/10/02  13:17:28  rich
+# take out the set -e for now
 #
-# Revision 1.6  1991/04/16  00:18:44  rich
-# Now handles multiple hosts and targets.
+# Revision 1.47  1991/10/02  10:02:23  rich
+# * temporary files in TMPDIR
+# * +objdir
 #
-# Revision 1.5  1991/04/15  23:43:44  rich
-# Now handles multiple hosts and targets.
+# Revision 1.46  1991/10/02  06:29:53  rich
+# Added +site=foo option for naming site specific Makefile fragments.
 #
-# Revision 1.4  1991/04/13  02:11:03  rich
-# Config cut 3.  We now almost install a29k.
+# Revision 1.45  1991/10/02  06:15:13  rich
+# Removed +f option.  Used to stand for +forcesubdirs which is now
+# called +subdirs.
 #
-# Revision 1.3  1991/04/11  02:41:54  rich
-# Cut 2 config.  Subdirs.
+# Revision 1.44  1991/10/02  06:02:35  rich
+# Added rcs log line.
 #
 #
 #
@@ -605,4 +681,4 @@ exit 0
 # End:
 #
 
-# end of configure.template
+# end of configure
This page took 0.035085 seconds and 4 git commands to generate.