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 f573891cc4eae821714a7c7639d4442196c1806a..cdc4f6277821573ab1301b8846e074f404a634c6 100755 (executable)
--- 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 4d83574ed83e21c066f65e75e8689d81ba0ffd2c..198de466f030fa56779b696a761ffeb0a7a3684b 100644 (file)
--- 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 e6eef6f525735e2523a2a6027d9b470a75a86c59..321752a06b425477ee3ec5444ae607bc5e870145 100644 (file)
--- 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