From a363983573b2a124129e77ed0e919820ec76efd7 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 26 Jun 2012 14:12:45 -0500 Subject: [PATCH] Fix FTBFS on newer subversion libraries This closes Bug 872 (cherry picked from commit 572169a2e18705e526990c52924a268b218ff52b) --- kioslave/svn/ConfigureChecks.cmake | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/kioslave/svn/ConfigureChecks.cmake b/kioslave/svn/ConfigureChecks.cmake index 81358c60..3d46c748 100644 --- a/kioslave/svn/ConfigureChecks.cmake +++ b/kioslave/svn/ConfigureChecks.cmake @@ -19,12 +19,16 @@ endif( ) # check for subversion library -check_library_exists( "svn_client-1" "svn_pool_create_ex" "${SVN_LIBRARY_DIR}" HAVE_SVN_POOL_CREATE_EX ) - -if( HAVE_SVN_POOL_CREATE_EX ) +check_library_exists( "svn_client-1" "svn_pool_create_ex" "${SVN_LIBRARY_DIR}" HAVE_SVN_POOL_CREATE_EX_SVN_CLIENT ) +if( HAVE_SVN_POOL_CREATE_EX_SVN_CLIENT ) set( SVN_LIBRARIES "svn_client-1;svn_subr-1;svn_ra-1" ) else( ) - tde_message_fatal( "svn_client-1 library was not found on your system.\n Subversion is installed?\n Try to set SVN_LIBRARY_DIR to subversion library directory." ) + check_library_exists( "svn_subr-1" "svn_pool_create_ex" "${SVN_LIBRARY_DIR}" HAVE_SVN_POOL_CREATE_EX_SUBR ) + if( HAVE_SVN_POOL_CREATE_EX_SUBR ) + set( SVN_LIBRARIES "svn_client-1;svn_subr-1;svn_ra-1" ) + else( ) + tde_message_fatal( "svn_client-1 or svn_subr-1 library was not found on your system.\n Subversion is installed?\n Try to set SVN_LIBRARY_DIR to subversion library directory." ) + endif( ) endif( )