From 99ac77549e26c2d34106d090cf976ad56f7a368c Mon Sep 17 00:00:00 2001
From: Jason Molenda <crash@cygnus>
Date: Fri, 1 Sep 1995 02:24:59 +0000
Subject: [PATCH]        * configure.in: match i[3-6]86-*-win32, not just
 i386-*-win32.

---
 binutils/ChangeLog    |  4 ++++
 binutils/configure.in | 48 +++++++++++++++++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 809068728f7..72b824b1a0d 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+Thu Aug 31 19:21:48 1995  Jason Molenda    (crash@phydeaux.cygnus.com)
+
+	* configure.in: match i[3-6]86-*-win32, not just i386-*-win32.
+
 Thu Aug 31 16:30:22 1995  steve chamberlain  <sac@slash.cygnus.com>
 
 	* dlltool.c (add_indirect): New.
diff --git a/binutils/configure.in b/binutils/configure.in
index 300d94127e0..43d09611939 100644
--- a/binutils/configure.in
+++ b/binutils/configure.in
@@ -6,8 +6,6 @@
 srctrigger=ar.c
 srcname="Binutils"
 
-configdirs="testsuite"
-
 # per-host:
 
 . ${srcdir}/../bfd/configure.host
@@ -20,8 +18,8 @@ fi
 # per-target:
 
 # Canonicalize the secondary target names.
-if [ -n "$with_targets" ]; then
-    for targ in `echo $with_targets | sed 's/,/ /g'`
+if [ -n "$enable_targets" ]; then
+    for targ in `echo $enable_targets | sed 's/,/ /g'`
     do
 	result=`$configsub $targ 2>/dev/null`
 	if [ -n "$result" ]; then
@@ -40,24 +38,52 @@ fi
 
 all_targets=false
 build_nlmconv=false
+nlmconv_defs=
 build_srconv=false
+build_dlltool=false
+dlltool_defs=
 
 for targ in $target $canon_targets
 do
-    bfd_target=`$srcdir/../bfd/config.bfd $targ`
+    bfd_target=`${config_shell} $srcdir/../bfd/config.bfd $targ`
 
     if [ "x$bfd_target" = "xall" ]; then
         all_targets=true
 	build_nlmconv=true
 	build_srconv=true
+	nlmconv_defs="-DNLMCONV_I386 -DNLMCONV_ALPHA -DNLMCONV_POWERPC -DNLMCONV_SPARC"
     else
 	case $targ in
-	*-*-netware*) build_nlmconv=true ;;
+	i[345]86*-*-netware*) 
+	  build_nlmconv=true 
+	  nlmconv_defs="$nlmconv_defs -DNLMCONV_I386"
+	  ;;
+	alpha*-*-netware*)
+	  build_nlmconv=true
+	  nlmconv_defs="$nlmconv_defs -DNLMCONV_ALPHA"
+	  ;;
+	powerpc*-*-netware*)
+	  build_nlmconv=true
+	  nlmconv_defs="$nlmconv_defs -DNLMCONV_POWERPC"
+	  ;;
+	sparc*-*-netware*)
+	  build_nlmconv=true
+	  nlmconv_defs="$nlmconv_defs -DNLMCONV_SPARC"
+	  ;;
 	esac
-
 	case $targ in
 	*-*-hms*) build_srconv=true ;;
 	esac
+	case $targ in
+	arm-*pe*)
+  	  build_dlltool=true;
+	  dlltool_defs="$dlltool_defs -DDLLTOOL_ARM"
+	 ;;
+	i[3-6]86-*pe* | i[3-6]86-*-win32)
+  	  build_dlltool=true;
+	  dlltool_defs="$dlltool_defs -DDLLTOOL_I386"
+	 ;;
+	esac
     fi
 done
 
@@ -70,13 +96,19 @@ mv Makefile Makefile.tmp
 
 if [ "x${build_nlmconv}" = "xtrue" ]; then
     echo 'BUILD_NLMCONV = $(NLMCONV_PROG)' >> Makefile.2
+    echo "NLMCONV_DEFS = ${nlmconv_defs}" >> Makefile.2
 fi
 
 if [ "x${build_srconv}" = "xtrue" ]; then
     echo 'BUILD_SRCONV = $(SRCONV_PROG)' >> Makefile.2
 fi
 
-if [ "x`$srcdir/../bfd/config.bfd $target _`" = "xyes" ]; then
+if [ "x${build_dlltool}" = "xtrue" ]; then
+    echo 'BUILD_DLLTOOL = $(DLLTOOL_PROG)' >> Makefile.2
+    echo "DLLTOOL_DEFS = ${dlltool_defs}" >> Makefile.2
+fi
+
+if [ "x`${config_shell} $srcdir/../bfd/config.bfd $target _`" = "xyes" ]; then
     underscore=1
 else
     underscore=0
-- 
2.30.2