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

[flightgear.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 72da404be15f12aafba4c6b9869273556e0a3e65..5f0dae1a8115624623d534547f4a8a8155ad6fba 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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])
@@ -779,7 +769,7 @@ save_CPPFLAGS=$CPPFLAGS
 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="-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"
@@ -945,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 deprecated ATC/AI module: yes"
-else
-    echo "Build deprecated ATC/AI module: no"
-fi
-