Merge branch 'durk/atcdcl-cond'

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

diff --cc configure.ac
index fda72f9fc2ef00d83d3f6c67465b3515db4a7723,1c1fa96132cbd491840954690d4ceb6d9897cd05..d1600c1754c0955f3a6179b2b674b007c0bacc88
--- 1/configure.ac
--- 2/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 af0f729e7225f839b7f018f7f09b3f1117602b21,a04b6fc817ca26533b442b1ee90ab3cdaf982347..ef5a0a01f8dac2c2d767c1c1b040164a3d4dc093
--- 1/src/ATC/trafficcontrol.cxx
--- 2/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/ATC/trafficcontrol.hxx
Simple merge

diff --cc src/Airports/groundnetwork.cxx
Simple merge

diff --cc src/Main/Makefile.am
index b4e2d592e6e7fc0cf4a04376c0b693092ea47f72,996c63e11b59502cde33cfe8ad3195654d50034c..e0798d6d421c692834f9cec2e4d710e7366b5556
--- 1/src/Main/Makefile.am
--- 2/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@@ -9,6 -9,19 +9,13 @@@ els
  SP_FDM_LIBS = 
  endif
  
 -if WITH_THREADS
 -THREAD_LIBS = -lsgthreads $(thread_LIBS)
 -else
 -THREAD_LIBS =
 -endif
 -
+ if ENABLE_ATCDCL
+ ATCDCL_LIBS = $(top_builddir)/src/ATCDCL/libATCDCL.a
+ else
+ ATCDCL_LIBS = 
+ endif
+ 
+ 
  if WITH_EVENTINPUT
  EVENT_LIBS = $(eventinput_LIBS)
  else

diff --cc src/Main/fg_init.cxx
Simple merge