- use color map information from new_gui.cxx and set puObject colors

[flightgear.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index cc8c61087fa079ab911ea58fc43edcfca42af392..845dc6924d24e07f5d73cb29f34958e91ab211d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,8 @@ case "${host}" in
     if test "$CXX" = "CC"; then
         AR="CC -ar"
         ARFLAGS="-o"
-        CXXFLAGS="$CXXFLAGS -I$with_simgear/include/simgear/compatibility"
+        CXXFLAGS="$CXXFLAGS -c99 -I$with_simgear/include/simgear/compatibility"
+        CFLAGS="$CFLAGS -c99"
     else
         AR="ar"
         ARFLAGS="cru"
@@ -96,10 +97,6 @@ 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 control 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" = "x")
-
 # Check for MS Windows environment
 AC_CHECK_HEADER(windows.h)
 
@@ -226,6 +223,7 @@ case "${host}" in
     fi
 
     LIBS="$LIBS -lglu32 -lopengl32 -luser32 -lgdi32"
+    joystick_LIBS="$joystick_LIBS -lwinmm"
 
     dnl add -lwsock32 for mingwin
     case "${host}" in
@@ -294,7 +292,7 @@ case "${host}" in
 
     AC_SEARCH_LIBS(alGenBuffers, openal32)
     AC_SEARCH_LIBS(alutInit, [ openal32 ALut ] )
-    LIBS="$LIBS -lwinmm -ldsound -ldxguid -lole32"
+    LIBS="$LIBS -ldsound -ldxguid -lole32"
     openal_LIBS="$LIBS"
     ;;
 
@@ -545,9 +543,10 @@ AC_CONFIG_FILES([ \
        src/Traffic/Makefile \
        tests/Makefile \
        utils/Makefile \
-       utils/TerraSync/Makefile \
-       utils/Modeller/Makefile \
+       utils/GPSsmooth/Makefile \
        utils/js_server/Makefile \
+       utils/Modeller/Makefile \
+       utils/TerraSync/Makefile \
 ])
 AC_OUTPUT