From 0ab5bfa1d2ad39b8ba2ad9857e96087c85e6a803 Mon Sep 17 00:00:00 2001
From: Bryce Denney <bryce@tlw.com>
Date: Wed, 20 Nov 2002 20:42:40 +0000
Subject: [PATCH] - move "$(LIBTOOL) --mode=link" into the @LINK@ configure
 variable, so that   it doesn't show up in nmake makefiles

---
 bochs/Makefile.in  | 4 ++--
 bochs/configure    | 7 ++++---
 bochs/configure.in | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/bochs/Makefile.in b/bochs/Makefile.in
index d0c1d7e3f..e4e35bc3f 100644
--- a/bochs/Makefile.in
+++ b/bochs/Makefile.in
@@ -176,7 +176,7 @@ bochs@EXE@: @IODEV_LIB_VAR@ @DEBUGGER_VAR@ \
            cpu/libcpu.a memory/libmemory.a gui/libgui.a \
            @DISASM_VAR@ @INSTRUMENT_VAR@ $(BX_OBJS) \
            $(SIMX86_OBJS) $(FPU_LIB) @GDBSTUB_VAR@ @PLUGIN_VAR@
-	$(LIBTOOL) --mode=link @LINK@ -export-dynamic $(BX_OBJS) $(SIMX86_OBJS) \
+	@LINK@ -export-dynamic $(BX_OBJS) $(SIMX86_OBJS) \
 		iodev/libiodev.a cpu/libcpu.a memory/libmemory.a gui/libgui.a \
 		@DEBUGGER_VAR@ @DISASM_VAR@ @INSTRUMENT_VAR@ @PLUGIN_VAR@ \
 		@GDBSTUB_VAR@ \
@@ -235,7 +235,7 @@ $(BX_OBJS): $(BX_INCLUDES)
 bxversion.h:
 	$(RM) -f bxversion.h
 	echo '/////////////////////////////////////////////////////////////////////////' > bxversion.h
-	echo '// $$Id: Makefile.in,v 1.109 2002-11-20 13:01:57 bdenney Exp $$' >> bxversion.h
+	echo '// $$Id: Makefile.in,v 1.110 2002-11-20 20:42:38 bdenney Exp $$' >> bxversion.h
 	echo '/////////////////////////////////////////////////////////////////////////' >> bxversion.h
 	echo '// This file is generated by "make bxversion.h"' >> bxversion.h
 	echo "#define VER_STRING \"$(VER_STRING)\"" >> bxversion.h
diff --git a/bochs/configure b/bochs/configure
index e5a9a11d4..ff3558675 100755
--- a/bochs/configure
+++ b/bochs/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in,v 1.169 2002/11/19 16:36:17 bdenney Exp .
+# From configure.in Id: configure.in,v 1.171 2002/11/20 12:42:53 bdenney Exp .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.53.
 #
@@ -20420,8 +20420,8 @@ CFP=""
 OFP="-o "
 MAKELIB="ar rv \$@"
 RMCOMMAND="rm -f "
-LINK="\$(CXX) -o \$@ \$(CXXFLAGS) \$(LDFLAGS)"
-LINK_CONSOLE="\$(CXX) -o \$@ \$(CXXFLAGS_CONSOLE) \$(LDFLAGS)"
+LINK="\$(LIBTOOL) --mode=link \$(CXX) -o \$@ \$(CXXFLAGS) \$(LDFLAGS)"
+LINK_CONSOLE="\$(LIBTOOL) --mode=link \$(CXX) -o \$@ \$(CXXFLAGS_CONSOLE) \$(LDFLAGS)"
 EXE=""
 COMMAND_SEPARATOR="&& \\"
 CD_UP_ONE="echo done"
@@ -20754,6 +20754,7 @@ _ACEOF
     CXXFP="/Tp"
     CFP="/Tc"
     OFP="/Fo"
+    MAKE=nmake
     MAKELIB="lib.exe /nologo /subsystem:console /machine:I386 /verbose /out:\$@"
     RMCOMMAND="-del"
     RANLIB="echo"
diff --git a/bochs/configure.in b/bochs/configure.in
index 8f274c847..4304c9dcd 100644
--- a/bochs/configure.in
+++ b/bochs/configure.in
@@ -2,7 +2,7 @@ dnl // Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
 AC_INIT(bochs.h)
-AC_REVISION([[$Id: configure.in,v 1.171 2002-11-20 12:42:53 bdenney Exp $]])
+AC_REVISION([[$Id: configure.in,v 1.172 2002-11-20 20:42:39 bdenney Exp $]])
 AC_CONFIG_HEADER(config.h)
 AC_CONFIG_HEADER(ltdlconf.h)
 
@@ -1571,8 +1571,8 @@ CFP=""
 OFP="-o "
 MAKELIB="ar rv \$@"
 RMCOMMAND="rm -f "
-LINK="\$(CXX) -o \$@ \$(CXXFLAGS) \$(LDFLAGS)"
-LINK_CONSOLE="\$(CXX) -o \$@ \$(CXXFLAGS_CONSOLE) \$(LDFLAGS)"
+LINK="\$(LIBTOOL) --mode=link \$(CXX) -o \$@ \$(CXXFLAGS) \$(LDFLAGS)"
+LINK_CONSOLE="\$(LIBTOOL) --mode=link \$(CXX) -o \$@ \$(CXXFLAGS_CONSOLE) \$(LDFLAGS)"
 EXE=""
 COMMAND_SEPARATOR="&& \\"
 CD_UP_ONE="echo done"