Disable Win16 support by default on non-x86 platforms.
This commit is contained in:
Alexandre Julliard
parent
8aa102baef
commit
71440f35c8
|
|
@ -311,7 +311,7 @@ ac_includes_default="\
|
|||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS WIN16_FILES WIN16_INSTALL DLLDEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPPBIN ac_ct_CPPBIN TOOLSDIR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LEX LEXLIB LEX_OUTPUT_ROOT XLEX BISON AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN EGREP LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS FONTFORGE LIBPTHREAD XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS GLUT_LIBS GLUT32FILES NASLIBS CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS ft_devel ft_devel2 FREETYPELIBS FREETYPEINCL FONTSSUBDIRS ARTSCCONFIG ARTSLIBS ARTSINCL ALSALIBS AUDIOIOLIBS EXTRACFLAGS DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLLFLAGS LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS LDLIBWINEFLAGS COREFOUNDATIONLIB IOKITLIB CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS SOCKETLIBS WINE_BINARIES MAIN_BINARY LDD ALLOCA LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DLLDEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os WIN16_FILES WIN16_INSTALL SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPPBIN ac_ct_CPPBIN TOOLSDIR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LEX LEXLIB LEX_OUTPUT_ROOT XLEX BISON AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN EGREP LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS FONTFORGE LIBPTHREAD XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS GLUT_LIBS GLUT32FILES NASLIBS CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS ft_devel ft_devel2 FREETYPELIBS FREETYPEINCL FONTSSUBDIRS ARTSCCONFIG ARTSLIBS ARTSINCL ALSALIBS AUDIOIOLIBS EXTRACFLAGS DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLLFLAGS LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS LDLIBWINEFLAGS COREFOUNDATIONLIB IOKITLIB CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS SOCKETLIBS WINE_BINARIES MAIN_BINARY LDD ALLOCA LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files='MAKE_RULES MAKE_DLL_RULES MAKE_TEST_RULES MAKE_LIB_RULES MAKE_PROG_RULES'
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -1404,16 +1404,6 @@ if test "${with_wine_tools+set}" = set; then
|
|||
|
||||
fi;
|
||||
|
||||
WIN16_FILES="\$(WIN16_FILES)"
|
||||
|
||||
WIN16_INSTALL="\$(WIN16_INSTALL)"
|
||||
|
||||
if test "x$enable_win16" = "xno"
|
||||
then
|
||||
WIN16_FILES=""
|
||||
WIN16_INSTALL=""
|
||||
fi
|
||||
|
||||
DLLDEFS=""
|
||||
|
||||
if test "x$enable_debug" = "xno"
|
||||
|
|
@ -1425,7 +1415,6 @@ then
|
|||
DLLDEFS="$DLLDEFS -DWINE_NO_TRACE_MSGS"
|
||||
fi
|
||||
|
||||
|
||||
# Make sure we can run config.sub.
|
||||
$ac_config_sub sun4 >/dev/null 2>&1 ||
|
||||
{ { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
|
||||
|
|
@ -1492,6 +1481,26 @@ case $host in
|
|||
;;
|
||||
esac
|
||||
|
||||
case $host_cpu in
|
||||
*i[3456789]86*)
|
||||
if test "x$enable_win16" != "xno"
|
||||
then
|
||||
enable_win16="yes"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
WIN16_FILES="\$(WIN16_FILES)"
|
||||
|
||||
WIN16_INSTALL="\$(WIN16_INSTALL)"
|
||||
|
||||
if test "x$enable_win16" != "xyes"
|
||||
then
|
||||
WIN16_FILES=""
|
||||
WIN16_INSTALL=""
|
||||
fi
|
||||
|
||||
|
||||
echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
|
||||
echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
|
||||
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
|
||||
|
|
@ -20854,8 +20863,6 @@ s,@ECHO_C@,$ECHO_C,;t t
|
|||
s,@ECHO_N@,$ECHO_N,;t t
|
||||
s,@ECHO_T@,$ECHO_T,;t t
|
||||
s,@LIBS@,$LIBS,;t t
|
||||
s,@WIN16_FILES@,$WIN16_FILES,;t t
|
||||
s,@WIN16_INSTALL@,$WIN16_INSTALL,;t t
|
||||
s,@DLLDEFS@,$DLLDEFS,;t t
|
||||
s,@build@,$build,;t t
|
||||
s,@build_cpu@,$build_cpu,;t t
|
||||
|
|
@ -20865,6 +20872,8 @@ s,@host@,$host,;t t
|
|||
s,@host_cpu@,$host_cpu,;t t
|
||||
s,@host_vendor@,$host_vendor,;t t
|
||||
s,@host_os@,$host_os,;t t
|
||||
s,@WIN16_FILES@,$WIN16_FILES,;t t
|
||||
s,@WIN16_INSTALL@,$WIN16_INSTALL,;t t
|
||||
s,@SET_MAKE@,$SET_MAKE,;t t
|
||||
s,@CC@,$CC,;t t
|
||||
s,@CFLAGS@,$CFLAGS,;t t
|
||||
|
|
|
|||
30
configure.ac
30
configure.ac
|
|
@ -21,14 +21,6 @@ AC_ARG_WITH(opengl, AC_HELP_STRING([--without-opengl],[do not use OpenGL]))
|
|||
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 @@ then
|
|||
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 @@ case $host in
|
|||
;;
|
||||
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
|
||||
|
|
|
|||
Loading…
Reference in New Issue