Merge branch 'curt/release-stuff' into next

diff --combined configure.ac
index 9cda1ee5a0df79187ebeeb53fbb1a63873a310f8,b2a2b242e2a76609dc79570f5d654648cff513b9..df8ba3dcb4b4647d7633865b493a8e28a75724fc
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -175,17 -175,6 +175,17 @@@ els
  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 depricated atc/ai module], [enable_atcdcl="$enableval"] )
 +if test "x$enable_atcdcl" != "xno"; 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" != "xno")
 +
 +
  
  dnl EXPERIMENTAL generic event driven input device
  # defaults to no
@@@ -229,7 -218,6 +229,7 @@@ if test "x$with_threads" = "xyes"; the
  fi
  AC_CHECK_HEADER(pthread.h)
  
 +
  dnl Used by JSBSim to conditionally compile in fgfs interface code
  AC_DEFINE([FGFS], 1, [Define so that JSBSim compiles in 'library' mode])
  
@@@ -312,7 -300,7 +312,7 @@@ AC_SEARCH_LIBS(clock_gettime, rt
  base_LIBS="$LIBS"
  
  dnl Check for SDL or glut if enabled.
 -AC_ARG_ENABLE(osgviewer, [  --enable-osgviewer                  Configure to use osgViewer(default)], [enable_osgviewer="$enableval"])
 +AC_ARG_ENABLE(osgviewer, [  --enable-osgviewer             Configure to use osgViewer(default)], [enable_osgviewer="$enableval"])
  AC_ARG_ENABLE(sdl,  [  --enable-sdl                   Configure to use SDL], [enable_sdl="$enableval"])
  AC_ARG_ENABLE(glut, [  --enable-glut                  Configure to use GLUT], [enable_glut="$enableval"])
  AM_CONDITIONAL(USE_SDL, test "x$enable_sdl" = "xyes")
@@@ -512,7 -500,7 +512,7 @@@ if test "x$ac_cv_header_simgear_version
      exit
  fi
  
- AC_MSG_CHECKING([for SimGear 1.9.0 or newer])
+ AC_MSG_CHECKING([for SimGear 2.0.0 or newer])
  AC_TRY_RUN([
  #include <stdio.h>
  
@@@ -521,8 -509,8 +521,8 @@@
  #define STRINGIFY(X) XSTRINGIFY(X)
  #define XSTRINGIFY(X) #X
  
- #define MIN_MAJOR 1
- #define MIN_MINOR 9
+ #define MIN_MAJOR 2
+ #define MIN_MINOR 0
  #define MIN_MICRO 0
  
  int main() {
@@@ -627,48 -615,88 +627,48 @@@ dnl joystick li
  AC_DEFINE([ENABLE_PLIB_JOYSTICK], 1, [Define to enable plib joystick support])
  
  # Find the OSG libraries.  Note special handling for OS X frameworks
 -case "${host}" in
 -*-apple-darwin*)
 -    if test "x$with_osg_framework" = "x"; then
 -        if test "x$enable_osgdebug" = "xyes"; then
 -            # debug version of osg libs
 -            AC_CHECK_LIB(OpenThreadsd,OpenThreadsGetVersion)
 -            openthreads_LIBS="$LIBS"
 -            LIBS=""
 -            AC_CHECK_LIB(osgd,osgGetVersion)
 -            AC_CHECK_LIB(osgUtild,osgUtilGetVersion)
 -            AC_CHECK_LIB(osgDBd,osgDBGetVersion)
 -            AC_CHECK_LIB(osgTextd,osgTextGetVersion)
 -            AC_CHECK_LIB(osgGAd,osgGAGetVersion)
 -            AC_CHECK_LIB(osgViewerd,osgViewerGetVersion)
 -            AC_CHECK_LIB(osgSimd,osgSimGetVersion)
 -            AC_CHECK_LIB(osgParticled,osgParticleGetVersion)
 -            OSG_LIBS="$LIBS -losgFXd $openthreads_LIBS"
 -            LIBS=""
 -        else
 -            # release version of osg libs
 -            AC_CHECK_LIB(OpenThreads,OpenThreadsGetVersion)
 -            openthreads_LIBS="$LIBS"
 -            LIBS=""
 -            AC_CHECK_LIB(osg,osgGetVersion)
 -            AC_CHECK_LIB(osgUtil,osgUtilGetVersion)
 -            AC_CHECK_LIB(osgDB,osgDBGetVersion)
 -            AC_CHECK_LIB(osgText,osgTextGetVersion)
 -            AC_CHECK_LIB(osgGA,osgGAGetVersion)
 -            AC_CHECK_LIB(osgViewer,osgViewerGetVersion)
 -            AC_CHECK_LIB(osgSim,osgSimGetVersion)
 -            AC_CHECK_LIB(osgParticle,osgParticleGetVersion)
 -            OSG_LIBS="$LIBS -losgFX $openthreads_LIBS"
 -            LIBS=""
 -            # echo $LIBS
 -        fi
 -        AC_SUBST(openthreads_LIBS)
 -        AC_SUBST(OSG_LIBS)
 -    else
 -        # Checking osg frameworks.
 -        AC_CHECK_FRAMEWORK(osgViewer, [#include <osgViewer/Version>], $with_osg_framework)
 -        AC_CHECK_FRAMEWORK(osgGA, [#include <osgGA/Version>], $with_osg_framework)
 -        AC_CHECK_FRAMEWORK(osgText, [#include <osgText/Version>], $with_osg_framework)
 -        AC_CHECK_FRAMEWORK(osgFX, [#include <osgFX/AnisotropicLighting>], $with_osg_framework)
 -        AC_CHECK_FRAMEWORK(osgUtil, [#include <osgUtil/Version>], $with_osg_framework)
 -        AC_CHECK_FRAMEWORK(osgDB, [#include <osgDB/Version>], $with_osg_framework)
 -        AC_CHECK_FRAMEWORK(osgSim, [#include <osgSim/Version>], $with_osg_framework)
 -        AC_CHECK_FRAMEWORK(osgParticle, [#include <osgParticle/Version>], $with_osg_framework)
 -        AC_CHECK_FRAMEWORK(osg, [#include <osg/Version>], $with_osg_framework)
 -        osg_FRAMEWORKS="$FRAMEWORKS"
 -        FRAMEWORKS=""
 -        AC_CHECK_FRAMEWORK(OpenThreads, [#include <OpenThreads/Version>], $with_osg_framework)
 -        openthreads_FRAMEWORK="$FRAMEWORKS"
 -        AC_SUBST(osg_FRAMEWORKS)
 -        AC_SUBST(openthreads_FRAMEWORK)
 -    fi
 -    ;;
 -*)
 +if test "x$with_osg_framework" = "x"; then
      if test "x$enable_osgdebug" = "xyes"; then
 -        AC_CHECK_LIB(OpenThreadsd,OpenThreadsGetVersion)
 -        AC_CHECK_LIB(osgd,osgGetVersion)
 -        AC_CHECK_LIB(osgUtild,osgUtilGetVersion)
 -        AC_CHECK_LIB(osgDBd,osgDBGetVersion)
 -        AC_CHECK_LIB(osgTextd,osgTextGetVersion)
 -        AC_CHECK_LIB(osgGAd,osgGAGetVersion)
 -        AC_CHECK_LIB(osgViewerd,osgViewerGetVersion)
 -        AC_CHECK_LIB(osgSimd,osgSimGetVersion)
 -        AC_CHECK_LIB(osgParticled,osgParticleGetVersion)
 -        LIBS="$LIBS -losgFXd $opengl_LIBS"
 +        AC_CHECK_LIB(OpenThreadsd,OpenThreadsGetVersion, , [AC_MSG_ERROR(OpenThreads library not found.)],)
 +        AC_CHECK_LIB(osgd,osgGetVersion, , [AC_MSG_ERROR(OpenSceneGraph library not found.)],)
 +        AC_CHECK_LIB(osgUtild,osgUtilGetVersion, , [AC_MSG_ERROR(OpenSceneGraph utility library not found.)],)
 +        AC_CHECK_LIB(osgDBd,osgDBGetVersion, , [AC_MSG_ERROR(OpenSceneGraph database library not found.)],)
 +        AC_CHECK_LIB(osgTextd,osgTextGetVersion, , [AC_MSG_ERROR(OpenSceneGraph Text library not found.)],)
 +        AC_CHECK_LIB(osgGAd,osgGAGetVersion, , [AC_MSG_ERROR(OpenSceneGraph GUI Abstraction library not found.)],)
 +        AC_CHECK_LIB(osgViewerd,osgViewerGetVersion, , [AC_MSG_ERROR(OpenSceneGraph Viewer library not found.)],)
 +        AC_CHECK_LIB(osgSimd,osgSimGetVersion, , [AC_MSG_ERROR(OpenSceneGraph simulation library not found.)],)
 +        AC_CHECK_LIB(osgParticled,osgParticleGetVersion, , [AC_MSG_ERROR(OpenSceneGraph Particle library not found.)],)
 +        AC_CHECK_LIB(osgFXd, osgFXGetVersion, , [AC_MSG_ERROR(OpenSceneGraph FX library not found.)],)
      else
 -        AC_CHECK_LIB(OpenThreads,OpenThreadsGetVersion)
 -        AC_CHECK_LIB(osg,osgGetVersion)
 -        AC_CHECK_LIB(osgUtil,osgUtilGetVersion)
 -        AC_CHECK_LIB(osgDB,osgDBGetVersion)
 -        AC_CHECK_LIB(osgText,osgTextGetVersion)
 -        AC_CHECK_LIB(osgGA,osgGAGetVersion)
 -        AC_CHECK_LIB(osgViewer,osgViewerGetVersion)
 -        AC_CHECK_LIB(osgSim,osgSimGetVersion)
 -        AC_CHECK_LIB(osgParticle,osgParticleGetVersion)
 -        LIBS="$LIBS -losgFX $opengl_LIBS"
 +        AC_CHECK_LIB(OpenThreads,OpenThreadsGetVersion, , [AC_MSG_ERROR(OpenThreads library not found.)],)
 +        AC_CHECK_LIB(osg,osgGetVersion, , [AC_MSG_ERROR(OpenSceneGraph library not found.)],)
 +        AC_CHECK_LIB(osgUtil,osgUtilGetVersion, , [AC_MSG_ERROR(OpenSceneGraph utility library not found.)],)
 +        AC_CHECK_LIB(osgDB,osgDBGetVersion, , [AC_MSG_ERROR(OpenSceneGraph database library not found.)],)
 +        AC_CHECK_LIB(osgText,osgTextGetVersion, , [AC_MSG_ERROR(OpenSceneGraph Text library not found.)],)
 +        AC_CHECK_LIB(osgGA,osgGAGetVersion, , [AC_MSG_ERROR(OpenSceneGraph GUI Abstraction library not found.)],)
 +        AC_CHECK_LIB(osgViewer,osgViewerGetVersion, , [AC_MSG_ERROR(OpenSceneGraph Viewer library not found.)],)
 +        AC_CHECK_LIB(osgSim,osgSimGetVersion, , [AC_MSG_ERROR(OpenSceneGraph simulation library not found.)],)
 +        AC_CHECK_LIB(osgParticle,osgParticleGetVersion, , [AC_MSG_ERROR(OpenSceneGraph Particle library not found.)],)
 +        AC_CHECK_LIB(osgFX, osgFXGetVersion, , [AC_MSG_ERROR(OpenSceneGraph FX library not found.)],)
      fi
 -    ;;
 -esac
 +else
 +    # Checking osg frameworks.
 +    AC_CHECK_FRAMEWORK(osgViewer, [#include <osgViewer/Version>], $with_osg_framework)
 +    AC_CHECK_FRAMEWORK(osgGA, [#include <osgGA/Version>], $with_osg_framework)
 +    AC_CHECK_FRAMEWORK(osgText, [#include <osgText/Version>], $with_osg_framework)
 +    AC_CHECK_FRAMEWORK(osgFX, [#include <osgFX/AnisotropicLighting>], $with_osg_framework)
 +    AC_CHECK_FRAMEWORK(osgUtil, [#include <osgUtil/Version>], $with_osg_framework)
 +    AC_CHECK_FRAMEWORK(osgDB, [#include <osgDB/Version>], $with_osg_framework)
 +    AC_CHECK_FRAMEWORK(osgSim, [#include <osgSim/Version>], $with_osg_framework)
 +    AC_CHECK_FRAMEWORK(osgParticle, [#include <osgParticle/Version>], $with_osg_framework)
 +    AC_CHECK_FRAMEWORK(osg, [#include <osg/Version>], $with_osg_framework)
 +    osg_FRAMEWORKS="$FRAMEWORKS"
 +    FRAMEWORKS=""
 +    AC_CHECK_FRAMEWORK(OpenThreads, [#include <OpenThreads/Version>], $with_osg_framework)
 +    openthreads_FRAMEWORK="$FRAMEWORKS"
 +    AC_SUBST(osg_FRAMEWORKS)
 +    AC_SUBST(openthreads_FRAMEWORK)
 +fi
  AM_CONDITIONAL(HAVE_FRAMEWORK_OSG, test "x$ac_cv_framework_osg" != "x")
  
  AC_CHECK_HEADER(osg/Version)
@@@ -914,8 -942,3 +914,8 @@@ els
      echo "Include special purpose flight models: no"
  fi
  
 +if test "x$enable_atcdcl" != "xno"; then
 +    echo "Build depricated ATC/AI module: yes"
 +else
 +    echo "Build depricated ATC/AI module: no"
 +fi