* mipsread.c (parse_symbol): In third-eye, a function has a block
[binutils-gdb.git] / configure
index f6448ec095925ec7c0d5e0084b901d2cf97d3164..9dcc2946166b823c774ba1add340551588ad1599 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,7 +1,9 @@
 #!/bin/sh
 
+### WARNING: this file contains embedded tabs.  Do not run untabify on this file.
+
 # Configuration script
-#   Copyright (C) 1988, 1990-1993 Free Software Foundation, Inc.
+#   Copyright (C) 1988, 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
 
 # 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
@@ -86,6 +88,10 @@ undefinedargs=
 version="$Revision$"
 x11=default
 
+### we might need to use some other shell than /bin/sh for running subshells
+#
+config_shell=${CONFIG_SHELL-}
+
 NO_EDIT="This file was generated automatically by configure.  Do not edit."
 
 ## this is a little touchy and won't always work, but...
@@ -109,13 +115,13 @@ case "${progname}" in
         ;;
 esac
 
-for arg in $*;
+for arg in $*
 do
         # handle things that might have args following as separate words
         if [ -n "${next_prefix}" ] ; then prefix=${arg} ; prefixoption="-prefix=${prefix}" ; next_prefix=
         elif [ -n "${next_exec_prefix}" ] ; then
                 exec_prefix=${arg}
-                exec_prefixoption="-exec_prefix=${exec_prefix}"
+                exec_prefixoption="-exec-prefix=${exec_prefix}"
                 next_exec_prefix=
         elif [ -n "${next_site}" ] ; then site=${arg} ; site_option=-site=${site} ; next_site=
         # remove any possible trailing slash from srcdir.  See note below.
@@ -130,8 +136,10 @@ do
                 next_program_suffix=
         elif [ -n "${next_program_transform_name}" ] ; then
                 # Double any backslashes or dollar signs in the argument
-                program_transform_name="${program_transform_name} -e `echo ${arg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`"
-                program_transform_nameoption="${program_transform_nameoption} -program_transform_name='${arg}'"
+               if [ -n "${arg}" ] ; then
+                       program_transform_name="${program_transform_name} -e `echo ${arg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`"
+               fi
+                program_transform_nameoption="${program_transform_nameoption} --program-transform-name='${arg}'"
                 next_program_transform_name=
         elif [ -n "${next_target}" ] ; then
                 next_target=
@@ -144,6 +152,17 @@ do
                         fatal=yes
                         ;;
                 esac
+        elif [ -n "${next_host}" ] ; then
+                next_host=
+                case "${host_alias}" in
+                "")
+                        host_alias="${arg}"
+                        ;;
+                *)
+                        echo '***' Can only configure for one host at a time.  1>&2
+                        fatal=yes
+                        ;;
+                esac
         elif [ -n "${next_tmpdir}" ] ; then
                 next_tmpdir=
                 tmpdiroption="--tmpdir=${arg}"
@@ -175,6 +194,17 @@ do
                                 ;;
                         esac
                         ;;
+                -host=* | --host | --hos | --ho)
+                        case "${host_alias}" in
+                        "")
+                                next_host=yes
+                                ;;
+                        *)
+                                echo '***' Can only configure for one host at a time.  1>&2
+                                fatal=yes
+                                ;;
+                        esac
+                        ;;
                 -nfp | --nf*)
                         floating_point=no
                         ;;
@@ -204,9 +234,12 @@ do
                         next_program_suffix=yes
                         ;;
                 -program_transform_name=* | --program_transform_name=* | --program_transform_nam=* | --program_transform_na=* | --program_transform_n=* | --program_transform_=* | --program_transform=* | --program_transfor=* | --program_transfo=* | --program_transf=* | --program_trans=* | --program_tran=* | --program_tra=* | --program_tr=* | --program_t=* | -program-transform-name=* | --program-transform-name=* | --program-transform-nam=* | --program-transform-na=* | --program-transform-n=* | --program-transform-=* | --program-transform=* | --program-transfor=* | --program-transfo=* | --program-transf=* | --program-trans=* | --program-tran=* | --program-tra=* | --program-tr=* | --program-t=*)
+                       arg=`echo ${arg} | sed -e 's/^[-a-z_]*=//'`
                         # Double any \ or $ in the argument
-                        program_transform_name="${program_transform_name} -e `echo ${arg} | sed -e 's/^[-a-z_]*=//' -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`"
-                        program_transform_nameoption="${program_transform_nameoption} -program_transform_name='`echo ${arg} | sed 's/^[-a-z_]*=//'`'"
+                       if [ -n "${arg}" ] ; then
+                               program_transform_name="${program_transform_name} -e `echo ${arg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`"
+                       fi
+                        program_transform_nameoption="${program_transform_nameoption} --program-transform-name='${arg}'"
                         ;;
                 -program_transform_name | --program_transform_name | --program_transform_nam | --program_transform_na | --program_transform_n | --program_transform_ | --program_transform | --program_transfor | --program_transfo | --program_transf | --program_trans | --program_tran | --program_tra | --program_tr | --program_t | -program-transform-name | --program-transform-name | --program-transform-nam | --program-transform-na | --program-transform-n | --program-transform- | --program-transform | --program-transfor | --program-transfo | --program-transf | --program-trans | --program-tran | --program-tra | --program-tr | --program-t)
                         next_program_transform_name=yes
@@ -261,6 +294,11 @@ do
                         eval $withopt="$withval"
                         withoptions="$withoptions $arg"
                         ;;
+                -without* | --without*)
+                        withopt=`echo ${arg} | sed 's:^-*without:with:;s/-/_/g'`               
+                        eval $withopt=no
+                        withoutoptions="$withoutoptions $arg"
+                        ;;
                 -with* | --with*)
                         withopt=`echo ${arg} | sed 's:^-*with:with:;s/-/_/g'`
                         eval $withopt=yes
@@ -311,15 +349,17 @@ case "${fatal}" in
                 echo '***' Can only configure for one host and one target at a time.  1>&2
                 fatal=yes
         elif [ -z "${host_alias}" -a -z "${undefs}" ] ; then
-                echo '- You did not tell me what kind of host system you want to configure.
-- I will attempt to guess the kind of system this is.' 1>&2
                 guesssys=`echo ${progname} | sed 's/configure$/config.guess/'`
                 if tmp_alias=`${guesssys}` ; then
-                        echo "- Looks like this is a ${tmp_alias}" 1>&2
+                        echo "Configuring for a ${tmp_alias} host." 1>&2
                         host_alias=${tmp_alias}
-                        target_alias=${tmp_alias}
+                       case "${target_alias}" in
+                       "") target_alias=${tmp_alias} ;;
+                       *) ;;
+                       esac
+                       arguments="--host=${host_alias} ${arguments}"
                 else
-                        echo '- Failed to guess the system type.  You need to tell me.' 1>&2
+                        echo 'Config.guess failed to determine the host type.  You need to specify one.' 1>&2
                         fatal=yes
                 fi
         else
@@ -346,24 +386,24 @@ if [ -n "${fatal}" -o "${host_alias}" = "help" ] ; then
         (echo "Usage: configure HOST" ;
         echo ;
         echo "Options: [defaults in brackets]" ;
-        echo " -exec-prefix=MYDIR       configure for installation of host dependent files into MYDIR. [\"/usr/local\"]" ;
-        echo " -gas                     configure the compilers for use with gas. [native as]" ;
-        echo " -help                    print this message. [normal config]" ;
-        echo " -lang=LANG               configure to build LANG. [gcc]" ;
-        echo " -nfp                     configure the compilers default to soft floating point. [hard float]" ;
-        echo " -norecursion             configure this directory only. [recurse]" ;
-        echo " -prefix=MYDIR            configure for installation of host dependent files into MYDIR. [\"/usr/local\"]" ;
-        echo " -program-prefix=FOO      install programs with FOO prepended to their names. [ \"\" ]" ;
-        echo " -program-suffix=FOO      install programs with FOO appended to their names. [ \"\" ]" ;
-        echo " -program-transform-name=FOO      install programs with names transformed by sed pattern FOO. [ \"\" ]" ;
-        echo " -site=SITE               configure with site specific makefile for SITE" ;
-        echo " -srcdir=DIR              find the sources in DIR. [\".\" or \"..\"]" ;
-        echo " -target=TARGET           configure for TARGET.  [TARGET = HOST]" ;
-        echo " -tmpdir=TMPDIR           create temporary files in TMPDIR.  [ TMPDIR = \"/tmp\" ]" ;
+        echo " --prefix=MYDIR            configure for installation of host dependent files into MYDIR. [\"/usr/local\"]" ;
+        echo " --exec-prefix=MYDIR       configure for installation of host dependent files into MYDIR. [\"/usr/local\"]" ;
+        echo " --help                    print this message. [normal config]" ;
+        echo " --norecursion             configure this directory only. [recurse]" ;
+        echo " --program-prefix=FOO      install programs with FOO prepended to their names. [ \"\" ]" ;
+        echo " --program-suffix=FOO      install programs with FOO appended to their names. [ \"\" ]" ;
+        echo " --program-transform-name=FOO      install programs with names transformed by sed pattern FOO. [ \"\" ]" ;
+        echo " --site=SITE               configure with site specific makefile for SITE" ;
+        echo " --srcdir=DIR              find the sources in DIR. [\".\" or \"..\"]" ;
+        echo " --target=TARGET           configure for TARGET.  [TARGET = HOST]" ;
+        echo " --tmpdir=TMPDIR           create temporary files in TMPDIR.  [ TMPDIR = \"/tmp\" ]" ;
+        echo " --nfp                     configure the compilers default to soft floating point. [hard float]" ;
+        echo " --with-FOO, --with-FOO=BAR specify that FOO is available"
+        echo " --without-FOO             specify that FOO is NOT available"
         echo ;
         echo "Where HOST and TARGET are something like \"vax\", \"sun3\", \"encore\", etc." ;
+        echo ;
         ) 1>&2
-
         if [ -r config.status ] ; then
                 cat config.status
         fi
@@ -513,12 +553,14 @@ if [ ! -r ${srcdir}/${srctrigger} ] ; then
         exit 1
 fi
 
-tooldir="\$(libdir)/${target_alias}"
+# Some systems (e.g., one of the i386-aix systems the gas testers are
+# using) don't handle "\$" correctly, so don't use it here.
+tooldir='$(exec_prefix)'/${target_alias}
 
 if [ "${host_alias}" != "${target_alias}" ] ; then
-    if [ "${program_prefix}" = "" ] ; then
-        if [ "${program_suffix}" = "" ] ; then 
-            if [ "${program_transform_name}" = "" ] ; then
+    if [ "${program_prefixoption}" = "" ] ; then
+        if [ "${program_suffixoption}" = "" ] ; then 
+            if [ "${program_transform_nameoption}" = "" ] ; then
                 program_prefix=${target_alias}- ;
             fi
         fi
@@ -639,85 +681,85 @@ EOF
 
         if [ -f ${srcdir}/${subdir}/${Makefile_in} ] ; then
 
-           # Conditionalize for this site from "Makefile.in" (or whatever it's called) into Makefile.tem
-           rm -f ${subdir}/Makefile.tem
-             case "${site}" in
-             "") cp ${srcdir}/${subdir}/${Makefile_in} ${subdir}/Makefile.tem ;;
-             *)
-                     site_makefile_frag=${srcdir}/config/ms-${site}
-
-                     if [ -f ${site_makefile_frag} ] ; then
-                             sed -e "/^####/  r ${site_makefile_frag}" ${srcdir}/${subdir}/${Makefile_in} \
-                                     > ${subdir}/Makefile.tem
-                     else
-                             cp ${srcdir}/${subdir}/${Makefile_in} ${subdir}/Makefile.tem
-                             site_makefile_frag=
-                     fi
-                     ;;
-           esac
-           # working copy now in ${subdir}/Makefile.tem
-
-           # Conditionalize the makefile for this host.
-           rm -f ${Makefile}
-           case "${host_makefile_frag}" in
-             "") mv ${subdir}/Makefile.tem ${Makefile} ;;
-             *)
-                     if [ ! -f ${host_makefile_frag} ] ; then
-                             host_makefile_frag=${srcdir}/${host_makefile_frag}
-                     fi
-                     if [ -f ${host_makefile_frag} ] ; then
-                             sed -e "/^####/  r ${host_makefile_frag}" ${subdir}/Makefile.tem > ${Makefile}
-                     else
-                             echo '***' Expected host makefile fragment \"${host_makefile_frag}\" 1>&2
-                             echo '***' is missing in ${PWD=`pwd`}. 1>&2
-                             mv ${subdir}/Makefile.tem ${Makefile}
-                     fi
-           esac
-           # working copy now in ${Makefile}
-
-           # Conditionalize the makefile for this target.
-           rm -f ${subdir}/Makefile.tem
-           case "${target_makefile_frag}" in
-             "") mv ${Makefile} ${subdir}/Makefile.tem ;;
-             *)
-                     if [ ! -f ${target_makefile_frag} ] ; then
-                             target_makefile_frag=${srcdir}/${target_makefile_frag}
-                     fi
-                     if [ -f ${target_makefile_frag} ] ; then
-                             sed -e "/^####/  r ${target_makefile_frag}" ${Makefile} > ${subdir}/Makefile.tem
-                     else
-                             mv ${Makefile} ${subdir}/Makefile.tem
-                             target_makefile_frag=
-                     fi
-                     ;;
-           esac
-           # real copy now in ${subdir}/Makefile.tem
-
-           # Conditionalize the makefile for this package.
-           rm -f ${Makefile}
-           case "${package_makefile_frag}" in
-             "") mv ${subdir}/Makefile.tem ${Makefile} ;;
-             *)
-                     if [ ! -f ${package_makefile_frag} ] ; then
-                             package_makefile_frag=${srcdir}/${package_makefile_frag}
-                     fi
-                     if [ -f ${package_makefile_frag} ] ; then
-                             sed -e "/^####/  r ${package_makefile_frag}" ${subdir}/Makefile.tem > ${Makefile}
-                     else
-                             echo '***' Expected package makefile fragment \"${package_makefile_frag}\" 1>&2
-                             echo '***' is missing in ${PWD=`pwd`}. 1>&2
-                             mv ${subdir}/Makefile.tem ${Makefile}
-                     fi
-           esac
-           # working copy now in ${Makefile}
-
-           mv ${Makefile} ${subdir}/Makefile.tem
-
-           # real copy now in ${subdir}/Makefile.tem
-
-           # prepend warning about editting, and a bunch of variables.
-           rm -f ${Makefile}
-           cat > ${Makefile} <<EOF
+            # Conditionalize for this site from "Makefile.in" (or whatever it's called) into Makefile.tem
+            rm -f ${subdir}/Makefile.tem
+              case "${site}" in
+              "") cp ${srcdir}/${subdir}/${Makefile_in} ${subdir}/Makefile.tem ;;
+              *)
+                      site_makefile_frag=${srcdir}/config/ms-${site}
+
+                      if [ -f ${site_makefile_frag} ] ; then
+                              sed -e "/^####/  r ${site_makefile_frag}" ${srcdir}/${subdir}/${Makefile_in} \
+                                      > ${subdir}/Makefile.tem
+                      else
+                              cp ${srcdir}/${subdir}/${Makefile_in} ${subdir}/Makefile.tem
+                              site_makefile_frag=
+                      fi
+                      ;;
+            esac
+            # working copy now in ${subdir}/Makefile.tem
+
+            # Conditionalize the makefile for this host.
+            rm -f ${Makefile}
+            case "${host_makefile_frag}" in
+              "") mv ${subdir}/Makefile.tem ${Makefile} ;;
+              *)
+                      if [ ! -f ${host_makefile_frag} ] ; then
+                              host_makefile_frag=${srcdir}/${host_makefile_frag}
+                      fi
+                      if [ -f ${host_makefile_frag} ] ; then
+                              sed -e "/^####/  r ${host_makefile_frag}" ${subdir}/Makefile.tem > ${Makefile}
+                      else
+                              echo '***' Expected host makefile fragment \"${host_makefile_frag}\" 1>&2
+                              echo '***' is missing in ${PWD=`pwd`}. 1>&2
+                              mv ${subdir}/Makefile.tem ${Makefile}
+                      fi
+            esac
+            # working copy now in ${Makefile}
+
+            # Conditionalize the makefile for this target.
+            rm -f ${subdir}/Makefile.tem
+            case "${target_makefile_frag}" in
+              "") mv ${Makefile} ${subdir}/Makefile.tem ;;
+              *)
+                      if [ ! -f ${target_makefile_frag} ] ; then
+                              target_makefile_frag=${srcdir}/${target_makefile_frag}
+                      fi
+                      if [ -f ${target_makefile_frag} ] ; then
+                              sed -e "/^####/  r ${target_makefile_frag}" ${Makefile} > ${subdir}/Makefile.tem
+                      else
+                              mv ${Makefile} ${subdir}/Makefile.tem
+                              target_makefile_frag=
+                      fi
+                      ;;
+            esac
+            # real copy now in ${subdir}/Makefile.tem
+
+            # Conditionalize the makefile for this package.
+            rm -f ${Makefile}
+            case "${package_makefile_frag}" in
+              "") mv ${subdir}/Makefile.tem ${Makefile} ;;
+              *)
+                      if [ ! -f ${package_makefile_frag} ] ; then
+                              package_makefile_frag=${srcdir}/${package_makefile_frag}
+                      fi
+                      if [ -f ${package_makefile_frag} ] ; then
+                              sed -e "/^####/  r ${package_makefile_frag}" ${subdir}/Makefile.tem > ${Makefile}
+                      else
+                              echo '***' Expected package makefile fragment \"${package_makefile_frag}\" 1>&2
+                              echo '***' is missing in ${PWD=`pwd`}. 1>&2
+                              mv ${subdir}/Makefile.tem ${Makefile}
+                      fi
+            esac
+            # working copy now in ${Makefile}
+
+            mv ${Makefile} ${subdir}/Makefile.tem
+
+            # real copy now in ${subdir}/Makefile.tem
+
+            # prepend warning about editting, and a bunch of variables.
+            rm -f ${Makefile}
+            cat > ${Makefile} <<EOF
 # ${NO_EDIT}
 VPATH = ${makesrcdir}
 links = ${configlinks}
@@ -732,64 +774,75 @@ target_vendor = ${target_vendor}
 target_os = ${target_os}
 target_canonical = ${target_cpu}-${target_vendor}-${target_os}
 EOF
-           case "${package_makefile_frag}" in
-             "") ;;
-             /*) echo package_makefile_frag = ${package_makefile_frag} >>${Makefile} ;;
-             *)  echo package_makefile_frag = ${invsubdir}${package_makefile_frag} >>${Makefile} ;;
-           esac
-
-           case "${target_makefile_frag}" in
-             "") ;;
-             /*) echo target_makefile_frag = ${target_makefile_frag} >>${Makefile} ;;
-             *)  echo target_makefile_frag = ${invsubdir}${target_makefile_frag} >>${Makefile} ;;
-           esac
-
-           case "${host_makefile_frag}" in
-             "") ;;
-             /*) echo host_makefile_frag = ${host_makefile_frag} >>${Makefile} ;;
-             *)  echo host_makefile_frag = ${invsubdir}${host_makefile_frag} >>${Makefile} ;;
-           esac
-
-           if [ "${site_makefile_frag}" != "" ] ; then
-               echo site_makefile_frag = ${invsubdir}${site_makefile_frag} >>${Makefile}
-           fi 
-
-           # fixme: this shouldn't be in configure.
-           # Define macro CROSS_COMPILE in compilation if this is a cross-compiler.
-           case "${host_alias}" in
-             "${target_alias}")
-                     echo "ALL=all.internal" >> ${Makefile}
-                     ;;
-             *)
-                     echo "CROSS=-DCROSS_COMPILE" >> ${Makefile}
-                     echo "ALL=all.cross" >> ${Makefile}
-                     ;;
-           esac
-
-           # reset prefix, exec_prefix, srcdir, SUBDIRS, NONSUBDIRS,
-           # remove any form feeds.
-           if [ -z "${subdirs}" ]; then
-               rm -f ${subdir}/Makefile.tem2
-               sed -e "s:^SUBDIRS[         ]*=.*$:SUBDIRS = ${configdirs}:" \
-                   -e "s:^NONSUBDIRS[      ]*=.*$:NONSUBDIRS = ${noconfigdirs}:" \
-                   ${subdir}/Makefile.tem > ${subdir}/Makefile.tem2
-               rm -f ${subdir}/Makefile.tem
-               mv ${subdir}/Makefile.tem2 ${subdir}/Makefile.tem
-           fi
-           sed -e "s:^prefix[      ]*=.*$:prefix = ${prefix}:" \
-                   -e "s:^exec_prefix[     ]*=.*$:exec_prefix = ${exec_prefix}:" \
-                   -e "s:^srcdir[  ]*=.*$:srcdir = ${makesrcdir}:" \
-                   -e "s/\f//" \
-                   -e "s:^program_prefix[  ]*=.*$:program_prefix = ${program_prefix}:" \
-                   -e "s:^program_suffix[  ]*=.*$:program_suffix = ${program_suffix}:" \
-                   -e "s:^program_transform_name[  ]*=.*$:program_transform_name = ${program_transform_name}:" \
-                   -e "s:^tooldir[         ]*=.*$:tooldir = ${tooldir}:" \
-                   ${subdir}/Makefile.tem >> ${Makefile}
-           # final copy now in ${Makefile}
-
-       else
-          echo "No Makefile.in found in ${srcdir}, unable to configure" 1>&2
-       fi
+            case "${package_makefile_frag}" in
+              "") ;;
+              /*) echo package_makefile_frag = ${package_makefile_frag} >>${Makefile} ;;
+              *)  echo package_makefile_frag = ${invsubdir}${package_makefile_frag} >>${Makefile} ;;
+            esac
+
+            case "${target_makefile_frag}" in
+              "") ;;
+              /*) echo target_makefile_frag = ${target_makefile_frag} >>${Makefile} ;;
+              *)  echo target_makefile_frag = ${invsubdir}${target_makefile_frag} >>${Makefile} ;;
+            esac
+
+            case "${host_makefile_frag}" in
+              "") ;;
+              /*) echo host_makefile_frag = ${host_makefile_frag} >>${Makefile} ;;
+              *)  echo host_makefile_frag = ${invsubdir}${host_makefile_frag} >>${Makefile} ;;
+            esac
+
+            if [ "${site_makefile_frag}" != "" ] ; then
+                echo site_makefile_frag = ${invsubdir}${site_makefile_frag} >>${Makefile}
+            fi 
+
+           # make sure that some sort of reasonable default exists for these 
+           # two variables
+           CXX=${CXX-"g++ -O"}
+           CC=${CC-cc}
+
+            # reset prefix, exec_prefix, srcdir, SUBDIRS, NONSUBDIRS,
+            # remove any form feeds.
+            if [ -z "${subdirs}" ]; then
+                rm -f ${subdir}/Makefile.tem2
+                sed -e "s:^SUBDIRS[    ]*=.*$:SUBDIRS = ${configdirs}:" \
+                    -e "s:^NONSUBDIRS[         ]*=.*$:NONSUBDIRS = ${noconfigdirs}:" \
+                    ${subdir}/Makefile.tem > ${subdir}/Makefile.tem2
+                rm -f ${subdir}/Makefile.tem
+                mv ${subdir}/Makefile.tem2 ${subdir}/Makefile.tem
+            fi
+            sed -e "s:^prefix[         ]*=.*$:prefix = ${prefix}:" \
+                    -e "s:^exec_prefix[        ]*=.*$:exec_prefix = ${exec_prefix}:" \
+                   -e "/^CC[   ]*=/{
+                       b chkcc
+                       :contcc
+                       N
+                       :chkcc
+                       s/\\\\$//
+                       t contcc
+                       s/^CC[  ]*=.*$/CC = ${CC}/
+                       }" \
+                   -e "/^CXX[  ]*=/{
+                       b chkcxx
+                       :contcxx
+                       N
+                       :chkcxx
+                       s/\\\\$//
+                       t contcxx
+                       s/^CXX[         ]*=.*$/CXX = ${CXX}/
+                       }" \
+                    -e "s:^srcdir[     ]*=.*$:srcdir = ${makesrcdir}:" \
+                    -e "s/\f//" \
+                    -e "s:^program_prefix[     ]*=.*$:program_prefix = ${program_prefix}:" \
+                    -e "s:^program_suffix[     ]*=.*$:program_suffix = ${program_suffix}:" \
+                    -e "s:^program_transform_name[     ]*=.*$:program_transform_name = ${program_transform_name}:" \
+                    -e "s:^tooldir[    ]*=.*$:tooldir = ${tooldir}:" \
+                    ${subdir}/Makefile.tem >> ${Makefile}
+            # final copy now in ${Makefile}
+
+        else
+           echo "No Makefile.in found in ${srcdir}/${subdir}, unable to configure" 1>&2
+        fi
 
         rm -f ${subdir}/Makefile.tem
 
@@ -888,21 +941,26 @@ if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then
 ### check for guested configure, otherwise fix possibly relative progname
                         if [ -f ${newsrcdir}/configure ] ; then
                                 recprog=${newsrcdir}/configure
-                        else
+                        elif [ -f ${newsrcdir}/configure.in ] ; then
                                 case "${progname}" in
                                 /*)     recprog=${progname} ;;
                                 *)      recprog=../${progname} ;;
                                 esac
+                       else
+                               eval echo No configuration information in ${configdir} ${redirect}
+                               recprog=
                         fi
 
 ### The recursion line is here.
-                        if eval ${recprog} ${verbose} --host=${host_alias} --target=${target_alias} \
-                                ${prefixoption} ${tmpdiroption} ${exec_prefixoption} \
-                                ${srcdiroption} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${withoptions} ${removing} ${redirect} ; then
-                                true
-                        else
-                                exit 1
-                        fi
+                       if [ ! -z "${recprog}" ] ; then
+                               if eval ${config_shell} ${recprog} ${verbose} --host=${host_alias} --target=${target_alias} \
+                                       ${prefixoption} ${tmpdiroption} ${exec_prefixoption} \
+                                       ${srcdiroption} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${withoptions} ${withoutoptions} ${removing} ${redirect} ; then
+                                       true
+                               else
+                                       exit 1
+                               fi
+                       fi
 
                         cd ${POPDIR}
                 fi