]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
autotools: fix MS-DOS builds
authorViktor Szakats <commit@vsz.me>
Fri, 6 Sep 2024 13:14:26 +0000 (15:14 +0200)
committerViktor Szakats <commit@vsz.me>
Fri, 6 Sep 2024 19:47:35 +0000 (21:47 +0200)
- disable threaded resolver by default.
- fix forming WATT path. Requires `WATT_PATH` env.

Closes #14814

configure.ac

index a43c81301977f0ef76ad4b0519973ea29c8b6917..269d7bd4464afb3ec46919db1c308e11c9d9b380 100644 (file)
@@ -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