Added needed definitions to detect and use assembler to build DOS test programs.

[Morten Rønne]

---
 Make.rules.in                   |    2 +-
 configure.ac                    |   10 ++++++++++
 dlls/kernel32/tests/Makefile.in |   17 +++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletions(-)

diff --git a/Make.rules.in b/Make.rules.in
index 7b571ed..b5f87d8 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -136,7 +136,7 @@ filter: dummy
 
 # Implicit rules
 
-.SUFFIXES: .mc .rc .mc.rc .res .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .man.in .man _c.c _i.c _p.c _s.c .cross.o @MAINTAINER_MODE@ .sfd .ttf .svg .ico
+.SUFFIXES: .mc .rc .mc.rc .res .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .man.in .man _c.c _i.c _p.c _s.c .cross.o .asm .com @MAINTAINER_MODE@ .sfd .ttf .svg .ico
 
 .c.o:
 	$(CC) -c $(ALLCFLAGS) -o $@ $<
diff --git a/configure.ac b/configure.ac
index 83b3240..bc230d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -314,6 +314,16 @@ then
 
 fi
 
+AC_CHECK_PROGS(ASM, [nasm], false)
+  case "$ASM" in
+  false)
+      WINE_NOTICE([Assembler not found. Unable to create DOS programs for testing.])
+      ;;
+  nasm)
+      AC_SUBST(ASM_FLAGS, "-f bin -w+orphan-labels")
+      ;;
+  esac
+
 case $host_cpu in
   *i[[3456789]]86*)
     AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH])
diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in
index ed2d6e6..3d00454 100644
--- a/dlls/kernel32/tests/Makefile.in
+++ b/dlls/kernel32/tests/Makefile.in
@@ -42,4 +42,21 @@ C_SRCS = \
 
 RC_SRCS = resource.rc
 
+ASM_SRCS = int21.asm
+
 @MAKE_TEST_RULES@
+
+ASM = @ASM@
+
+ASM_FLAGS = @ASM_FLAGS@
+
+COM_OBJS = $(ASM_SRCS:.asm=.com)
+
+ifdef ASM
+
+asm: $(COM_OBJS)
+	
+.asm.com:
+	$(ASM) $(ASM_FLAGS) -o $@ $<
+
+endif
-- 
1.6.3.3


--------------070603070805080108080708--