More tweaks to the automake/conf configuration scripts.

diff --git a/configure.ac b/configure.ac
index b2f747880b07217ffbf1d3954cadfc5e09d4c0ea..ace645dd9ae82b927723c71710eff7b9268dfd4e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -53,9 +53,11 @@ 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/\.//'`
-AM_CONDITIONAL(ANCIENT_AUTOMAKE, test $AUTO_MAKE_VERSION -lt 14)
-AM_CONDITIONAL(OLD_AUTOMAKE, test $AUTO_MAKE_VERSION -lt 15)
+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])
@@ -369,6 +371,12 @@ AC_SUBST(opengl_LIBS)
 
 AM_CONDITIONAL(HAVE_XWINDOWS, test "x$ac_cv_lib_X11_XCreateWindow" = "xyes" )
 
+# The following are C++ items that need to be tested for with the c++
+# compiler
+
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+
 # 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
@@ -382,8 +390,6 @@ if test "x$ac_cv_header_plib_pu_h" != "xyes"; then
     exit
 fi
 
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
 # needed for plib 1.3.x and later
 AC_CHECK_LIB(plibul, ulInit,,,)
 
@@ -394,8 +400,6 @@ if test "x$ac_cv_lib_plibul_ulInit" != "xyes"; then
     exit
 fi
 
-AC_LANG_RESTORE
-
 # 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])
 
@@ -425,6 +429,8 @@ fi
 AC_MSG_CHECKING(for proper simgear version)
 
 AC_TRY_RUN([
+#include <stdio.h>
+
 #include <simgear/version.h>
 
 #define STRINGIFY(X) XSTRINGIFY(X)
@@ -475,6 +481,30 @@ if test "x$ac_cv_header_mk4_h" != "xyes"; then
     exit
 fi
 
+AC_TRY_RUN([
+#include <mk4.h>
+
+#define MIN_MK4_VERSION 243
+
+int main() {
+    int major, minor, micro;
+
+    if ( d4_MetaKitLibraryVersion < MIN_MK4_VERSION ) {
+        return -1;
+    }
+
+    return 0;
+}
+
+],
+  AC_MSG_RESULT(yes),
+  [AC_MSG_RESULT(wrong version);
+   AC_MSG_ERROR([Install metakit 2.4.3 or later first...])],
+  AC_MSG_RESULT(yes)
+)
+
+AC_LANG_RESTORE
+
 # Check for system installed zlib
 AC_CHECK_HEADER(zlib.h)
 if test "x$ac_cv_header_zlib_h" != "xyes"; then

diff --git a/src/FDM/JSBSim/Makefile.am b/src/FDM/JSBSim/Makefile.am
index 8fdddc1dccdc697ed4224a8e1952a89736e1fad4..f96db3a3fd882eec24d57e185028eed3b1cf1c85 100644 (file)
--- a/src/FDM/JSBSim/Makefile.am
+++ b/src/FDM/JSBSim/Makefile.am
@@ -54,10 +54,6 @@ libJSBSim_a_SOURCES = \
 
 # noinst_PROGRAMS = testJSBsim
 
-if OLD_AUTOMAKE
-DEFS += -DFGFS
-else
 AM_CXXFLAGS = -DFGFS
-endif
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/src/FDM/JSBSim/filtersjb/Makefile.am b/src/FDM/JSBSim/filtersjb/Makefile.am
index 984c1df60f6be5d6dba55ea33e578341a4e743bc..90ad2c5c263cab25373f17db5f639865eead9018 100644 (file)
--- a/src/FDM/JSBSim/filtersjb/Makefile.am
+++ b/src/FDM/JSBSim/filtersjb/Makefile.am
@@ -12,10 +12,6 @@ libfiltersjb_a_SOURCES = \
        FGSummer.cpp FGSummer.h \
        FGSwitch.cpp FGSwitch.h
 
-if OLD_AUTOMAKE
-DEFS += -DFGFS
-else
 AM_CXXFLAGS = -DFGFS
-endif
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index 7127eae56913818c1a6afaec7004628019b84b4e..9800785be87670fe29916bce91ba87f23a1a2ead 100644 (file)
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -535,12 +535,12 @@ void helpCb (puObject *)
     }
     command += " &";
 #else // WIN32
-       command = "start ";
-       command += path.str();
+    command = "start ";
+    command += path.str();
 #endif
        
     system( command.c_str() );
-    mkDialog ("Help started in netscape window.");
+    mkDialog ("Help started in your web browser window.");
 }
 
 #if defined( TR_HIRES_SNAP)

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index c1ca5fcfb2cb31a904b06890a3afb3e116542f87..ce51f873121e2525d5fda109a9e0698cfaf0e633 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -19,11 +19,7 @@ else
 THREAD_LIBS =
 endif
 
-if ANCIENT_AUTOMAKE
-# nothing CXXFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\"
-else
 AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\"
-endif
 
 EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in