Add 3d cloud support back in

diff --git a/configure.ac b/configure.ac
index a98c8fbe893f824fbec0d25ab2f2ad2da38ef194..39f861fe3ef09fb4fec905a18bc5e4845c1a5c9c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -121,6 +121,10 @@ fi
 dnl Used by JSBSim to conditionally compile in fgfs interface code
 AC_DEFINE([FGFS], 1, [Define so that JSBSim compiles in 'library' mode])
 
+dnl Used to controll whether clouds3d should be compiled in or not
+AC_DEFINE([FG_USE_CLOUDS_3D], 1, [Define to use 3D cloud support])
+AM_CONDITIONAL(FG_USE_CLOUDS_3D, test "x$FG_USE_CLOUDS_3D" != "x")
+
 # Check for MS Windows environment
 AC_CHECK_HEADER(windows.h)
 

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index 7c737b01851e44e0921f3bf280a0c50da12cdda1..9981ded311714fdf5faac2d9298102d39b4d0f99 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -23,6 +23,12 @@ else
 THREAD_LIBS =
 endif
 
+if FG_USE_CLOUDS_3D
+CLOUD3D_LIBS = -lsgclouds3d
+else
+CLOUD3D_LIBS = 
+endif
+
 if HAVE_PLIB_PSL
 SCRIPTING_LIBS = $(top_builddir)/src/Scripting/libScripting.a
 PSL_LIBS = -lplibpsl
@@ -91,7 +97,7 @@ fgfs_LDADD = \
        $(WEATHER_LIBS) \
        -lsgroute -lsgsky -lsgsound -lsgephem -lsgmaterial -lsgtgdb -lsgmodel \
        -lsgtiming -lsgio -lsgscreen -lsgmath -lsgbucket -lsgprops -lsgdebug \
-       -lsgmagvar -lsgmisc -lsgxml -lsgsound -lsgserial \
+       -lsgmagvar -lsgmisc -lsgxml -lsgsound -lsgserial $(CLOUD3D_LIBS) \
        $(THREAD_LIBS) \
        -lplibpu -lplibfnt -lplibjs -lplibnet -lplibssg -lplibsg -lplibul \
        $(network_LIBS) \