diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-26 14:12:45 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-11-08 03:06:29 +0100 |
| commit | a363983573b2a124129e77ed0e919820ec76efd7 (patch) | |
| tree | bc60cd2622031679fa52196ccaa21813c0818b09 | |
| parent | a27aa7c7afb551b104665bf74a3f3b4b9d52484a (diff) | |
| download | tdesdk-a363983573b2a124129e77ed0e919820ec76efd7.tar.gz tdesdk-a363983573b2a124129e77ed0e919820ec76efd7.zip | |
Fix FTBFS on newer subversion libraries
This closes Bug 872
(cherry picked from commit 572169a2e18705e526990c52924a268b218ff52b)
| -rw-r--r-- | kioslave/svn/ConfigureChecks.cmake | 12 |
1 files 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( ) |