configure: fail if PSL is not disabled but not found

Regression since 9b3f67e (shipped in 8.7.0)
Reported-by: Ryan Carsten Schmidt
Fixes #14373
Assisted-by: Viktor Szakats
Closes #14379

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 74ebca86b829e562470cae29a569df8bda1e609c..c8bff3abcf7eb2e983b113edeabaf869436bce08 100644 (file)
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -585,6 +585,7 @@ jobs:
               --disable-dependency-tracking \
               --disable-docs --disable-manual \
               --without-nghttp2 --without-libidn2 \
+              --without-libpsl \
               ${options}
           else
             [ '${{ matrix.config }}' = 'OpenSSL' ]         && options+=' -DCURL_USE_OPENSSL=ON'

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 9cec1f8bc76d58d317f3831817a747d94c2e23e4..916332f8b0144f4c879e7a68a63e4769635e9ee8 100644 (file)
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -78,6 +78,7 @@ jobs:
             mingw-w64-${{ matrix.env }}-${{ matrix.build }} make
             mingw-w64-${{ matrix.env }}-openssl
             mingw-w64-${{ matrix.env }}-libssh2
+            mingw-w64-${{ matrix.env }}-libpsl
 
       - name: 'autotools autoreconf'
         if: ${{ matrix.build == 'autotools' }}

diff --git a/configure.ac b/configure.ac
index 056efbe89a394852a0c97f735489ecaf45402e4d..cee96e541f3c14fe80baae03509cbfab9eff93aa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2113,7 +2113,7 @@ if test X"$OPT_LIBPSL" != Xno; then
   CLEANLIBS="$LIBS"
 
   case "$OPT_LIBPSL" in
-  yes)
+  yes|off)
     dnl --with-libpsl (without path) used
     CURL_CHECK_PKGCONFIG(libpsl)
 
@@ -2126,10 +2126,6 @@ if test X"$OPT_LIBPSL" != Xno; then
       LIB_PSL="-lpsl"
     fi
 
-    ;;
-  off)
-    dnl no --with-libpsl option given, just check default places
-    LIB_PSL="-lpsl"
     ;;
   *)
     dnl use the given --with-libpsl spot
@@ -2164,8 +2160,7 @@ if test X"$OPT_LIBPSL" != Xno; then
       LIBS=$CLEANLIBS
   )
 
-  if test X"$OPT_LIBPSL" != Xoff &&
-     test "$LIBPSL_ENABLED" != "1"; then
+  if test "$LIBPSL_ENABLED" != "1"; then
     AC_MSG_ERROR([libpsl libs and/or directories were not found where specified!])
   fi
 fi

diff --git a/scripts/verify-release b/scripts/verify-release
index 3b8977def24ee1af23326469c2e8d48879aefc4a..2f7a0bf89fea5f6a87ee67440904b5c2a7aa17d8 100755 (executable)
--- a/scripts/verify-release
+++ b/scripts/verify-release
@@ -69,7 +69,7 @@ timestamp=$(grep -Eo 'SOURCE_DATE_EPOCH=[0-9]*' curl-"$curlver"/docs/RELEASE-TOO
 
 pwd=$(pwd)
 cd "curl-$curlver"
-./configure --without-ssl
+./configure --without-ssl --without-libpsl
 ./scripts/dmaketgz "$curlver" "$timestamp"
 
 mv curl-"$curlver"* ../_tarballs/