Merge in irix support.

[binutils.git] / bfd / configure

diff --git a/bfd/configure b/bfd/configure
index a919a12762d79c04d100d3857cf78ecd3a095570..9aa01f94436d11f3bee41bf4f25e59d0061344b6 100755 (executable)
--- a/bfd/configure
+++ b/bfd/configure
@@ -55,11 +55,13 @@ hostsubdir=
 Makefile=Makefile
 Makefile_in=Makefile.in
 norecurse=
 Makefile=Makefile
 Makefile_in=Makefile.in
 norecurse=

+recursing=

 removing=
 srcdir=
 srctrigger=
 target=
 targets=
 removing=
 srcdir=
 srctrigger=
 target=
 targets=

+commontargets=

 targetsubdir=
 template=
 verbose=
 targetsubdir=
 template=
 verbose=


@@ -67,51 +69,54 @@ verbose=
 for arg in $*;
 do
        case ${arg} in
 for arg in $*;
 do
        case ${arg} in

-       -ansi | +ansi)
+       -ansi | +a*)

                ansi=true
                ansi=true

+               clib=clib

                ;;
        -destdir=* | +destdir=* | +destdi=* | +destd=* | +dest=* | +des=* | +de=* | +d=*)
                destdir=`echo ${arg} | sed 's/[+-]d[a-z]*=//'`
                ;;
                ;;
        -destdir=* | +destdir=* | +destdi=* | +destd=* | +dest=* | +des=* | +de=* | +d=*)
                destdir=`echo ${arg} | sed 's/[+-]d[a-z]*=//'`
                ;;

-       -forcesubdirs | +forcesubdirs | +forcesubdir | +forcesubdi | +forcesubd \
-       | +forcesub | +forcesu | +forces | +force | +forc | +for | +fo | +f)
-               forcesubdirs=${arg}
-               ;;

        -languages=* | +languages=* | +language=* | +languag=* \
                | +langua=* | +langu=* | +lang=* | +lan=* | +la=* \
                | +l=*)
                languages="${languages} `echo ${arg} | sed 's/[+-]l[a-z]*=//'`"
                ;;
        -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
                ;;
                gas=yes
                ;;

-       -help | +h | +help)
+       -help | +h*)

                fatal=true
                ;;
                fatal=true
                ;;

-       -nfp | +nfp | +nf | +n)
+       -nfp | +nf*)

                nfp=yes
                ;;
                nfp=yes
                ;;

-       -norecurse | +norecurse)
+       -norecurse | +no*)

                norecurse=true
                ;;
                norecurse=true
                ;;

-       -rm | +rm)
+       -recursing)
+               recursing=true
+               ;;
+       -rm | +r*)

                removing=${arg}
                ;;
 #      -srcdir=* | +srcdir=* | +srcdi=* | +srcd=* | +src=* | +sr=* | +s=*)
 #              srcdir=`echo ${arg} | sed 's/[+-]s[a-z]*=//'`
 #              ;;
                removing=${arg}
                ;;
 #      -srcdir=* | +srcdir=* | +srcdi=* | +srcd=* | +src=* | +sr=* | +s=*)
 #              srcdir=`echo ${arg} | sed 's/[+-]s[a-z]*=//'`
 #              ;;

-       -target=* | +target=* | +targe=* | +targ=* | +tar=* | +ta=* | +t=*)
+       -subdirs | +f* | +su*)
+               subdirs=${arg}
+               ;;
+       -target=* | +target=* | +targe=* | +targ=* | +tar=* | +ta=*)

                if [ -n "${targets}" ] ; then
                if [ -n "${targets}" ] ; then

-                       forcesubdirs="+forcesubdirs"
+                       subdirs="+subdirs"

                fi
 
                newtargets="${targets} `echo ${arg} | sed 's/[+-]t[a-z]*=//'`"
                targets="${newtargets}"
                ;;
                fi
 
                newtargets="${targets} `echo ${arg} | sed 's/[+-]t[a-z]*=//'`"
                targets="${newtargets}"
                ;;

-       -template=* | +template=*)
+       -template=* | +template=* | +templat=* | +templa=* | +templ=* | +temp=* | +tem=* | +te=*)

                template=`echo ${arg} | sed 's/[+-]template=//'`
                ;;
                template=`echo ${arg} | sed 's/[+-]template=//'`
                ;;

-       +verbose | +verbos | +verbo | +verb | +ver | +ve | +v)
+       -v | -verbose | +v*)

                verbose=${arg}
                ;;
        -* | +*)
                verbose=${arg}
                ;;
        -* | +*)


@@ -122,7 +127,7 @@ do
                ;;
        *)
                if [ -n "${hosts}" ] ; then
                ;;
        *)
                if [ -n "${hosts}" ] ; then

-                       forcesubdirs="+forcesubdirs"
+                       subdirs="+subdirs"

                fi
 
                newhosts="${hosts} ${arg}"
                fi
 
                newhosts="${hosts} ${arg}"


@@ -133,7 +138,6 @@ done
 
 if [ -n "${verbose}" ] ; then
        echo `pwd`/configure $*
 
 if [ -n "${verbose}" ] ; then
        echo `pwd`/configure $*

-       echo targets=\"${targets}\"

 fi
 
 # process host and target only if not rebuilding configure itself or removing.
 fi
 
 # process host and target only if not rebuilding configure itself or removing.


@@ -142,7 +146,7 @@ if [ -z "${template}" -a -z "${removing}" -a -z "${fatal}" ] ; then
        if [ -z "${hosts}" ] ; then
                (echo ;
                echo "configure: No HOST specified." ;
        if [ -z "${hosts}" ] ; then
                (echo ;
                echo "configure: No HOST specified." ;

-               echo) 2>&1
+               echo) 1>&2

                fatal=true
        fi
 fi
                fatal=true
        fi
 fi


@@ -153,7 +157,7 @@ if [ -n "${fatal}" -o "${hosts}" = "help" ] ; then
        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 "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 " +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 " +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]" ;


@@ -164,7 +168,7 @@ if [ -n "${fatal}" -o "${hosts}" = "help" ] ; then
        echo " +template=TEM    rebuild configure using TEM. [normal config]" ;
        echo ;
        echo "Where HOST and TARGET are something like \"vax\", \"sun3\", \"encore\", etc." ;
        echo " +template=TEM    rebuild configure using TEM. [normal config]" ;
        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
        echo "options given will apply to all targets.") 1>&2
 
        if [ -r config.status ] ; then


@@ -188,7 +192,7 @@ srcname="bfd"
 # are we rebuilding config itself?
 if [ -n "${template}" ] ; then
        if [ ! -r ${template} ] ; then
 # are we rebuilding config itself?
 if [ -n "${template}" ] ; then
        if [ ! -r ${template} ] ; then

-               echo "Can't find template ${template}."
+               echo '***' "Can't find template ${template}." 1>&2

                exit 1
        fi
 
                exit 1
        fi
 


@@ -209,12 +213,12 @@ if [ -n "${template}" ] ; then
 
        if [ -r configure.in ] ; then
                if [ -z "`grep '^# per\-host:' configure.in`" ] ; then
 
        if [ -r configure.in ] ; then
                if [ -z "`grep '^# per\-host:' configure.in`" ] ; then

-                       echo `pwd`/configure.in has no "per-host:" line.
+                       echo '***' `pwd`/configure.in has no "per-host:" line. 1>&2

                        exit 1
                fi
 
                if [ -z "`grep '^# per\-target:' configure.in`" ] ; then
                        exit 1
                fi
 
                if [ -z "`grep '^# per\-target:' configure.in`" ] ; then

-                       echo `pwd`/configure.in has no "per-target:" line.
+                       echo '***' `pwd`/configure.in has no "per-target:" line. 1>&2

                        exit 1
                fi
 
                        exit 1
                fi
 


@@ -247,7 +251,21 @@ if [ -n "${template}" ] ; then
        rm template.new
 #      mv configure configure.old
        mv configure.new configure
        rm template.new
 #      mv configure configure.old
        mv configure.new configure

-       echo Rebuilt configure in `pwd`
+
+       if [ -n "${verbose}" ] ; then
+               echo Rebuilt configure in `pwd`
+       fi
+
+       # Now update config.sub from the template directory.
+       if echo "$template" | grep -s 'configure$' ; then
+               cp `echo "$template" | sed s/configure$/config.sub/` ./config.sub.new
+       #       mv config.sub config.sub.old
+               mv config.sub.new config.sub
+
+               if [ -n "${verbose}" ] ; then
+                       echo Rebuilt config.sub in `pwd`
+               fi
+       fi

 
        if [ -z "${norecurse}" ] ; then
                # If template is relative path, make it absolute for recursing.
 
        if [ -z "${norecurse}" ] ; then
                # If template is relative path, make it absolute for recursing.


@@ -273,10 +291,12 @@ if [ -n "${template}" ] ; then
                                                (cd $i ;
                                                        ./configure +template=${template} ${verbose})
                                        else
                                                (cd $i ;
                                                        ./configure +template=${template} ${verbose})
                                        else

-                                               echo No configure script in `pwd`/$i
+                                               echo Warning: No configure script in `pwd`/$i

                                        fi
                                else
                                        fi
                                else

-                                       echo Warning: directory $i is missing.
+                                       if [ -n "${verbose}" ] ; then
+                                         echo Warning: directory $i is missing.
+                                       fi

                                fi
                        done
                done
                                fi
                        done
                done


@@ -287,7 +307,7 @@ fi
 
 # some sanity checks on configure.in
 if [ -z "${srctrigger}" ] ; then
 
 # some sanity checks on configure.in
 if [ -z "${srctrigger}" ] ; then

-       echo srctrigger not set in configure.in. `pwd` not configured.
+       echo Warning: srctrigger not set in configure.in. `pwd` not configured.

        exit 1
 fi
 
        exit 1
 fi
 


@@ -298,23 +318,139 @@ for host in ${hosts} ; do
                defaulttargets=true
        fi
 
                defaulttargets=true
        fi
 

+       result=`/bin/sh ./config.sub ${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/hmake-${host}
 
 #### configure.in per-host parts come in here.
 

-## end of per-host part.
+if [ "${host_os}" = "posix" ] ; then
+       bfd_host=posix
+else
+       case "${host_cpu}" in
+       rs6000) bfd_host=aix ;;
+       mips)
+               case "${host_vendor}" in
+               dec)    bfd_host=dec3100 ;;
+               esac
+               ;;
+       m88k)
+               case "${host_vendor}" in
+               *)
+                       case "${host_os}" in
+                       dgux)   bfd_host=dgux ;;
+                       esac
+                       ;;
+               esac
+               ;;

 
 

+       m68k)
+               case "${host_vendor}" in
+               hp)     
+                       case "${host_os}" in
+                       hpux)   bfd_host=hp9000 ;;
+                       bsd)    bfd_host=hp300bsd ;;
+                       esac
+                       ;;
+               sony)   bfd_host=news ;;
+               sun)    bfd_host=sun3 ;;
+               esac
+               ;;

 
 

-       for target in ${targets} ; do
+       i386)
+               case "${host_vendor}" in
+               *)
+                       case "${host_os}" in
+                       sysv)   bfd_host=i386v ;;
+                       esac
+                       ;;
+               esac
+               ;;

 
 

-               if [ -n "${verbose}" ] ; then
-                       echo "  target=\"${target}\""
-               fi
+       sparc)
+               case "${host_vendor}" in
+               sun)    bfd_host=sun4 ;;
+               esac
+               ;;
+
+       rtpc)   bfd_host=rtbsd ;;
+       tahoe | vax)    bfd_host=${host_cpu} ;;
+       esac
+fi
+
+if [ ! -f config/hmake-${bfd_host} ] ; then
+       echo '***' BFD does not support host ${host}: no file config/hmake-${bfd_host}
+       exit 1
+fi
+
+host_makefile_frag=config/hmake-${bfd_host}
+
+## end of per-host part.

 
 

+       for target in ${targets} ; do
+
+               result=`/bin/sh ./config.sub ${target}`
+               target_cpu=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
+               target_vendor=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
+               target_os=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
+               target=${target_cpu}-${target_vendor}-${target_os}

                target_makefile_frag=config/tmake-${target}
 
 #### configure.in per-target parts come in here.
 
                target_makefile_frag=config/tmake-${target}
 
 #### configure.in per-target parts come in here.
 

+case "${target_vendor}" in
+aout | coff | bout) bfd_target=${target_cpu}-${target_vendor} ;;
+sony)  bfd_target=news ;;
+intel) bfd_target=${target_cpu}-coff ;;        
+wrs)
+       case "${target_cpu}" in
+       i960) bfd_target=i960-bout ;;
+       m68k) bfd_target=m68k-aout ;;
+       esac
+       ;;
+sun)
+       case "${target_cpu}" in
+       m68k)   bfd_target=m68k-aout ;;
+       sparc)  bfd_target=sparc-aout ;;
+       esac
+       ;;
+dec)
+       case "${target_cpu}" in
+       mips) bfd_target=dec3100 ;;
+       esac
+       ;;
+hp)
+       case "${target_cpu}" in
+       m68k)
+               case "${target_os}" in
+               hpux)   bfd_target=hp9000 ;;
+               bsd)    bfd_target=hp300bsd ;;
+               esac
+               ;;
+       esac
+       ;;
+none)
+       case "${target_cpu}" in
+       i386) bfd_target=i386-coff ;;
+       esac
+       ;;
+*)
+       case "${target_cpu}" in
+       tahoe | vax) bfd_target=${target_cpu} ;;
+       esac
+       ;;
+esac
+
+if [ ! -f config/tmake-${bfd_target} ] ; then
+       echo '***' BFD does not support target ${target}: no file config/tmake-${bfd_target}
+       exit 1
+fi
+
+target_makefile_fragment=config/tmake-${bfd_target}
+

 files=
 links=
 ## end of per-target part.
 files=
 links=
 ## end of per-target part.


@@ -324,11 +460,11 @@ links=
                targetsubdir=Target-${target}
 
                if [ -n "${removing}" ] ; then
                targetsubdir=Target-${target}
 
                if [ -n "${removing}" ] ; then

-                       if [ -n "${forcesubdirs}" ] ; then
+                       if [ -n "${subdirs}" ] ; then

                                if [ -d "${hostsubdir}" ] ; then
                                        rm -rf ${hostsubdir}/${targetsubdir}
 
                                if [ -d "${hostsubdir}" ] ; then
                                        rm -rf ${hostsubdir}/${targetsubdir}
 

-                                       if [ -z "`(ls ${hostsubdir}) 2>&1 | grep Target-`" ] ; then
+                                       if [ -z "`(ls ${hostsubdir}) 2>&1 | grep Target- | grep -v Target-independent`" ] ; then

                                                rm -rf ${hostsubdir}
                                        fi
                                else
                                                rm -rf ${hostsubdir}
                                        fi
                                else


@@ -338,24 +474,35 @@ links=
                                rm -f ${Makefile} config.status ${links}
                        fi
                else
                                rm -f ${Makefile} config.status ${links}
                        fi
                else

-                       if [ -n "${forcesubdirs}" ] ; then
+                       if [ -n "${subdirs}" ] ; then

                                # check for existing status before allowing forced subdirs.
                                if [ -f ${Makefile} ] ; then
                                # check for existing status before allowing forced subdirs.
                                if [ -f ${Makefile} ] ; then

-                                       echo "${Makefile} already exists in source directory.  `pwd` not configured."
+                                       echo '***' "${Makefile} already exists in source directory.  `pwd` not configured." 1>&2

                                        exit 1
                                fi
 
                                if [ ! -d ${hostsubdir} ] ; then mkdir ${hostsubdir} ; fi
                                cd ${hostsubdir}
 
                                        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 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
                                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."
+                                       echo '***' "Configured subdirs exist.  `pwd` not configured." 1>&2

                                        exit 1
                                fi
                        fi
                                        exit 1
                                fi
                        fi


@@ -371,12 +518,12 @@ links=
 
                        if [ -n "${srctrigger}" -a ! -r ${srcdir}/${srctrigger} ] ; then
                                if [ -z "${srcdirdefaulted}" ] ; then
 
                        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
                                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
 
                                fi
 

-                               echo \(At least ${srctrigger} is missing.\) 1>&2
+                               echo '***' \(At least ${srctrigger} is missing.\) 1>&2

                                exit 1
                        fi
 
                                exit 1
                        fi
 


@@ -390,8 +537,8 @@ links=
                                set ${links}; link=$1; shift; links=$*
 
                                if [ ! -r ${srcdir}/${file} ] ; then
                                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
 
                                        exit 1
                                fi
 


@@ -401,10 +548,13 @@ links=
                                ${symbolic_link} ${srcdir}/${file} ${link} 2>/dev/null || ${hard_link} ${srcdir}/${file} ${link}
 
                                if [ ! -r ${link} ] ; then
                                ${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
                                        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
                        done
 
                        # Create a .gdbinit file which runs the one in srcdir


@@ -440,7 +590,7 @@ links=
                        echo "host = ${host}" >> ${Makefile}
                        echo "target = ${target}" >> ${Makefile}
 
                        echo "host = ${host}" >> ${Makefile}
                        echo "target = ${target}" >> ${Makefile}
 

-                       if [ -n "${forcesubdirs}" ] ; then
+                       if [ -n "${subdirs}" ] ; then

                                echo "subdir = /${hostsubdir}/${targetsubdir}" >> ${Makefile}
                        else
                                echo "subdir =" >> ${Makefile}
                                echo "subdir = /${hostsubdir}/${targetsubdir}" >> ${Makefile}
                        else
                                echo "subdir =" >> ${Makefile}


@@ -497,7 +647,9 @@ links=
                                andusing=${using}
                        fi
 
                                andusing=${using}
                        fi
 

-                       echo "Created \"${Makefile}\"" in `pwd`${andusing}.
+                       if [ -n "${verbose}" -o -z "${recursing}" ] ; then
+                               echo "Created \"${Makefile}\"" in `pwd`${andusing}.
+                       fi

 
 #### configure.in post-target parts come in here.
 
 
 #### configure.in post-target parts come in here.
 


@@ -516,10 +668,30 @@ links=
                        originaldir=`pwd`
                        cd ${srcdir}
                fi
                        originaldir=`pwd`
                        cd ${srcdir}
                fi

+
+               # If there are subdirectories, then recurse. 
+               if [ -z "${norecurse}" -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.
+                                       fi
+                               fi
+                       done
+               fi

        done # for each target
 
        # Now build a Makefile for this host.
        done # for each target
 
        # Now build a Makefile for this host.

-       if [ -n "${forcesubdirs}" -a ! -n "${removing}" ] ; then
+       if [ -n "${subdirs}" -a ! -n "${removing}" ] ; then

                cd ${hostsubdir}
                cat > GNUmakefile << E!O!F
 # Makefile generated by configure for host ${host}.
                cd ${hostsubdir}
                cat > GNUmakefile << E!O!F
 # Makefile generated by configure for host ${host}.


@@ -535,91 +707,39 @@ E!O!F
        fi
 done # for each host
 
        fi
 done # for each host
 

-# If there are subdirectories, then recurse. 
-
-if [ -n "${norecurse}" -o -z "${configdirs}" ] ; then exit 0 ; fi
-
-# configdirs is not null
-for configdir in ${configdirs} ; do
-       echo Configuring ${configdir}...
-       specifics=
-       commons=
-
-       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
-                       if [ -d ${configdir} ] ; then
-                               (cd ${configdir} ;
-                                       ./configure ${commons} ${verbose} ${forcesubdirs} ${removing} +destdir=${destdir}) \
-                                       | sed 's/^/     /'
-                       else
-                               echo Warning: directory \"${configdir}\" is missing.
-                       fi
-               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} +destdir=${destdir}) \
-                                       | sed 's/^/     /'
-                       done # for host in specifics
-               fi # if there are any specifics
-       else
-
-               for target in ${targets} ; do
-                       if [ -d ${configdir}.${target} ] ; then
-                               newspecifics="${specifics} ${target}"
-                               specifics=${newspecifics}
-                       else
-                               newcommons="${commons} +target=${target}"
-                               commons=${newcommons}
-                       fi
-
-               done # check for target specific dir override
-
-               if [ -n "${verbose}" ] ; then
-                       echo "  "commons=\"${commons}\"
-                       echo "  "specifics=\"${specifics}\"
-               fi # if verbose
-
-               if [ -n "${commons}" ] ; then
-                       if [ -d ${configdir} ] ; then
-                               (cd ${configdir} ;
-                                       ./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} \
-                                               ${commons} +destdir=${destdir}) \
-                                       | sed 's/^/     /'
-                       else
-                               echo Warning: directory \"${configdir}\" is missing.
-                       fi
-               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}" +destdir=${destdir}) \
-                                       | sed 's/^/     /'
-                       done
-               fi # if any specifics
-       fi # not default targets
-done
-

 exit 0
 
 #
 # $Log$
 exit 0
 
 #
 # $Log$

-# Revision 1.15  1991/08/06 19:12:11  rich
+# Revision 1.23  1991/08/23 04:48:43  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.
 #
 # Revision 1.22  1991/07/20  01:22:30  rich
 # Host-level GNUmakefiles.
 #
 # Revision 1.22  1991/07/20  01:22:30  rich