X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=5f0dae1a8115624623d534547f4a8a8155ad6fba;hb=9dd0d403eaf05f4a9031444dd6ba1bcb115a0e3b;hp=1320db791cf95c524d2e450ac2c41ec2e5cb7b38;hpb=b3c6f94b89f265cabcd0ae35cd66286fdcf0184e;p=flightgear.git

diff --git a/configure.ac b/configure.ac
index 1320db791..5f0dae1a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autogen.sh to produce a working configure
 dnl script.
 
-AC_INIT(FlightGear, m4_esyscmd([cat version]), [http://www.flightgear.org])
+AC_INIT(FlightGear, m4_esyscmd([cat ./version | tr -d '\n']), [http://www.flightgear.org])
 
 dnl Ensure touching the version causes autoconf to re-run
 AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/version'])
@@ -25,7 +25,7 @@ if test "x$BUILD_ID" != "x" ; then
     AC_SUBST([HUDSON_BUILD_NUMBER], $BUILD_NUMBER)
 else
     AC_SUBST([HUDSON_BUILD_ID], [none])
-    AC_SUBST([HUDSON_BUILD_NUMBER], [none])
+    AC_SUBST([HUDSON_BUILD_NUMBER], 0)
 fi
 
 AC_CHECK_PROG([HAVE_GIT], git, 1)
@@ -209,16 +209,6 @@ else
 fi
 AM_CONDITIONAL(ENABLE_SP_FDM, test "x$enable_sp_fdms" != "xno")
 
-# Specify whether we want to compile ATCDCL.
-# default to with_atcdcl=yes
-AC_ARG_ENABLE(atcdcl, [  --enable-atcdcl                Compile and link the deprecated atc/ai module], [], [enable_atcdcl="$enableval"] )
-if test "x$enable_atcdcl" = "xyes"; then
-    AC_DEFINE([ENABLE_ATCDCL], 1, [Define to include old ATC/AI module])
-else
-    AC_DEFINE([ENABLE_ATCDCL], 0, [Define to include old ATC/AI module])
-fi
-AM_CONDITIONAL(ENABLE_ATCDCL, test "x$enable_atcdcl" = "xyes")
-
 dnl EXPERIMENTAL generic event driven input device
 # defaults to no
 AC_ARG_WITH(eventinput, [  --with-eventinput       Include event driven input (EXPERIMENTAL) [default=no]], [], [with_eventinput=no])
@@ -773,23 +763,31 @@ if test "x$ac_cv_header_zlib_h" != "xyes"; then
 fi
 
 dnl Check for Subversion library support
+# libsvn support defaults to yes
 save_LIBS=$LIBS
 save_CPPFLAGS=$CPPFLAGS
-LIBS="`apr-1-config --link-ld`"
-CPPFLAGS="-I/usr/include/subversion-1 `apr-1-config --includes`"
-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"
+AC_ARG_WITH(libsvn, [  --without-libsvn        Do not use libsvn for terrasync [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)
+	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"
+	svn_LIBS=""
+	svn_CPPFLAGS=""
+       fi
+else
+echo "Libsvn explicitly disabled. TerraSync will use command line subversion"
   svn_LIBS=""
   svn_CPPFLAGS=""
-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)
-  AC_SUBST(svn_CPPFLAGS)
 fi
 LIBS=$save_LIBS
 CPPFLAGS=$save_CPPFLAGS
@@ -908,9 +906,9 @@ echo "================="
 echo "Prefix: $prefix"
 
 if test "x$with_logging" != "x"; then
-    echo "Debug messages: $with_logging"
+    echo "Log messages: $with_logging"
 else
-    echo "Debug messages: yes"
+    echo "Log messages: yes"
 fi
 
 echo -n "Automake version: "
@@ -921,15 +919,15 @@ if test "x$with_multiplayer" != "xno"; then
 fi
 
 if test "x$with_threads" = "xyes"; then
-    echo "threads: yes"
+    echo "Threads: yes"
 else
-    echo "threads: no"
+    echo "Threads: no"
 fi
 
 if test "x$with_eventinput" = "xyes"; then
-    echo "event input: yes"
+    echo "Event input: yes"
 else
-    echo "event input: no"
+    echo "Event input: no"
 fi
 
 if test "x$enable_sp_fdms" != "xno"; then
@@ -937,10 +935,3 @@ if test "x$enable_sp_fdms" != "xno"; then
 else
     echo "Include special purpose flight models: no"
 fi
-
-if test "x$enable_atcdcl" = "xyes"; then
-    echo "Build depricated ATC/AI module: yes"
-else
-    echo "Build depricated ATC/AI module: no"
-fi
-