luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: delete unused HAVE_{GSSHEIMDAL,GSSMIT,HEIMDAL}

Browse Source 
Stop setting `HAVE_GSSHEIMDAL`, `HAVE_GSSMIT` and `HAVE_HEIMDAL`.
There was no place in the build system or source code that used them.

Reviewed-by: Daniel Stenberg
Closes #12506
This commit is contained in:
Viktor Szakats 2023-11-07 00:25:18 +00:00
parent ee6992c66a
commit 423645a1ef
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
5 changed files with 3 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -907,10 +907,8 @@ if(CURL_USE_GSSAPI)
check_include_file_concat("gssapi/gssapi_generic.h" HAVE_GSSAPI_GSSAPI_GENERIC_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 "Heimdal") if(NOT GSS_FLAVOUR STREQUAL "Heimdal")
set(HAVE_GSSHEIMDAL ON) # MIT
else() # MIT
set(HAVE_GSSMIT ON)
set(_INCLUDE_LIST "") set(_INCLUDE_LIST "")
if(HAVE_GSSAPI_GSSAPI_H) if(HAVE_GSSAPI_GSSAPI_H)
list(APPEND _INCLUDE_LIST "gssapi/gssapi.h") list(APPEND _INCLUDE_LIST "gssapi/gssapi.h")

6
configure.ac
View File

@ -1828,10 +1828,7 @@ AC_INCLUDES_DEFAULT
if test "x$not_mit" = "x1"; then if test "x$not_mit" = "x1"; then
dnl MIT not found, check for Heimdal dnl MIT not found, check for Heimdal
AC_CHECK_HEADER(gssapi.h, AC_CHECK_HEADER(gssapi.h,
[ [],
dnl found
AC_DEFINE(HAVE_GSSHEIMDAL, 1, [if you have Heimdal])
],
[ [
dnl no header found, disabling GSS dnl no header found, disabling GSS
want_gss=no want_gss=no
@ -1840,7 +1837,6 @@ AC_INCLUDES_DEFAULT
) )
else else
dnl MIT found dnl MIT found
AC_DEFINE(HAVE_GSSMIT, 1, [if you have MIT Kerberos])
dnl check if we have a really old MIT Kerberos version (<= 1.2) dnl check if we have a really old MIT Kerberos version (<= 1.2)
AC_MSG_CHECKING([if GSS-API headers declare GSS_C_NT_HOSTBASED_SERVICE]) AC_MSG_CHECKING([if GSS-API headers declare GSS_C_NT_HOSTBASED_SERVICE])
AC_COMPILE_IFELSE([ AC_COMPILE_IFELSE([

6
lib/config-os400.h
View File

@ -116,12 +116,6 @@
/* Define if you have the GNU gssapi libraries */ /* Define if you have the GNU gssapi libraries */
#undef HAVE_GSSGNU #undef HAVE_GSSGNU
/* Define if you have the Heimdal gssapi libraries */
#define HAVE_GSSHEIMDAL
/* Define if you have the MIT gssapi libraries */
#undef HAVE_GSSMIT
/* Define if you need the malloc.h header file even with stdlib.h */ /* Define if you need the malloc.h header file even with stdlib.h */
/* #define NEED_MALLOC_H 1 */ /* #define NEED_MALLOC_H 1 */

6
lib/curl_config.h.cmake
View File

@ -298,12 +298,6 @@
/* if you have the GNU gssapi libraries */ /* if you have the GNU gssapi libraries */
#cmakedefine HAVE_GSSGNU 1 #cmakedefine HAVE_GSSGNU 1
/* if you have the Heimdal gssapi libraries */
#cmakedefine HAVE_GSSHEIMDAL 1
/* if you have the MIT gssapi libraries */
#cmakedefine HAVE_GSSMIT 1
/* Define to 1 if you have the `idna_strerror' function. */ /* Define to 1 if you have the `idna_strerror' function. */
#cmakedefine HAVE_IDNA_STRERROR 1 #cmakedefine HAVE_IDNA_STRERROR 1

32
packages/vms/config_h.com
View File

@ -1386,38 +1386,6 @@ $ write tf "#define ''key2' 1"
$ write tf "#endif" $ write tf "#endif"
$ goto cfgh_in_loop1 $ goto cfgh_in_loop1
$ endif $ endif
$!
$! This is really do we have the newer MIT Kerberos
$!----------------------------------------------------------------------
$ if (key2 .eqs. "HAVE_GSSMIT")
$ then
$ if f$search(test_mit) .nes. ""
$ then
$ write tf "#ifndef ''key2'"
$ write tf "#define ''key2' 1"
$ else
$ write tf "#ifdef ''key2'"
$ write tf "#undef ''key2'"
$ endif
$ write tf "#endif"
$ goto cfgh_in_loop1
$ endif
$!
$! Older MIT looks like Heimdal
$!------------------------------------------------
$ if (key2 .eqs. "HAVE_HEIMDAL")
$ then
$ if f$search(test_mit) .eqs. ""
$ then
$ write tf "#ifndef ''key2'"
$ write tf "#define ''key2' 1"
$ else
$ write tf "#ifdef ''key2'"
$ write tf "#undef ''key2'"
$ endif
$ write tf "#endif"
$ goto cfgh_in_loop1
$ endif
$ endif $ endif
$! $!
$ endif $ endif