On 2/5/10 4:04 PM, Geoff McLane wrote:
But I have had more time to write, and test a BETTER patch attached that :- (a) does NOT change the svn_client.h lines ;=((,
(a) should be changed, I agree with your original proposal.Actually I think subversion support in terrasync should be removed altogether or fixed. If removed then all svn checks could be removed.
And I hope your other 'svn' changes also make it into CVS...
I attach my suggested svn related changes to configure.ac for reference for other new builders of fg. Note, apply the patch cautiously since having svn calls in terrasync may lock the terrasync-WC directories in some cases (with fairly high probability).
Maybe there should be a check for APR but I suppose that if svn-devel package are installed then also apr will be available.
Geoff, how do you make it through the svn check in configure.ac or really building terrasync?
Jari
Index: configure.ac =================================================================== RCS file: /var/cvs/FlightGear-0.9/source/configure.ac,v retrieving revision 1.166 diff -u -p -r1.166 configure.ac --- configure.ac 5 Feb 2010 05:40:15 -0000 1.166 +++ configure.ac 5 Feb 2010 16:40:26 -0000 @@ -787,10 +803,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="" @@ -798,6 +813,11 @@ if test "x$ac_cv_header_svn_client_h" != else echo "TerraSync will use integrated subversion library" AC_SEARCH_LIBS(svn_client_checkout, svn_client-1) + AC_SEARCH_LIBS(svn_delta_version, svn_delta-1) + AC_SEARCH_LIBS(svn_diff_version, svn_diff-1) + AC_SEARCH_LIBS(svn_ra_initialize, svn_ra-1) + AC_SEARCH_LIBS(svn_pool_create_ex, svn_subr-1) + AC_SEARCH_LIBS(svn_wc_version, svn_wc-1) svn_LIBS=$LIBS svn_CPPFLAGS=$CPPFLAGS AC_SUBST(svn_LIBS)
------------------------------------------------------------------------------ The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away. http://p.sf.net/sfu/theplanet-com
_______________________________________________ Flightgear-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/flightgear-devel
