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

diff --git a/configure.ac b/configure.ac
index 6afa6088f..5c861dec5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,7 +76,7 @@ else
   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")
+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")
 
 
@@ -92,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
@@ -656,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