diff --git a/configure.ac b/configure.ac index 5055d271d5614720c1c62c72528adcccceeb4c46..215dd64fe3ff530166298e8521e44f624a6b09eb 100644 --- a/configure.ac +++ b/configure.ac @@ -791,6 +791,11 @@ if test "x$HAVE_RECURSIVE_MUTEX" = "xyes" ; then THREAD_DEFAULT=yes fi +case $host_os in + mingw*) THREAD_DEFAULT=no ;; + *) +esac + AC_ARG_ENABLE(input-thread, AS_HELP_STRING([--enable-input-thread], [Enable input threads]), [INPUTTHREAD=$enableval], [INPUTTHREAD=$THREAD_DEFAULT]) diff --git a/include/meson.build b/include/meson.build index 65781b7a018a413be22e8cfb7d7975321a2e4d4f..527025b240e9964a82d6e737a7718512ef374ce7 100644 --- a/include/meson.build +++ b/include/meson.build @@ -60,6 +60,9 @@ else if not enable_input_thread and get_option('input_thread') == 'true' error('Input thread enabled and PTHREAD_MUTEX_RECURSIVE not found') endif + if host_machine.system() == 'windows' and get_option('input_thread') == 'auto' + enable_input_thread = false + endif endif conf_data.set('HAVE_INPUTTHREAD', enable_input_thread)