From: Tim Moore <timoore33@gmail.com>
Date: Tue, 9 Feb 2010 23:45:06 +0000 (+0100)
Subject: Merge branch 'durk/atcdcl-cond'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=988a6771aaf6657ed02e24d32a286e943386857b;p=flightgear.git

Merge branch 'durk/atcdcl-cond'

Conflicts:
	src/ATC/trafficcontrol.cxx
	src/Main/Makefile.am
---

988a6771aaf6657ed02e24d32a286e943386857b
diff --cc configure.ac
index fda72f9fc,1c1fa9613..d1600c175
--- a/configure.ac
+++ b/configure.ac
@@@ -217,7 -211,9 +228,8 @@@ if test "x$with_threads" = "xyes"; the
      CFLAGS="$CFLAGS -D_REENTRANT"
  fi
  AC_CHECK_HEADER(pthread.h)
 -AM_CONDITIONAL(WITH_THREADS, test "x$with_threads" = "xyes")
  
+ 
  dnl Used by JSBSim to conditionally compile in fgfs interface code
  AC_DEFINE([FGFS], 1, [Define so that JSBSim compiles in 'library' mode])
  
diff --cc src/ATC/trafficcontrol.cxx
index af0f729e7,a04b6fc81..ef5a0a01f
--- a/src/ATC/trafficcontrol.cxx
+++ b/src/ATC/trafficcontrol.cxx
@@@ -479,11 -453,8 +479,10 @@@ void FGATCController::transmit(FGTraffi
      // Display ATC message only when one of the radios is tuned
      // the relevant frequency.
      // Note that distance attenuation is currently not yet implemented
-     //cerr << "Transmitting " << text << " at " << stationFreq;
      if ((onBoardRadioFreqI0 == stationFreq) || (onBoardRadioFreqI1 == stationFreq)) {
 -        fgSetString("/sim/messages/atc", text.c_str());
 +        if (rec->allowTransmissions()) {
 +            fgSetString("/sim/messages/atc", text.c_str());
 +        }
      }
  }
  
diff --cc src/Main/Makefile.am
index b4e2d592e,996c63e11..e0798d6d4
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@@ -9,6 -9,19 +9,13 @@@ els
  SP_FDM_LIBS = 
  endif
  
+ if ENABLE_ATCDCL
+ ATCDCL_LIBS = $(top_builddir)/src/ATCDCL/libATCDCL.a
+ else
+ ATCDCL_LIBS = 
+ endif
+ 
+ 
 -if WITH_THREADS
 -THREAD_LIBS = -lsgthreads $(thread_LIBS)
 -else
 -THREAD_LIBS =
 -endif
 -
  if WITH_EVENTINPUT
  EVENT_LIBS = $(eventinput_LIBS)
  else