From: Viktor Szakats <commit@vsz.me>
Date: Mon, 7 Oct 2024 10:56:04 +0000 (+0200)
Subject: cmake: do not propagate unused `HAVE_GSSAPI_GSSAPI_KRB5_H` to C
X-Git-Tag: curl-8_11_0~217
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a79f20d37612fbc1150a01840967b95a210a574d;p=thirdparty%2Fcurl.git

cmake: do not propagate unused `HAVE_GSSAPI_GSSAPI_KRB5_H` to C

Closes #15174
---

diff --git a/.github/scripts/cmp-config.pl b/.github/scripts/cmp-config.pl
index f573891cc4..cdc4f62778 100755
--- a/.github/scripts/cmp-config.pl
+++ b/.github/scripts/cmp-config.pl
@@ -48,6 +48,7 @@ my %remove = (
     '#define HAVE_DECL_GETPWUID_R_MISSING 1' => 1,
     '#define HAVE_DLFCN_H 1' => 1,
     '#define HAVE_GETHOSTBYNAME 1' => 1,
+    '#define HAVE_GSSAPI_GSSAPI_KRB5_H 1' => 1,
     '#define HAVE_INTTYPES_H 1' => 1,
     '#define HAVE_IOCTL 1' => 1,
     '#define HAVE_LDAP_H 1' => 1,
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d83574ed8..198de466f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1180,7 +1180,7 @@ if(CURL_USE_GSSAPI)
 
     check_include_file_concat("gssapi/gssapi.h" HAVE_GSSAPI_GSSAPI_H)
     check_include_file_concat("gssapi/gssapi_generic.h" HAVE_GSSAPI_GSSAPI_GENERIC_H)
-    check_include_file_concat("gssapi/gssapi_krb5.h" HAVE_GSSAPI_GSSAPI_KRB5_H)
+    check_include_file_concat("gssapi/gssapi_krb5.h" _have_gssapi_gssapi_krb5_h)
 
     if(GSS_FLAVOUR STREQUAL "MIT")
       set(_include_list "")
@@ -1190,7 +1190,7 @@ if(CURL_USE_GSSAPI)
       if(HAVE_GSSAPI_GSSAPI_GENERIC_H)
         list(APPEND _include_list "gssapi/gssapi_generic.h")
       endif()
-      if(HAVE_GSSAPI_GSSAPI_KRB5_H)
+      if(_have_gssapi_gssapi_krb5_h)
         list(APPEND _include_list "gssapi/gssapi_krb5.h")
       endif()
 
diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake
index e6eef6f525..321752a06b 100644
--- a/lib/curl_config.h.cmake
+++ b/lib/curl_config.h.cmake
@@ -321,9 +321,6 @@
 /* Define to 1 if you have the <gssapi/gssapi.h> header file. */
 #cmakedefine HAVE_GSSAPI_GSSAPI_H 1
 
-/* Define to 1 if you have the <gssapi/gssapi_krb5.h> header file. */
-#cmakedefine HAVE_GSSAPI_GSSAPI_KRB5_H 1
-
 /* if you have the GNU gssapi libraries */
 #cmakedefine HAVE_GSSGNU 1