Browse Source

Fix crypt library detection in CMake

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
tags/r14.0.0
Slávek Banko 5 years ago
parent
commit
71fb8e0e11
3 changed files with 12 additions and 12 deletions
  1. +12
    -0
      ConfigureChecks.cmake
  2. +0
    -2
      kcheckpass/ConfigureChecks.cmake
  3. +0
    -10
      tdm/ConfigureChecks.cmake

+ 12
- 0
ConfigureChecks.cmake View File

@@ -54,6 +54,18 @@ if( WITH_PAM AND (BUILD_KCHECKPASS OR BUILD_TDM) )
endif( )


# crypt
set( CRYPT_LIBRARY crypt )
check_library_exists( ${CRYPT_LIBRARY} crypt "" HAVE_CRYPT )
if( NOT HAVE_CRYPT )
unset( CRYPT_LIBRARY )
check_function_exists( crypt LIBC_HAVE_CRYPT )
if( LIBC_HAVE_CRYPT )
set( HAVE_CRYPT 1 CACHE INTERNAL "" FORCE )
endif( LIBC_HAVE_CRYPT )
endif( NOT HAVE_CRYPT )


# hal (ksmserver, tdeioslaves)
if( WITH_HAL )
pkg_search_module( HAL hal )


+ 0
- 2
kcheckpass/ConfigureChecks.cmake View File

@@ -9,8 +9,6 @@
#
#################################################

find_library( CRYPT_LIBRARY crypt )

if( WITH_PAM AND (NOT DEFINED KCHECKPASS_PAM_SERVICE) )
set( KCHECKPASS_PAM_SERVICE "kde" CACHE INTERNAL "" )
endif( )

+ 0
- 10
tdm/ConfigureChecks.cmake View File

@@ -27,16 +27,6 @@ check_function_exists( login_getclass HAVE_LOGIN_GETCLASS )
check_function_exists( auth_timeok HAVE_AUTH_TIMEOK )
tde_restore( CMAKE_REQUIRED_LIBRARIES )

check_function_exists( crypt LIBC_HAVE_CRYPT )
if( LIBC_HAVE_CRYPT )
set( HAVE_CRYPT 1 CACHE INTERNAL "" FORCE )
else( )
check_library_exists( crypt crypt "" HAVE_CRYPT )
if( HAVE_CRYPT )
set( CRYPT_LIBRARY crypt )
endif( )
endif( )

check_include_file( lastlog.h HAVE_LASTLOG_H )
check_include_file( termio.h HAVE_TERMIO_H )



Loading…
Cancel
Save