cmake: Correctly detect if glob has gl_flags member
Thanks to Baruch Siach. Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Этот коммит содержится в:
родитель
983d1189d0
Коммит
2e8f2f03e7
@ -4,7 +4,7 @@ include(CheckSymbolExists)
|
|||||||
include(CheckFunctionExists)
|
include(CheckFunctionExists)
|
||||||
include(CheckLibraryExists)
|
include(CheckLibraryExists)
|
||||||
include(CheckTypeSize)
|
include(CheckTypeSize)
|
||||||
include(CheckCXXSourceCompiles)
|
include(CheckStructHasMember)
|
||||||
include(TestBigEndian)
|
include(TestBigEndian)
|
||||||
|
|
||||||
set(PACKAGE ${PROJECT_NAME})
|
set(PACKAGE ${PROJECT_NAME})
|
||||||
@ -156,7 +156,8 @@ check_function_exists(explicit_bzero HAVE_EXPLICIT_BZERO)
|
|||||||
check_function_exists(memset_s HAVE_MEMSET_S)
|
check_function_exists(memset_s HAVE_MEMSET_S)
|
||||||
|
|
||||||
if (HAVE_GLOB_H)
|
if (HAVE_GLOB_H)
|
||||||
check_function_exists(glob HAVE_GLOB)
|
check_struct_has_member(glob_t gl_flags glob.h HAVE_GLOB_GL_FLAGS_MEMBER)
|
||||||
|
check_function_exists(glob HAVE_GLOB)
|
||||||
endif (HAVE_GLOB_H)
|
endif (HAVE_GLOB_H)
|
||||||
|
|
||||||
if (NOT WIN32)
|
if (NOT WIN32)
|
||||||
|
@ -89,6 +89,9 @@
|
|||||||
/* Define to 1 if you have DSA */
|
/* Define to 1 if you have DSA */
|
||||||
#cmakedefine HAVE_DSA 1
|
#cmakedefine HAVE_DSA 1
|
||||||
|
|
||||||
|
/* Define to 1 if you have gl_flags as a glob_t sturct member */
|
||||||
|
#cmakedefine HAVE_GLOB_GL_FLAGS_MEMBER 1
|
||||||
|
|
||||||
/*************************** FUNCTIONS ***************************/
|
/*************************** FUNCTIONS ***************************/
|
||||||
|
|
||||||
/* Define to 1 if you have the `EVP_aes128_ctr' function. */
|
/* Define to 1 if you have the `EVP_aes128_ctr' function. */
|
||||||
|
@ -347,7 +347,7 @@ static void local_parse_file(ssh_session session, const char *filename, int *par
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_GLOB
|
#if defined(HAVE_GLOB) && defined(HAVE_GLOB_GL_FLAGS_MEMBER)
|
||||||
static void local_parse_glob(ssh_session session,
|
static void local_parse_glob(ssh_session session,
|
||||||
const char *fileglob,
|
const char *fileglob,
|
||||||
int *parsing,
|
int *parsing,
|
||||||
@ -376,7 +376,7 @@ static void local_parse_glob(ssh_session session,
|
|||||||
|
|
||||||
globfree(&globbuf);
|
globfree(&globbuf);
|
||||||
}
|
}
|
||||||
#endif /* HAVE_GLOB */
|
#endif /* HAVE_GLOB HAVE_GLOB_GL_FLAGS_MEMBER */
|
||||||
|
|
||||||
static enum ssh_config_match_e
|
static enum ssh_config_match_e
|
||||||
ssh_config_get_match_opcode(const char *keyword)
|
ssh_config_get_match_opcode(const char *keyword)
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user