X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=1b739fec3350bfec6c0bf8af78e534e49c815aec;hb=bc3df74066bad4c48ad699032d80748cbfbd7269;hp=f77ab38fbb783cb70cdfd148906eeacfc47e1047;hpb=42f1849975d37ed5e728be206066c6b351f243ae;p=flightgear.git

diff --git a/configure.ac b/configure.ac
index f77ab38fb..1b739fec3 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,26 +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/\-p[[0-9]]$//' | sed -e 's/\.//g'`
-if test $AUTO_MAKE_VERSION -lt 15; then
-    echo "You need to upgrade your automake to version 1.5 or newer"
-    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)
@@ -148,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"
@@ -301,6 +297,7 @@ else
 
     echo Win32 specific hacks...
     AC_DEFINE([WIN32], 1, [Define if building on a Win32 platform])
+    AC_DEFINE([NOMINMAX], 1, [Define for Win32 platforms])
 
     # just define these to true and hope for the best
     ac_cv_lib_glut_glutGetModifiers="yes"
@@ -354,8 +351,8 @@ AM_CONDITIONAL(HAVE_XWINDOWS, test "x$ac_cv_lib_X11_XCreateWindow" = "xyes" )
 AC_LANG_PUSH(C++)
 
 # Check for "plib" without which we cannot go on
-AC_CHECK_HEADER(plib/pu.h)
-if test "x$ac_cv_header_plib_pu_h" != "xyes"; then
+AC_CHECK_HEADER(plib/ul.h)
+if test "x$ac_cv_header_plib_ul_h" != "xyes"; then
     echo
     echo "You *must* have the plib library installed on your system to build"
     echo "the FGFS simulator!"
@@ -366,15 +363,28 @@ if test "x$ac_cv_header_plib_pu_h" != "xyes"; then
     exit
 fi
 
-# needed for plib 1.3.x and later
-AC_CHECK_LIB(plibul, ulInit,,,)
+AC_MSG_CHECKING([for plib 1.6.0 or newer])
+AC_TRY_RUN([
+#include <plib/ul.h>
 
-if test "x$ac_cv_lib_plibul_ulInit" != "xyes"; then
-    echo
-    echo "You have an old version of plib, you need to upgrade to at least"
-    echo "plib-1.4.2"
-    exit
-fi
+#define MIN_PLIB_VERSION 160
+
+int main() {
+    int major, minor, micro;
+
+    if ( PLIB_VERSION < MIN_PLIB_VERSION ) {
+	 return -1;
+    }
+
+    return 0;
+}
+
+],
+  AC_MSG_RESULT(yes),
+  [AC_MSG_RESULT(wrong version);
+   AC_MSG_ERROR([Install plib 1.6.0 or later first...])],
+  AC_MSG_RESULT(yes)
+)
 
 # If we get here then plib is available, so force use of plib joystick lib
 AC_DEFINE([ENABLE_PLIB_JOYSTICK], 1, [Define to enable plib joystick support])
@@ -402,7 +412,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then
     exit
 fi
 
-AC_MSG_CHECKING([for proper simgear version])
+AC_MSG_CHECKING([for simgear 0.3.0 or newer])
 AC_TRY_RUN([
 #include <stdio.h>
 
@@ -412,8 +422,8 @@ AC_TRY_RUN([
 #define XSTRINGIFY(X) #X
 
 #define MIN_MAJOR 0
-#define MIN_MINOR 0
-#define MIN_MICRO 19
+#define MIN_MINOR 3
+#define MIN_MICRO 0
 
 int main() {
     int major, minor, micro;
@@ -456,8 +466,7 @@ if test "x$ac_cv_header_mk4_h" != "xyes"; then
     exit
 fi
 
-AC_MSG_CHECKING([for proper metakit version])
-
+AC_MSG_CHECKING([for metakit 2.4.3 or newer])
 saved_LIBS="$LIBS"
 LIBS="$saved_LIBS -lmk4"
 AC_TRY_RUN([
@@ -478,7 +487,14 @@ 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.
+Also, look up this issue in the FlightGear FAQ.])],
   AC_MSG_RESULT(yes)
 )
 LIBS="$saved_LIBS"
@@ -565,6 +581,7 @@ AC_CONFIG_FILES([ \
 	src/Controls/Makefile \
 	src/Environment/Makefile \
 	src/FDM/Balloon/Makefile \
+	src/FDM/ExternalNet/Makefile \
 	src/FDM/JSBSim/Makefile \
 	src/FDM/JSBSim/filtersjb/Makefile \
 	src/FDM/LaRCsim/Makefile \
@@ -573,6 +590,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 \
@@ -583,9 +601,12 @@ AC_CONFIG_FILES([ \
 	src/Objects/Makefile \
 	src/Scenery/Makefile \
 	src/Sound/Makefile \
+	src/Systems/Makefile \
 	src/Time/Makefile \
 	src/WeatherCM/Makefile \
 	tests/Makefile \
+	utils/Makefile \
+	utils/TerraSync/Makefile \
 ])
 AC_OUTPUT