X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=5c861dec5967cbf6505589964aa303450b3d6865;hb=8dcf08c965ee6386f6fa1a0d8871906fa7faf989;hp=7bbdbe8af8331fe7db3e81ef8e345f65c6f1b2ba;hpb=e46c59d4d0d63026dc7b9a5f89caf784a5aa57ec;p=flightgear.git

diff --git a/configure.ac b/configure.ac
index 7bbdbe8af..5c861dec5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,30 +57,27 @@ if test "x$with_logging" = "xno" ; then
     AC_DEFINE([FG_NDEBUG], 1, [Define for no logging output])
 fi
 
-# Specify if we want to build with default Multiplayer support
+# Specify if we want to build with Multiplayer support
 # default to with_network=yes
 AC_ARG_WITH(multiplayer, [  --with-multiplayer      Include default multiplayer support])
-if test "x$with_multiplayer" = "xno" ; then
-    echo "Building without default multiplayer support"
-else
-    echo "Building with default multiplayer support"
-    AC_DEFINE([FG_MPLAYER_AS], 1, [Define to build with default multiplayer support])
-fi
-AM_CONDITIONAL(ENABLE_MPLAYER_AS, test "x$with_multiplayer" != "xno")
+AC_ARG_WITH(network_olk, [  --with-network-olk      Include Oliver's multi-pilot networking support [default=no]])
 
+if test "x$with_multiplayer" = "xno" -a "x$with_network_olk" = "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])
 
-# Specify if we want to build with Oliver's networking support
-# default to with_network=yes
-NETWORK_DIRS=Network
-AC_ARG_WITH(network_olk, [  --with-network-olk      Include Oliver's multi-pilot networking support [default=no]])
-if test "x$with_network_olk" = "xno" ; then
-    echo "Building without Oliver's multi-pilot network support"
 else
-    echo "Building with Oliver's multi-pilot network support"
-    AC_DEFINE([FG_NETWORK_OLK], 1, [Define to build with Oliver's networking])
+  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])
 fi
-AM_CONDITIONAL(ENABLE_NETWORK_OLK, test "x$with_network_olk" != "xno" -a "x$with_multiplayer" = "xno")
 
+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")
 
 
 # Specify if we want to use WeatherCM instead of FGEnvironment.
@@ -95,16 +92,6 @@ else
 fi
 AM_CONDITIONAL(ENABLE_WEATHERCM, test "x$with_weathercm" = "xyes")
 
-dnl Specify if we want the old menubar; default to the new one
-AC_ARG_WITH(old-menubar, [  --with-old-menubar      Use the old menu bar])
-if test "x$with_old_menubar" = "xyes" ; then
-    echo "Building with old menubar"
-    AC_DEFINE([FG_OLD_MENUBAR], 1,
-              [Define to build with old menubar])
-else
-    echo "Building with new menubar"
-fi
-
 dnl Thread related checks
 AC_ARG_WITH(threads, [  --with-threads          Include tile loading threads [default=no]])
 if test "x$with_threads" = "xyes"; then
@@ -659,12 +646,6 @@ elif test "x$with_network_olk" != "xno"; then
     echo "Using Oliver's multi-pilot network support"
 fi
 
-if test "x$with_old_menubar" != "x"; then
-    echo "Using old menubar"
-else
-    echo "Defaulting to new XML-configurable menubar"
-fi
-
 if test "x$with_threads" = "xyes"; then
     echo "threads: yes"
 else