Multiplayer client/server system -- MessageBuf class and test harness complete

[flightgear.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index bfead80f437d226fd6221eb166119a45b0a0de9f..daacc73eb6e3b74303076c81849945f65fd7183d 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
@@ -79,6 +79,16 @@ 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")
 
+AC_ARG_WITH(multiserver, [  --with-multiserver      Include multiplayer client/server support])
+
+if test "x$with_multiserver" = "xno"; then
+  echo "Building without multiplayer client/server support"
+else
+  echo "Building with multiplayer client/server support"
+  AC_DEFINE([FG_MSERVER_AS], 1, [Define to build with multiplayer client/server support])
+fi
+
+AM_CONDITIONAL(ENABLE_MSERVER_AS, test "x$with_multiserver" != "xno")
 
 # Specify if we want to use WeatherCM instead of FGEnvironment.
 # default to with_weathercm=no
@@ -400,7 +410,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 +421,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;
@@ -546,6 +556,7 @@ AC_CONFIG_FILES([ \
        src/Replay/Makefile \
        src/Scenery/Makefile \
        src/Scripting/Makefile \
+       src/Server/Makefile \
        src/Sound/Makefile \
        src/Systems/Makefile \
        src/Time/Makefile \
@@ -595,6 +606,10 @@ elif test "x$with_network_olk" != "xno"; then
     echo "Using Oliver's multi-pilot network support"
 fi
 
+if test "x$with_multiserver" != "xno"; then
+    echo "Using multiplayer client/server support"
+fi
+
 if test "x$with_threads" = "xyes"; then
     echo "threads: yes"
 else