Add the alpha test back in so the instruments won't disappear after changing the...

[flightgear.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 39897e0367a26bd7961ed8058e9fda308a93c5b1..59fa9a6594ce12160610fc7152d967eca995d5fb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_PREREQ(2.52)
 dnl Initialize the automake stuff
 dnl set the $host variable based on local machine/os
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(FlightGear, 0.9.10)
+AM_INIT_AUTOMAKE(FlightGear, 1.99.4)
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET
@@ -98,7 +98,7 @@ if test "x$with_logging" = "xno" ; then
     AC_DEFINE([FG_NDEBUG], 1, [Define for no logging output])
 fi
 
-AC_ARG_ENABLE(sp_fdms, [  --enable-sp-fdms              Include special purpose Flight Models], [enable_sp_fdms="$enableval"] )
+AC_ARG_ENABLE(sp_fdms, [  --enable-sp-fdms               Include special purpose Flight Models], [enable_sp_fdms="$enableval"] )
 if test "x$enable_sp_fdms" != "xno"; then
     AC_DEFINE([ENABLE_SP_FDM], 1, [Define to include special purpose FDMs])
 else
@@ -197,23 +197,25 @@ AC_SEARCH_LIBS(dlclose, dl)
 
 base_LIBS="$LIBS"
 
-dnl Check for SDL if enabled.
-AC_ARG_ENABLE(sdl, [  --enable-sdl                  Configure to use SDL instead of GLUT], [enable_sdl="$enableval"])
-AC_ARG_ENABLE(osgviewer, [  --enable-osgviewer                  Configure to use osgViewer], [enable_osgviewer="$enableval"])
+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(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")
-AM_CONDITIONAL(USE_OSGVIEWER, test "x$enable_osgviewer" = "xyes")
-if test "x$enable_sdl" = "xyes"; then
-    AC_DEFINE([PU_USE_SDL], 1, [Define to use SDL])
-else
-    if test "x$enable_osgviewer" = "xyes"; then
-       AC_DEFINE([ENABLE_OSGVIEWER], 1, [Define to use osgViewer in renderer])
-       AC_DEFINE([PU_USE_NATIVE], 1, [Define to use native system])
-    else
-        AC_DEFINE([PU_USE_GLUT], 1, [Define to use glut])
-    fi
+AM_CONDITIONAL(USE_GLUT, test "x$enable_glut" = "xyes")
+if test "x$enable_sdl" != "xyes" -a "x$enable_glut" != "xyes" -a "x$enable_osgviewer" != "xno"; then
+   enable_osgviewer="yes"
+fi
+if test \( "x$enable_osgviewer" = "xyes" \
+   -a \( "x$enable_sdl" = "xyes" -o "x$enable_glut" = "xyes" \) \) \
+   -o \( "x$enable_sdl" = "xyes" -a "x$enable_glut" = "xyes" \); then
+   echo " Only one of --enable-osgviewer, --enable-sdl, or --enable -glut may"
+   echo " be supplied."
+   exit
 fi
+AC_DEFINE([PU_USE_NONE], 1, [Define to use application's pu callbacks])
 
-AC_ARG_ENABLE(osgdebug, [  --enable-osgdebug                  Use OSG debug libraries], [enable_osgdebug="$enableval"])
+AC_ARG_ENABLE(osgdebug, [  --enable-osgdebug              Use OSG debug libraries], [enable_osgdebug="$enableval"])
 
 dnl check for OpenGL related libraries
 case "${host}" in
@@ -464,11 +466,11 @@ if test "x$ac_cv_header_plib_ul_h" != "xyes"; then
     exit
 fi
 
-AC_MSG_CHECKING([for plib 1.8.4 or newer])
+AC_MSG_CHECKING([for plib 1.8.5 or newer])
 AC_TRY_RUN([
 #include <plib/ul.h>
 
-#define MIN_PLIB_VERSION 184
+#define MIN_PLIB_VERSION 185
 
 int main() {
     int major, minor, micro;
@@ -483,7 +485,7 @@ int main() {
 ],
   AC_MSG_RESULT(yes),
   [AC_MSG_RESULT(wrong version);
-   AC_MSG_ERROR([Install plib 1.8.4 or later first...])],
+   AC_MSG_ERROR([Install plib 1.8.5 or later first...])],
   AC_MSG_RESULT(yes)
 )
 
@@ -534,6 +536,7 @@ case "${host}" in
         AC_CHECK_LIB(osgUtild,osgUtilGetVersion)
         AC_CHECK_LIB(osgDBd,osgDBGetVersion)
         AC_CHECK_LIB(osgSimd,osgSimGetVersion)
+        AC_CHECK_LIB(osgParticled,osgParticleGetVersion)
         AC_CHECK_LIB(osgd,osgGetVersion)
         AC_CHECK_LIB(OpenThreadsd,OpenThreadsGetVersion)
     else
@@ -544,6 +547,7 @@ case "${host}" in
         AC_CHECK_FRAMEWORK(osgUtil, [#include <osgUtil/Version>])
         AC_CHECK_FRAMEWORK(osgDB, [#include <osgDB/Version>])
         AC_CHECK_FRAMEWORK(osgSim, [#include <osgSim/Version>])
+        AC_CHECK_FRAMEWORK(osgParticle, [#include <osgParticle/Version>])
         AC_CHECK_FRAMEWORK(osg, [#include <osg/Version>])
         AC_CHECK_FRAMEWORK(OpenThreads, [#include <OpenThreads/Version>])
     fi
@@ -558,6 +562,7 @@ case "${host}" in
         AC_CHECK_LIB(osgGAd,osgGAGetVersion)
         AC_CHECK_LIB(osgViewerd,osgViewerGetVersion)
         AC_CHECK_LIB(osgSimd,osgSimGetVersion)
+        AC_CHECK_LIB(osgParticled,osgParticleGetVersion)
         LIBS="$LIBS -losgFXd"
     else
         AC_CHECK_LIB(OpenThreads,OpenThreadsGetVersion)
@@ -568,6 +573,7 @@ case "${host}" in
         AC_CHECK_LIB(osgGA,osgGAGetVersion)
         AC_CHECK_LIB(osgViewer,osgViewerGetVersion)
         AC_CHECK_LIB(osgSim,osgSimGetVersion)
+        AC_CHECK_LIB(osgParticle,osgParticleGetVersion)
         LIBS="$LIBS -losgFX"
     fi
     ;;
@@ -641,11 +647,11 @@ AC_CONFIG_FILES([ \
        src/Aircraft/Makefile \
        src/Airports/Makefile \
        src/ATC/Makefile \
+       src/ATCDCL/Makefile \
        src/Autopilot/Makefile \
        src/Cockpit/Makefile \
        src/Cockpit/built_in/Makefile \
        src/Environment/Makefile \
-       src/FDM/Balloon/Makefile \
        src/FDM/ExternalNet/Makefile \
        src/FDM/ExternalPipe/Makefile \
        src/FDM/JSBSim/Makefile \