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

[simgear.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9a9b2bb53a54c41f65a17c949dc1f97a0f949e14..09caad866497b2752795ba82bbc42e0de7f9c783 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,9 @@ AM_INIT_AUTOMAKE([dist-bzip2])
 AC_ARG_ENABLE(headless,
         AS_HELP_STRING([--enable-headless],[Enable only packages for headless build]))
 
+AC_ARG_ENABLE(osgdebug,
+                AS_HELP_STRING([--enable-osgdebug],[Enable debug OSG libraries]))
+                
 AC_MSG_CHECKING([for headless mode])
 AC_MSG_RESULT([$enable_headless])
 
@@ -395,7 +398,7 @@ case "${host}" in
 
 esac
 
-if test "$OPENAL_OK" == "no" -a "x$enable_headless" != "xyes"; then
+if test "$OPENAL_OK" = "no" -a "x$enable_headless" != "xyes"; then
     echo
     echo "You *must* have the openal library installed on your system to build"
     echo "SimGear!"
@@ -406,7 +409,7 @@ if test "$OPENAL_OK" == "no" -a "x$enable_headless" != "xyes"; then
     exit
 fi
 
-if test "$ALUT_OK" == "no" -a "x$enable_headless" != "xyes"; then
+if test "$ALUT_OK" = "no" -a "x$enable_headless" != "xyes"; then
     echo
     echo "You *must* have the alut library installed on your system to build"
     echo "SimGear!"
@@ -437,6 +440,8 @@ AM_CONDITIONAL(EXTGL_NEEDED, test "x$ac_cv_header_windows_h" = "xyes")
 CXXCPP="g++ -E"
 AC_LANG_PUSH(C++)
 
+LIBS="$base_LIBS"
+
 # OpenSceneGraph
 case "${host}" in
 *-apple-darwin*)
@@ -497,6 +502,10 @@ if test "x$ac_cv_header_osg_Version" != "xyes" -o "x$ac_cv_lib_OpenThreads_OpenT
   fi
 fi
 
+osg_LIBS="$LIBS"
+AC_SUBST(osg_LIBS)
+LIBS="$base_LIBS"
+
 AC_CHECK_HEADER(boost/version.hpp)
 if test "x$ac_cv_header_boost_version_hpp" != "xyes"; then
     echo
@@ -540,6 +549,39 @@ if test "x$ac_cv_header_zlib_h" != "xyes"; then
     echo
 fi
 
+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 built-in subversion (libsvn) for simgear [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 "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. Will use command line subversion for scenery downloads."
+       svn_LIBS=""
+       svn_CPPFLAGS=""
+       fi
+else
+echo "Libsvn explicitly disabled. Will use command line subversion for scenery downloads."
+  svn_LIBS=""
+  svn_CPPFLAGS=""
+fi
+LIBS=$save_LIBS
+CPPFLAGS=$save_CPPFLAGS
+
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS( \
@@ -596,6 +638,7 @@ AC_CONFIG_FILES([ \
        simgear/scene/sky/Makefile \
        simgear/scene/tgdb/Makefile \
        simgear/scene/util/Makefile \
+       simgear/scene/tsync/Makefile \
        simgear/screen/Makefile \
        simgear/serial/Makefile \
        simgear/sound/Makefile \