From 07a400c8e021dffbcd6932d0101d49556be736c4 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 30 May 2022 14:13:48 +0200
Subject: [PATCH] CI: remove configure --enable-headers-api flags

---
 .cirrus.yml                       | 8 ++++----
 .github/workflows/bearssl.yml     | 2 +-
 .github/workflows/linux-hyper.yml | 2 +-
 .github/workflows/macos.yml       | 2 +-
 .github/workflows/mbedtls.yml     | 2 +-
 .github/workflows/msh3.yml        | 2 +-
 .github/workflows/nss.yml         | 2 +-
 .github/workflows/openssl3.yml    | 2 +-
 .github/workflows/rustls.yml      | 2 +-
 .github/workflows/wolfssl.yml     | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index a2909dedef..c517760137 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -84,14 +84,14 @@ windows_task:
         container_img: ghcr.io/mback2k/curl-docker-winbuildenv/msys2-mingw32:ltsc2019
         container_cmd: C:\msys64\usr\bin\sh
         prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-i686-libssh2 mingw-w64-i686-python-pip mingw-w64-i686-python-wheel mingw-w64-i686-python-pyopenssl && python3 -m pip install --prefer-binary impacket
-        configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-werror --enable-sspi --with-schannel --with-winidn --with-libssh2 --enable-headers-api
+        configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-werror --enable-sspi --with-schannel --with-winidn --with-libssh2
         tests: "~571"
     - name: Windows 32-bit static/release Schannel/SSPI/WinIDN/libssh2
       env:
         container_img: ghcr.io/mback2k/curl-docker-winbuildenv/msys2-mingw32:ltsc2019
         container_cmd: C:\msys64\usr\bin\sh
         prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-i686-libssh2 mingw-w64-i686-python-pip mingw-w64-i686-python-wheel mingw-w64-i686-python-pyopenssl && python3 -m pip install --prefer-binary impacket
-        configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-werror --enable-sspi --with-schannel --with-winidn --with-libssh2 --disable-shared --enable-static  --enable-headers-api
+        configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-werror --enable-sspi --with-schannel --with-winidn --with-libssh2 --disable-shared --enable-static
         tests: "~571"
         curl_LDFLAGS: -all-static
         PKG_CONFIG: pkg-config --static
@@ -100,14 +100,14 @@ windows_task:
         container_img: ghcr.io/mback2k/curl-docker-winbuildenv/msys2-mingw64:ltsc2019
         container_cmd: C:\msys64\usr\bin\sh
         prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-x86_64-libssh2 mingw-w64-x86_64-python-pip mingw-w64-x86_64-python-wheel mingw-w64-x86_64-python-pyopenssl && python3 -m pip install --prefer-binary impacket
-        configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-werror --enable-sspi --with-schannel --with-winidn --with-libssh2  --enable-headers-api
+        configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-werror --enable-sspi --with-schannel --with-winidn --with-libssh2
         tests: "~571"
     - name: Windows 64-bit static/release Schannel/SSPI/WinIDN/libssh2
       env:
         container_img: ghcr.io/mback2k/curl-docker-winbuildenv/msys2-mingw64:ltsc2019
         container_cmd: C:\msys64\usr\bin\sh
         prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-x86_64-libssh2 mingw-w64-x86_64-python-pip mingw-w64-x86_64-python-wheel mingw-w64-x86_64-python-pyopenssl && python3 -m pip install --prefer-binary impacket
-        configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-werror --enable-sspi --with-schannel --with-winidn --with-libssh2 --disable-shared --enable-static  --enable-headers-api
+        configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-werror --enable-sspi --with-schannel --with-winidn --with-libssh2 --disable-shared --enable-static
         tests: "~571"
         curl_LDFLAGS: -all-static
         PKG_CONFIG: pkg-config --static
diff --git a/.github/workflows/bearssl.yml b/.github/workflows/bearssl.yml
index 4aaa193e19..a6dda98282 100644
--- a/.github/workflows/bearssl.yml
+++ b/.github/workflows/bearssl.yml
@@ -49,7 +49,7 @@ jobs:
     - run: autoreconf -fi
       name: 'autoreconf'
 
-    - run: ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }} --enable-headers-api
+    - run: ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }}
       name: 'configure'
 
     - run: make V=1
diff --git a/.github/workflows/linux-hyper.yml b/.github/workflows/linux-hyper.yml
index 4249f966b0..017744dcf5 100644
--- a/.github/workflows/linux-hyper.yml
+++ b/.github/workflows/linux-hyper.yml
@@ -22,7 +22,7 @@ jobs:
         build:
         - name: hyper
           install:
-          configure: LDFLAGS="-Wl,-rpath,$HOME/hyper/target/debug" --with-openssl --with-hyper=$HOME/hyper --enable-debug --enable-headers-api
+          configure: LDFLAGS="-Wl,-rpath,$HOME/hyper/target/debug" --with-openssl --with-hyper=$HOME/hyper --enable-debug
 
     steps:
     - run: |
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 32009b1c91..d762eb7d06 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -92,7 +92,7 @@ jobs:
     - run: autoreconf -fi
       name: 'autoreconf'
 
-    - run: ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }} --enable-headers-api
+    - run: ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }}
       name: 'configure'
       env:
         # -Wvla is caused by brotli
diff --git a/.github/workflows/mbedtls.yml b/.github/workflows/mbedtls.yml
index c622285ada..b2cc456c07 100644
--- a/.github/workflows/mbedtls.yml
+++ b/.github/workflows/mbedtls.yml
@@ -46,7 +46,7 @@ jobs:
     - run: autoreconf -fi
       name: 'autoreconf'
 
-    - run: ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }} --enable-headers-api
+    - run: ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }}
       name: 'configure'
 
     - run: make V=1
diff --git a/.github/workflows/msh3.yml b/.github/workflows/msh3.yml
index 099909a426..27b3203087 100644
--- a/.github/workflows/msh3.yml
+++ b/.github/workflows/msh3.yml
@@ -52,7 +52,7 @@ jobs:
     - run: autoreconf -fi
       name: 'autoreconf'
 
-    - run: ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }} --enable-headers-api
+    - run: ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }}
       name: 'configure'
 
     - run: make V=1
diff --git a/.github/workflows/nss.yml b/.github/workflows/nss.yml
index 2aaf0cb9ba..ea46c76f49 100644
--- a/.github/workflows/nss.yml
+++ b/.github/workflows/nss.yml
@@ -22,7 +22,7 @@ jobs:
         build:
         - name: NSS
           install: clang-9 libnss3-dev libpsl-dev libbrotli-dev libzstd-dev libnghttp2-dev nss-plugin-pem
-          configure: CC=clang-9 CPPFLAGS="-isystem /usr/include/nss" --with-nss --enable-debug --with-nss-deprecated --enable-headers-api
+          configure: CC=clang-9 CPPFLAGS="-isystem /usr/include/nss" --with-nss --enable-debug --with-nss-deprecated
 
     steps:
     - run: |
diff --git a/.github/workflows/openssl3.yml b/.github/workflows/openssl3.yml
index 201272f3fe..4cd3f7b59e 100644
--- a/.github/workflows/openssl3.yml
+++ b/.github/workflows/openssl3.yml
@@ -46,7 +46,7 @@ jobs:
     - run: autoreconf -fi
       name: 'autoreconf'
 
-    - run: ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }} --enable-headers-api
+    - run: ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }}
       name: 'configure'
 
     - run: make V=1
diff --git a/.github/workflows/rustls.yml b/.github/workflows/rustls.yml
index ce80311009..047048c0ac 100644
--- a/.github/workflows/rustls.yml
+++ b/.github/workflows/rustls.yml
@@ -45,7 +45,7 @@ jobs:
     - run: autoreconf -fi
       name: 'autoreconf'
 
-    - run: ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }} --enable-headers-api
+    - run: ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }}
       name: 'configure'
 
     - run: make V=1
diff --git a/.github/workflows/wolfssl.yml b/.github/workflows/wolfssl.yml
index 4ee84b31db..461be85d7e 100644
--- a/.github/workflows/wolfssl.yml
+++ b/.github/workflows/wolfssl.yml
@@ -50,7 +50,7 @@ jobs:
     - run: autoreconf -fi
       name: 'autoreconf'
 
-    - run: ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }} --enable-headers-api
+    - run: ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }}
       name: 'configure'
 
     - run: make V=1
-- 
2.47.3