fly/flightgear
1
0
Fork 0
Code Activity

Fix terrasync svn-library linkage - not perfect but now links against libsvn_subr correctly.

Browse source 
Further cleanups by an autoconf expert would be most welcome.
This commit is contained in:
James Turner 2010-05-06 16:44:27 +01:00
parent 59215b098c
commit f8d253ccce
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure.ac
View file

@ -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)

4
utils/TerraSync/terrasync.cxx
View file

@ -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 }
};