Revise to match config renaming.

[deliverable/binutils-gdb.git] / configure

diff --git a/configure b/configure
index 55f8594f2408f8f3d70b16eecf58872ea9944bbb..6586640ed2b8b8859d74642e477d9e77154bf67a 100755 (executable)
--- a/configure
+++ b/configure
@@ -33,7 +33,7 @@
 #      config.status is removed.
 #
 
-# set -e
+set -e
 
 remove=rm
 hard_link=ln
@@ -274,7 +274,7 @@ for host in ${hosts} ; do
 
        host_alias=${host}
 
-       result=`/bin/sh ${configsub} ${host}`
+       result=`${configsub} ${host}`
        host_cpu=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
        host_vendor=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
        host_os=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
@@ -286,7 +286,7 @@ for host in ${hosts} ; do
        for target in ${targets} ; do
 
                target_alias=${target}
-               result=`/bin/sh ${configsub} ${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/'`
@@ -534,7 +534,7 @@ for host in ${hosts} ; do
                                        andandusing="${andusing} and \"${site_makefile_frag}\""
                                fi
                        else
-                               andandusing=${using}
+                               andandusing=${andusing}
                        fi
 
                        if [ -n "${verbose}" -o -z "${recurring}" ] ; then
@@ -573,12 +573,22 @@ for host in ${hosts} ; do
                                                fi
                                        fi
 
-                                       (cd ${configdir} ;
-                                               ${progname} +recurring ${host_alias} +target=${target_alias} \
-                                                       ${verbose} ${subdirs} ${removing} +destdir=${destdir} \
-                                                       `if [ -n "${objdir}" ] ; then echo +objdir=${objdir}/${configdir} ; fi` \
-                                                       ${tmpdiroption}) \
-                                               | sed 's/^/     /'
+                                       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.
@@ -620,7 +630,16 @@ exit 0
 #
 #
 # $Log$
-# Revision 1.53  1991/10/10 00:38:08  rich
+# 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.
 #