From f8d253ccce24a67582bb7bbbea67e753e72dd457 Mon Sep 17 00:00:00 2001 From: James Turner Date: Thu, 6 May 2010 16:44:27 +0100 Subject: [PATCH] Fix terrasync svn-library linkage - not perfect but now links against libsvn_subr correctly. Further cleanups by an autoconf expert would be most welcome. --- configure.ac | 6 +++--- utils/TerraSync/terrasync.cxx | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index ddd9ce5bf..1e6eb40a7 100644 --- a/configure.ac +++ b/configure.ac @@ -745,10 +745,9 @@ fi dnl Check for Subversion library support save_LIBS=$LIBS save_CPPFLAGS=$CPPFLAGS -LIBS="" +LIBS="`apr-1-config --link-ld`" CPPFLAGS="-I/usr/include/subversion-1 `apr-1-config --includes`" -AC_CHECK_LIB(svn_client-1, svn_client_checkout3) -AC_CHECK_HEADERS([svn_client.h glut.h]) +AC_CHECK_HEADERS([svn_client.h]) if test "x$ac_cv_header_svn_client_h" != "xyes"; then echo "TerraSync will shell out for command line subversion" svn_LIBS="" @@ -756,6 +755,7 @@ if test "x$ac_cv_header_svn_client_h" != "xyes"; then else echo "TerraSync will use integrated subversion library" AC_SEARCH_LIBS(svn_client_checkout, svn_client-1) + AC_SEARCH_LIBS(svn_cmdline_init, svn_subr-1) svn_LIBS=$LIBS svn_CPPFLAGS=$CPPFLAGS AC_SUBST(svn_LIBS) diff --git a/utils/TerraSync/terrasync.cxx b/utils/TerraSync/terrasync.cxx index f6c33c9b6..7404530e1 100644 --- a/utils/TerraSync/terrasync.cxx +++ b/utils/TerraSync/terrasync.cxx @@ -128,10 +128,6 @@ svn_opt_revision_t *mysvn_rev_peg = NULL; static const svn_version_checklist_t mysvn_checklist[] = { { "svn_subr", svn_subr_version }, { "svn_client", svn_client_version }, - { "svn_wc", svn_wc_version }, - { "svn_ra", svn_ra_version }, - { "svn_delta", svn_delta_version }, - { "svn_diff", svn_diff_version }, { NULL, NULL } }; -- 2.39.5