From 776820e53c9b7f208e2c4b33affb9e48c6ae56f0 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 23 Feb 2009 17:46:33 +0100
Subject: [PATCH] configure: Disable VxD and DOS modules when 16-bit support is
 disabled.

---
 configure    | 28 ++++++++++++----------------
 configure.ac | 25 ++++++++++---------------
 2 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/configure b/configure
index d51df86215f..2b9b4e49dd3 100755
--- a/configure
+++ b/configure
@@ -3886,11 +3886,18 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 esac
 
 case $host_cpu in
-  *i[3456789]86*)
-    enable_win16=${enable_win16:-yes}
-    ;;
-  *)
-    enable_win16=${enable_win16:-no}
+  *i[3456789]86*) enable_win16=${enable_win16:-yes} ;;
+  *)                enable_win16=${enable_win16:-no} ;;
+esac
+
+WIN16_FILES="\$(WIN16_FILES)"
+
+WIN16_INSTALL="\$(WIN16_INSTALL)"
+
+if test "x$enable_win16" != "xyes"
+then
+    WIN16_FILES=""
+    WIN16_INSTALL=""
     enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no}
     enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no}
     enable_monodebg_vxd=${enable_monodebg_vxd:-no}
@@ -3903,17 +3910,6 @@ case $host_cpu in
     enable_w32skrnl=${enable_w32skrnl:-no}
     enable_winedos=${enable_winedos:-no}
     enable_winevdm=${enable_winevdm:-no}
-    ;;
-esac
-
-WIN16_FILES="\$(WIN16_FILES)"
-
-WIN16_INSTALL="\$(WIN16_INSTALL)"
-
-if test "x$enable_win16" != "xyes"
-then
-  WIN16_FILES=""
-  WIN16_INSTALL=""
 fi
 
 { $as_echo "$as_me:$LINENO: checking for the directory containing the Wine tools" >&5
diff --git a/configure.ac b/configure.ac
index ad1cdd71a7f..8db0c516881 100644
--- a/configure.ac
+++ b/configure.ac
@@ -124,12 +124,16 @@ esac
 
 dnl enable_win16 defaults to yes on x86, to no on other CPUs
 case $host_cpu in
-  *i[[3456789]]86*)
-    enable_win16=${enable_win16:-yes}
-    ;;
-  *)
-    enable_win16=${enable_win16:-no}
-dnl disable some modules by default on non-x86
+  *i[[3456789]]86*) enable_win16=${enable_win16:-yes} ;;
+  *)                enable_win16=${enable_win16:-no} ;;
+esac
+
+AC_SUBST(WIN16_FILES,"\$(WIN16_FILES)")
+AC_SUBST(WIN16_INSTALL,"\$(WIN16_INSTALL)")
+if test "x$enable_win16" != "xyes"
+then
+    WIN16_FILES=""
+    WIN16_INSTALL=""
     enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no}
     enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no}
     enable_monodebg_vxd=${enable_monodebg_vxd:-no}
@@ -142,15 +146,6 @@ dnl disable some modules by default on non-x86
     enable_w32skrnl=${enable_w32skrnl:-no}
     enable_winedos=${enable_winedos:-no}
     enable_winevdm=${enable_winevdm:-no}
-    ;;
-esac
-   
-AC_SUBST(WIN16_FILES,"\$(WIN16_FILES)")
-AC_SUBST(WIN16_INSTALL,"\$(WIN16_INSTALL)")
-if test "x$enable_win16" != "xyes"
-then
-  WIN16_FILES=""
-  WIN16_INSTALL=""
 fi
 
 AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir,