Browse Source

Improvement the detection of libXss

The test for Xss has been altered to ask where the library is first before checking for the required API function.

Signed-off-by: aneejit1 <aneejit1@gmail.com>
pull/43/head
aneejit1 12 months ago
parent
commit
fd0d25af4d
  1. 18
      ConfigureChecks.cmake

18
ConfigureChecks.cmake

@ -212,15 +212,23 @@ endif( )
if( BUILD_KARM AND WITH_XSCREENSAVER )
check_library_exists( Xss XScreenSaverQueryInfo "" HAVE_XSSLIB )
if( HAVE_XSSLIB )
pkg_search_module( XSS xscrnsaver )
else( )
check_library_exists( Xext XScreenSaverQueryInfo "" HAVE_XSSLIB )
pkg_search_module( XSS xscrnsaver )
if( XSS_FOUND )
tde_save_and_set( CMAKE_REQUIRED_INCLUDES "${XSS_INCLUDE_DIRS}" )
check_library_exists( Xss XScreenSaverQueryInfo "${XSS_LIBRARY_DIRS}" HAVE_XSSLIB )
tde_restore( CMAKE_REQUIRED_INCLUDES )
else( XSS_FOUND )
check_library_exists( Xss XScreenSaverQueryInfo "" HAVE_XSSLIB )
endif( XSS_FOUND )
if( NOT HAVE_XSSLIB )
check_library_exists( Xext XScreenSaverQueryInfo "$(XEXT_LIBRARY_DIRS}" HAVE_XSSLIB )
if( HAVE_XSSLIB )
pkg_search_module( XSS xext )
endif( )
endif( )
check_include_file( X11/extensions/scrnsaver.h HAVE_XSCREENSAVER_H )
if( HAVE_XSSLIB AND HAVE_XSCREENSAVER_H )
set( HAVE_LIBXSS 1 )

Loading…
Cancel
Save