X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=5f0dae1a8115624623d534547f4a8a8155ad6fba;hb=9dd0d403eaf05f4a9031444dd6ba1bcb115a0e3b;hp=cfebeeb50e28bf5d9948c78e6f1774b86b116426;hpb=3c7ebc5f8648f9afe3eaefd591e2b9e7b3938924;p=flightgear.git diff --git a/configure.ac b/configure.ac index cfebeeb50..5f0dae1a8 100644 --- 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" @@ -916,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: " @@ -929,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 @@ -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 depricated ATC/AI module: yes" -else - echo "Build depricated ATC/AI module: no" -fi -