X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=dde173e0818935b3c634ed037be1c4c53f462afb;hb=0dfdbf8499728639ec399ff7bd7ed5bcb383ca04;hp=85a50bd6b17696d9835d22ae487ee9510a625c6d;hpb=9d63f97cf645ac6a488db7e432fd381deff91e9a;p=flightgear.git

diff --git a/configure.ac b/configure.ac
index 85a50bd6b..dde173e08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
@@ -645,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 \