Hi again,Another patch, this time targeting the check of subversion library support. The current checks in configure.ac are useless, the attached patch detects subversion appropriately if it is intalled.
Can someone review it and commit to the flightgear source CVS. Cheers, Jari
Index: configure.ac =================================================================== RCS file: /var/cvs/FlightGear-0.9/source/configure.ac,v retrieving revision 1.154 diff -u -p -r1.154 configure.ac --- configure.ac 17 Sep 2009 07:39:04 -0000 1.154 +++ configure.ac 31 Oct 2009 23:00:56 -0000 @@ -707,10 +707,10 @@ 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="" @@ -718,6 +718,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)
------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference
_______________________________________________ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
