X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=528f070d5ac7fe355e3547d1134ff3df23d69429;hb=8d5714084e76ab923c08aae431dbdb9e516aaf96;hp=ad735106a72fbb349ce6e0f68e98bd493964a183;hpb=1dfb58783ce5aacea59c541b666b54face62edac;p=flightgear.git

diff --git a/configure.ac b/configure.ac
index ad735106a..528f070d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ AC_CONFIG_SRCDIR([src/Aircraft/aircraft.cxx])
 AC_PREREQ(2.52)
 
 # Initialize the automake stuff
-AM_INIT_AUTOMAKE(FlightGear, 0.7.11pre1)
+AM_INIT_AUTOMAKE(FlightGear, 0.9.0)
 
 # Checks for programs.
 AC_PROG_MAKE_SET
@@ -51,30 +51,22 @@ AC_EGREP_CPP(yes,
 echo "IS_CYGWIN = $is_cygwin"
 AM_CONDITIONAL(IS_CYGWIN, test "x$is_cygwin" = "xyes")
 
-# Determine version of automake ... important becuase of
-# incompatibilities between versions
-AUTO_MAKE_VERSION=`automake --version | head -1 | awk '{print $4}' | sed -e 's/\.\([0-9]*\).*/\1/'`
-if test $AUTO_MAKE_VERSION -lt 15; then
-    echo ""
-    echo "You need to upgrade to automake version 1.5 or greater."
-    echo "Most distributions have packages available to install or you can"
-    echo "find the source for the most recent version at"
-    echo "ftp://ftp.gnu.org/gnu/automake"
-    exit 1
-fi
-
 # Used by JSBSim
 AC_DEFINE([FGFS], 1, [Define so that JSBSim compiles in 'library' mode])
 
+
 # Used on the Irix platform
 AR="ar"
+ARFLAGS="cru"
 OS=`uname -s`
 if test "$OS" = "IRIX" -o "$OS" = "IRIX64"; then
     if test "$CXX" = "CC"; then
         AR="CC -ar"
-        AC_SUBST(AR)
+        ARFLAGS="-o"
     fi
 fi
+AC_SUBST(AR)
+AC_SUBST(ARFLAGS)
 
 
 # Specify if we want logging (testing build) or not (release build)
@@ -152,7 +144,7 @@ AC_CHECK_HEADER(windows.h)
 
 # extra library and include directories
 if test "x$ac_cv_header_windows_h" != "xyes" ; then
-    EXTRA_DIRS="${EXTRA_DIRS} /usr/local /usr/X11R6"
+    EXTRA_DIRS="${EXTRA_DIRS} /usr/X11R6"
 
     if test -d /opt/X11R6 ; then
         EXTRA_DIRS="${EXTRA_DIRS} /opt/X11R6"
@@ -419,7 +411,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then
     exit
 fi
 
-AC_MSG_CHECKING([for simgear 0.0.19 or newer])
+AC_MSG_CHECKING([for simgear 0.2.0 or newer])
 AC_TRY_RUN([
 #include <stdio.h>
 
@@ -429,8 +421,8 @@ AC_TRY_RUN([
 #define XSTRINGIFY(X) #X
 
 #define MIN_MAJOR 0
-#define MIN_MINOR 0
-#define MIN_MICRO 19
+#define MIN_MINOR 2
+#define MIN_MICRO 0
 
 int main() {
     int major, minor, micro;
@@ -494,7 +486,13 @@ int main() {
 ],
   AC_MSG_RESULT(yes),
   [AC_MSG_RESULT(wrong version);
-   AC_MSG_ERROR([Install metakit 2.4.3 or later first...])],
+   AC_MSG_ERROR([
+
+Install metakit 2.4.3 or later first.
+
+Or, the compiler may not be finding your libmk4.so library.
+Please check the config.log file for specific details of the
+failure if you believe you have the correct metakit version.])],
   AC_MSG_RESULT(yes)
 )
 LIBS="$saved_LIBS"
@@ -589,6 +587,7 @@ AC_CONFIG_FILES([ \
 	src/FDM/Makefile \
 	src/GUI/Makefile \
 	src/Input/Makefile \
+	src/Instrumentation/Makefile \
 	src/Main/Makefile \
 	src/Main/runfgfs \
 	src/Main/runfgfs.bat \
@@ -599,6 +598,7 @@ AC_CONFIG_FILES([ \
 	src/Objects/Makefile \
 	src/Scenery/Makefile \
 	src/Sound/Makefile \
+	src/Systems/Makefile \
 	src/Time/Makefile \
 	src/WeatherCM/Makefile \
 	tests/Makefile \