Merge branch 'next' of http://git.gitorious.org/fg/flightgear into next

[flightgear.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b64b972ff6090e3a1f96caa04745cdfa7d38abb7..179d63f514e6d55b33fea8c6b569ce039a65bd9c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -819,26 +819,29 @@ dnl Check for Subversion library support
 # libsvn support defaults to yes
 save_LIBS=$LIBS
 save_CPPFLAGS=$CPPFLAGS
-AC_ARG_WITH(libsvn, [  --without-libsvn        Do not use libsvn for terrasync [default=no]], [], [with_libsvn=yes])
+AC_ARG_WITH(libsvn, [  --without-libsvn        Do not use built-in subversion (libsvn) for terrasync/fgfs [default=no]], [], [with_libsvn=yes])
 if test "x$with_libsvn" = "xyes"; then
     LIBS="`apr-1-config --link-ld`"
     CPPFLAGS="-I/usr/include/subversion-1 `apr-1-config --includes --cppflags`"
     AC_CHECK_HEADERS([svn_client.h])
        if test "x$ac_cv_header_svn_client_h" = "xyes"; then
-       echo "TerraSync will use libsvn"
-       AC_SEARCH_LIBS(svn_client_checkout, svn_client-1)
-       AC_SEARCH_LIBS(svn_cmdline_init, svn_subr-1)
+       echo "Using built-in subversion (libsvn) for scenery downloads."
+       AC_SEARCH_LIBS(svn_client_checkout, svn_client-1,
+                      [AC_DEFINE([HAVE_LIBSVN_CLIENT_1], [1], [Define to 1 if you have libsvn_client-1])],
+                      [AC_MSG_ERROR(svn_client-1 library not found.)],)
+       AC_SEARCH_LIBS(svn_cmdline_init, svn_subr-1, , [AC_MSG_ERROR(svn_subr-1 library not found.)],)
+       AC_SEARCH_LIBS(svn_ra_initialize, svn_ra-1, , [AC_MSG_ERROR(svn_ra-1 library not found.)],)
        svn_LIBS=$LIBS
        svn_CPPFLAGS=$CPPFLAGS
        AC_SUBST(svn_LIBS)
        AC_SUBST(svn_CPPFLAGS)
        else
-       echo "Libsvn not found. TerraSync will use command line subversion"
+       echo "Libsvn not found. Will use command line subversion for scenery downloads."
        svn_LIBS=""
        svn_CPPFLAGS=""
        fi
 else
-echo "Libsvn explicitly disabled. TerraSync will use command line subversion"
+echo "Libsvn explicitly disabled. Will use command line subversion for scenery downloads."
   svn_LIBS=""
   svn_CPPFLAGS=""
 fi