Add FDM specific properties

[flightgear.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index bfead80f437d226fd6221eb166119a45b0a0de9f..21050c09c4ba2f842dc9f3064ca17f7f44f2df37 100644 (file)
--- 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.2)
+AM_INIT_AUTOMAKE(FlightGear, 0.9.3)
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET
@@ -59,24 +59,14 @@ fi
 
 # Specify if we want to build with Multiplayer support
 # default to with_network=yes
-AC_ARG_WITH(multiplayer, [  --with-multiplayer      Include default multiplayer support])
-AC_ARG_WITH(network_olk, [  --with-network-olk      Include Oliver's multi-pilot networking support [default=no]])
+AC_ARG_WITH(multiplayer, [  --with-multiplayer      Include multiplayer support [default=yes]])
 
-if test "x$with_multiplayer" = "xno" -a "x$with_network_olk" = "xno"; then
+if test "x$with_multiplayer" = "xno"; then
   echo "Building without any kind of multiplayer support"
-
-elif test "x$with_multiplayer" = "xno"; then
-# echo "Building without default multiplayer support"
-  echo "Building with Oliver's multi-pilot network support"
-  AC_DEFINE([FG_NETWORK_OLK], 1, [Define to build with Oliver's networking])
-
 else
-  echo "Building with default multiplayer support"
-# echo "Building without Oliver's multi-pilot network support"
-  AC_DEFINE([FG_MPLAYER_AS], 1, [Define to build with default multiplayer support])
+  echo "Building with multiplayer support"
+  AC_DEFINE([FG_MPLAYER_AS], 1, [Define to build with multiplayer support])
 fi
-
-AM_CONDITIONAL(ENABLE_NETWORK_OLK, test "x$with_network_olk" != "xno" -a "x$with_multiplayer" = "xno")
 AM_CONDITIONAL(ENABLE_MPLAYER_AS, test "x$with_multiplayer" != "xno")
 
 
@@ -364,29 +354,6 @@ dnl joystick lib
 AC_DEFINE([ENABLE_PLIB_JOYSTICK], 1, [Define to enable plib joystick support])
 
 
-dnl Checking for PSL in plib
-dnl version of plib, so check for it.
-AC_MSG_CHECKING([for plib PSL scripting support])
-AC_COMPILE_IFELSE([
-#include <plib/psl.h>
-
-int main() {
-  // not for running...
-  pslProgram program((pslExtension *)0);
-  program.compile("int main () {}", "");
-  return 0;
-}
-],
-  [AC_MSG_RESULT(yes);
-   have_plib_psl=yes],
-  AC_MSG_RESULT(no)
-)
-AM_CONDITIONAL(HAVE_PLIB_PSL, test "x$have_plib_psl" = "xyes")
-if test "x$have_plib_psl" = "xyes"; then
-   AC_DEFINE([HAVE_PLIB_PSL], 1,
-             [Define if plib version is new enough to provide "PSL"])
-fi
-
 dnl Check for the presence of SimGear
 AC_CHECK_HEADER(simgear/version.h)
 if test "x$ac_cv_header_simgear_version_h" != "xyes"; then
@@ -400,7 +367,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then
     exit
 fi
 
-AC_MSG_CHECKING([for simgear 0.3.3 or newer])
+AC_MSG_CHECKING([for simgear 0.3.4 or newer])
 AC_TRY_RUN([
 #include <stdio.h>
 
@@ -411,7 +378,7 @@ AC_TRY_RUN([
 
 #define MIN_MAJOR 0
 #define MIN_MINOR 3
-#define MIN_MICRO 3
+#define MIN_MICRO 4
 
 int main() {
     int major, minor, micro;
@@ -538,10 +505,10 @@ AC_CONFIG_FILES([ \
        src/Main/runfgfs \
        src/Main/runfgfs.bat \
        src/Model/Makefile \
+       src/AIModel/Makefile \
        src/MultiPlayer/Makefile \
        src/Navaids/Makefile \
        src/Network/Makefile \
-       src/NetworkOLK/Makefile \
        src/Objects/Makefile \
        src/Replay/Makefile \
        src/Scenery/Makefile \
@@ -553,6 +520,8 @@ AC_CONFIG_FILES([ \
        tests/Makefile \
        utils/Makefile \
        utils/TerraSync/Makefile \
+       utils/js_server/Makefile \
+       utils/3dconvert/Makefile \
 ])
 AC_OUTPUT
 
@@ -564,16 +533,6 @@ echo "================="
 
 echo "Prefix: $prefix"
 
-if test "x$have_plib_psl" = "xyes"; then
-    echo "Plib PSL scripting: yes"
-else
-    echo "Plib PSL scripting: $fg_psl_string_compile"
-    echo "  You will not be able to run scripts written in PSL"
-    echo "  and some advanced GUI and input features may not"
-    echo "  work.  Download and install the latest CVS version"
-    echo "  of plib if you would like to enable PSL support."
-fi
-
 if test "x$with_logging" != "x"; then
     echo "Debug messages: $with_logging"
 else
@@ -590,9 +549,7 @@ else
 fi
 
 if test "x$with_multiplayer" != "xno"; then
-    echo "Using default multiplayer support"
-elif test "x$with_network_olk" != "xno"; then
-    echo "Using Oliver's multi-pilot network support"
+    echo "Building with multiplayer support"
 fi
 
 if test "x$with_threads" = "xyes"; then