From bcc42cbe4c8f6de7da8a646301f4eabe39eead21 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Mon, 22 Mar 2004 20:19:18 +0000
Subject: [PATCH] Various final tweaks for the 0.9.4.pre1 release.

---
 FlightGear.dsp             | 679 ++++++++++---------------------------
 NEWS                       |  10 +-
 configure.ac               |   8 +-
 src/FDM/JSBSim/Makefile.am |   1 +
 utils/Modeller/Makefile.am |   6 +-
 5 files changed, 196 insertions(+), 508 deletions(-)

diff --git a/FlightGear.dsp b/FlightGear.dsp
index 0ca7f8a67..74b6f8143 100644
--- a/FlightGear.dsp
+++ b/FlightGear.dsp
@@ -2393,6 +2393,36 @@ SOURCE=.\src\FDM\JSBSim\FGRotation.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\FDM\JSBSim\FGRotor.cpp
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_JSBSim"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_JSBSim"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\FDM\JSBSim\FGRotor.h
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_JSBSim"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_JSBSim"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\FDM\JSBSim\FGRocket.cpp
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
@@ -4235,6 +4265,36 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_alh_ap.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\FDM\UIUCModel\uiuc_auto_pilot.cpp
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_UIUCModel"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_UIUCModel"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\FDM\UIUCModel\uiuc_auto_pilot.h
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_UIUCModel"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_UIUCModel"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\FDM\UIUCModel\uiuc_betaprobe.cpp
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
@@ -4745,6 +4805,36 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_getwind.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\FDM\UIUCModel\uiuc_hh_ap.cpp
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_UIUCModel"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_UIUCModel"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\FDM\UIUCModel\uiuc_hh_ap.h
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_UIUCModel"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_UIUCModel"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\FDM\UIUCModel\uiuc_ice.cpp
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
@@ -6155,6 +6245,36 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_parsefile.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\FDM\UIUCModel\uiuc_rah_ap.cpp
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_UIUCModel"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_UIUCModel"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\FDM\UIUCModel\uiuc_rah_ap.h
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_UIUCModel"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_UIUCModel"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\FDM\UIUCModel\uiuc_recorder.cpp
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
@@ -8663,6 +8783,66 @@ SOURCE=.\src\AIModel\AIBallistic.cxx
 
 !ENDIF 
 
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\AIModel\AIStorm.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_AIModel"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_AIModel"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\AIModel\AIStorm.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_AIModel"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_AIModel"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\AIModel\AIThermal.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_AIModel"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_AIModel"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\AIModel\AIThermal.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_AIModel"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_AIModel"
+
+!ENDIF 
+
 # End Source File
 # End Group
 # Begin Group "Lib_MultiPlayer"
@@ -10259,505 +10439,6 @@ SOURCE=.\src\Time\tmp.hxx
 
 !ENDIF 
 
-# End Source File
-# End Group
-# Begin Group "Lib_WeatherCM"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGAirPressureItem.cpp
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGAirPressureItem.h
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGCloud.h
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGCloudItem.cpp
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGCloudItem.h
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGLocalWeatherDatabase.cpp
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGLocalWeatherDatabase.h
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGPhysicalProperties.cpp
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGPhysicalProperties.h
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGPhysicalProperties_bind.cpp
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGPhysicalProperty.cpp
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGPhysicalProperty.h
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGSnowRain.h
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGTemperatureItem.cpp
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGTemperatureItem.h
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGThunderstorm.cpp
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGThunderstorm.h
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGTurbulenceItem.cpp
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGTurbulenceItem.h
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGVaporPressureItem.cpp
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGVaporPressureItem.h
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGWeatherDefs.h
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGWeatherFeature.h
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGWeatherUtils.h
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGWeatherParse.cpp
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGWeatherParse.h
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGWeatherVectorWrap.h
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGWindItem.cpp
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\FGWindItem.h
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\linintp2.cpp
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\linintp2.h
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\sphrintp.cpp
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\WeatherCM\sphrintp.h
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_WeatherCM"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
-
-!ENDIF 
-
 # End Source File
 # End Group
 # Begin Source File
diff --git a/NEWS b/NEWS
index af119701b..18ce20523 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
-New in 0.9.4
-* March 16, 2004
+New in 0.9.4.pre1
+* March 22, 2004
 
 * Impliment SimGear's (aka Andy's) Nasal scripting language in
   FlightGear and integrate with the FG property system.
@@ -40,6 +40,12 @@ New in 0.9.4
 * Added a number of basic 3d instruments to the instrument library
   that could be reused used for any general aviation cockpit.
 
+* Clean up much of the extraneous alias system entries for aircraft.
+  Generally this means that if there is only one version of an
+  aircraft, there is only one entry and no aliases.  If there are
+  multiple versions of an aircraft, we may still have an alias to
+  point to the prefered or default version.
+
 * Added RedHat packaging files.
 * Added some perl script utility functions which are useful when
   writing remote perl scripts that interact with a running copy of
diff --git a/configure.ac b/configure.ac
index 2aa2d3eea..5f936117a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ dnl Require at least automake 2.52
 AC_PREREQ(2.52)
 
 dnl Initialize the automake stuff
-AM_INIT_AUTOMAKE(FlightGear, 0.9.4)
+AM_INIT_AUTOMAKE(FlightGear, 0.9.4.pre1)
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET
@@ -320,11 +320,11 @@ if test "x$ac_cv_header_plib_ul_h" != "xyes"; then
     exit
 fi
 
-AC_MSG_CHECKING([for plib 1.6.0 or newer])
+AC_MSG_CHECKING([for plib 1.7.0 or newer])
 AC_TRY_RUN([
 #include <plib/ul.h>
 
-#define MIN_PLIB_VERSION 160
+#define MIN_PLIB_VERSION 170
 
 int main() {
     int major, minor, micro;
@@ -339,7 +339,7 @@ int main() {
 ],
   AC_MSG_RESULT(yes),
   [AC_MSG_RESULT(wrong version);
-   AC_MSG_ERROR([Install plib 1.6.0 or later first...])],
+   AC_MSG_ERROR([Install plib 1.8.0 or later first...])],
   AC_MSG_RESULT(yes)
 )
 
diff --git a/src/FDM/JSBSim/Makefile.am b/src/FDM/JSBSim/Makefile.am
index 205809e23..bbb2d20cf 100644
--- a/src/FDM/JSBSim/Makefile.am
+++ b/src/FDM/JSBSim/Makefile.am
@@ -33,6 +33,7 @@ libJSBSim_a_SOURCES = \
         FGPropulsion.cpp FGPropulsion.h \
 	FGPosition.cpp FGPosition.h \
 	FGRotation.cpp FGRotation.h \
+ 	FGRotor.cpp FGRotor.h \
 	FGRocket.cpp FGRocket.h \
 	FGScript.cpp FGScript.h \
 	FGState.cpp FGState.h \
diff --git a/utils/Modeller/Makefile.am b/utils/Modeller/Makefile.am
index 81a7ffc60..82223ad08 100644
--- a/utils/Modeller/Makefile.am
+++ b/utils/Modeller/Makefile.am
@@ -1,7 +1,7 @@
-noinst_PROGRAMS = 3dconvert animassist
+noinst_PROGRAMS = threedconvert animassist
 
-3dconvert_SOURCES = 3dconvert.cxx
-3dconvert_LDADD = -lplibssg -lplibsg -lplibul $(opengl_LIBS) $(audio_LIBS)
+threedconvert_SOURCES = 3dconvert.cxx
+threedconvert_LDADD = -lplibssg -lplibsg -lplibul $(opengl_LIBS) $(audio_LIBS)
 
 animassist_SOURCES = animassist.c
 animassist_LDADD = $(base_LIBS)
-- 
2.39.2