From 06885ceb139976763aa815dd5ff1d972cecea4c9 Mon Sep 17 00:00:00 2001 From: Luca Dariz Date: Thu, 28 Dec 2023 20:42:48 +0100 Subject: USER32: change default to disabled and make it a general option * configfrag.ac: add the global option USER32; although it makes sense for 64-bit versions only, it can be used by future 64-bit architectiures and not only x86_64. Also, change the default setting to be disabled; now that we have a working full 64-bit system, it makes sense to consider it the common choice. * x86_64/configfrag.ac: define the correct 32-bit cpu if USER32 is enabled. Message-ID: <20231228194301.745811-2-luca@orpolo.org> --- x86_64/configfrag.ac | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'x86_64') diff --git a/x86_64/configfrag.ac b/x86_64/configfrag.ac index 71f8d8c1..f119a9a3 100644 --- a/x86_64/configfrag.ac +++ b/x86_64/configfrag.ac @@ -27,22 +27,16 @@ dnl USE OF THIS SOFTWARE. # Determines the size of the CPU cache line. AC_DEFINE([CPU_L1_SHIFT], [6], [CPU_L1_SHIFT]) - AC_ARG_ENABLE([user32], - AS_HELP_STRING([--disable-user32], [disable 32-bit user on 64-bit kernel])) - [if [ x"$enable_user32" != xno ]; then] - AC_DEFINE([USER32], [], [enable 32-bit user on 64-bit kernel]) - AM_CONDITIONAL([enable_user32], [true]) - [else] - AM_CONDITIONAL([enable_user32], [false]) - [fi] + [if test x"$enable_user32" = xyes ; then + user32_cpu=i686 + fi] [# Does the architecture provide machine-specific interfaces? mach_machine_routines=1 enable_pae=yes;; *)] - AM_CONDITIONAL([HOST_x86_64], [false]) - AM_CONDITIONAL([enable_user32], [true])[;; + AM_CONDITIONAL([HOST_x86_64], [false])[;; esac case $host_platform in -- cgit v1.2.3