From 9783c4540f66f691a60cd0f71de1f7cbe6d8fff4 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 6 Sep 2024 15:14:26 +0200 Subject: [PATCH] autotools: fix MS-DOS builds - disable threaded resolver by default. - fix forming WATT path. Requires `WATT_PATH` env. Closes #14814 --- configure.ac | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index a43c813019..269d7bd446 100644 --- a/configure.ac +++ b/configure.ac @@ -1138,8 +1138,8 @@ if test "$HAVE_GETHOSTBYNAME" != "1"; then AC_CHECK_LIB(watt, gethostbyname, [ HAVE_GETHOSTBYNAME="1" - CPPFLAGS="-I/dev/env/WATT_ROOT/inc" - LDFLAGS="-L/dev/env/WATT_ROOT/lib" + CPPFLAGS="-I${WATT_ROOT}/inc" + LDFLAGS="-L${WATT_ROOT}/lib" LIBS="-lwatt $LIBS" ] ) @@ -4059,7 +4059,17 @@ AS_HELP_STRING([--disable-pthreads],[Disable POSIX threads]), want_pthreads=yes ;; esac ], [ + default_pthreads=1 if test "$curl_cv_native_windows" = "yes"; then + default_pthreads=0 + else + case $host_os in + msdos*) + default_pthreads=0 + ;; + esac + fi + if test "$default_pthreads" = '0'; then AC_MSG_RESULT(no) want_pthreads=no else