summaryrefslogtreecommitdiffstats
path: root/ConfigureChecks.cmake
diff options
context:
space:
mode:
Diffstat (limited to 'ConfigureChecks.cmake')
-rw-r--r--ConfigureChecks.cmake15
1 files changed, 3 insertions, 12 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 6b936f76..6a0e50de 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -64,19 +64,10 @@ if( (BUILD_QUANTA) OR (BUILD_KXSLDBG) OR (BUILD_KLINKSTATUS) )
##### check for libxml-2.0
- pkg_search_module( LIBXML libxml-2.0 )
+ pkg_search_module( LIBXML libxml-2.0>=2.6 )
if( NOT LIBXML_FOUND )
- tde_message_fatal( "libxml-2.0 is required but was not found on your system" )
- elseif( ${LIBXML_VERSION} VERSION_LESS "2.6" )
- tde_message_fatal( "libxml-2.0 version must be, at least, up to 2.6" )
- else()
- set( LIBXML_2_5 1 )
- tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
- set( CMAKE_REQUIRED_INCLUDES ${LIBXML_INCLUDE_DIRS} )
- set( CMAKE_REQUIRED_LIBRARIES ${LIBXML_LIBRARIES} )
- check_function_exists( xmlSetEntityReferenceFunc HAVE_INCLUDE_FIX )
- tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
+ tde_message_fatal( "libxml-2.0 version >= 2.6 is required but was not found on your system" )
endif( NOT LIBXML_FOUND )
@@ -128,7 +119,7 @@ if( (BUILD_QUANTA) OR (BUILD_KXSLDBG) OR (BUILD_KLINKSTATUS) )
tde_save( CMAKE_REQUIRED_INCLUDES )
set( CMAKE_REQUIRED_INCLUDES ${LIBXML_INCLUDE_DIRS} )
- check_include_file( "libxml/DOCBparser.h" LIBXML_DOCB_ENABLED )
+ set( LIBXML_DOCB_ENABLED 1 CACHE BOOL "Enable docbook input files" )
check_include_file( "libxml/xinclude.h" LIBXML_XINCLUDE_ENABLED )
tde_restore( CMAKE_REQUIRED_INCLUDES )