Disable Win16 support by default on non-x86 platforms.
diff --git a/configure.ac b/configure.ac
index bb55fad..383e0fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,14 +21,6 @@
AC_ARG_WITH(curses, AC_HELP_STRING([--without-curses],[do not use curses]))
AC_ARG_WITH(wine-tools,AC_HELP_STRING([--with-wine-tools=<dir>],[use Wine tools from directory <dir>]))
-AC_SUBST(WIN16_FILES,"\$(WIN16_FILES)")
-AC_SUBST(WIN16_INSTALL,"\$(WIN16_INSTALL)")
-if test "x$enable_win16" = "xno"
-then
- WIN16_FILES=""
- WIN16_INSTALL=""
-fi
-
AC_SUBST(DLLDEFS,"")
if test "x$enable_debug" = "xno"
then
@@ -39,8 +31,6 @@
DLLDEFS="$DLLDEFS -DWINE_NO_TRACE_MSGS"
fi
-dnl **** Check for some programs ****
-
AC_CANONICAL_HOST
case $host in
x86_64*linux*)
@@ -54,6 +44,26 @@
;;
esac
+dnl enable_win16 defaults to yes on x86, to no on other CPUs
+case $host_cpu in
+ *i[[3456789]]86*)
+ if test "x$enable_win16" != "xno"
+ then
+ enable_win16="yes"
+ fi
+ ;;
+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
+
+dnl **** Check for some programs ****
+
AC_PROG_MAKE_SET
AC_PROG_CC
AC_PROG_CXX
