Remove possilbe trailing "/" from runway numbers in FAA data.

[flightgear.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index aa4c4c7a7ee2284f3347b330f90148afe083a39f..5c861dec5967cbf6505589964aa303450b3d6865 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -57,16 +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 Oliver's networking support
+# Specify if we want to build with Multiplayer support
 # default to with_network=yes
-AC_ARG_WITH(network_olk, [  --with-network-olk      Include Oliver's multi-pilot networking support])
-if test "x$with_network_olk" = "xno" ; then
-    echo "Building without Oliver's multi-pilot network support"
+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]])
+
+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])
+
 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")
+
+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.
@@ -81,17 +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
-AM_CONDITIONAL(ENABLE_WEATHERCM, test "x$with_weathercm" = "xyes")
-
 dnl Thread related checks
 AC_ARG_WITH(threads, [  --with-threads          Include tile loading threads [default=no]])
 if test "x$with_threads" = "xyes"; then
@@ -137,7 +137,7 @@ case "${host}" in
     if test -d /opt/X11R6 ; then
         EXTRA_DIR2="/opt/X11R6"
     fi
-    EXTRA_DIRS="$EXTRA_DIR1 $EXTRA_DIR2"
+    EXTRA_DIRS="${EXTRA_DIRS} $EXTRA_DIR1 $EXTRA_DIR2"
     ;;
 
 esac
@@ -168,7 +168,9 @@ case "${host}" in
 *-*-cygwin* | *-*-mingw32*)
     audio_LIBS="$audio_LIBS -lwinmm"
     ;;
-
+*-apple-darwin*)
+    audio_LIBS="$audio_LIBS -framework IOKit -framework CoreFoundation"
+    ;;
 *-*-irix* )
     audio_LIBS="$audio_LIBS -laudio"
     ;;
@@ -210,7 +212,7 @@ if test "x$ac_cv_lib_pthread_pthread_exit" != "xyes" \
     dnl fails.  See if we need -pthread instead of -lpthread and look
     dnl for the functions in libc_r.
     save_CXXFLAGS="$CXXFLAGS"
-    save_CFLAGS="$FLAGS"
+    save_CFLAGS="$CFLAGS"
     CXXFLAGS="-pthread $CXXFLAGS"
     CFLAGS="-pthread $FLAGS"
     save_LIBS=$LIBS
@@ -230,7 +232,7 @@ if test "x$ac_cv_header_GL_glut_h" = "xyes"; then
 else
     AC_CHECK_HEADER(GLUT/glut.h)
     if test "x$ac_cv_header_GLUT_glut_h" = "xyes"; then
-        AC_DEFINE([GLUT_H], "GLUT/glut.h", [Define as glut.h include location])
+        AC_DEFINE([GLUT_H], <GLUT/glut.h>, [Define as glut.h include location])
     else
         echo "Neither GL/glut.h nor GLUT/glut.h found.  Cannot continue"
         exit
@@ -574,6 +576,7 @@ AC_CONFIG_FILES([ \
        src/Environment/Makefile \
        src/FDM/Balloon/Makefile \
        src/FDM/ExternalNet/Makefile \
+       src/FDM/ExternalPipe/Makefile \
        src/FDM/JSBSim/Makefile \
        src/FDM/JSBSim/filtersjb/Makefile \
        src/FDM/LaRCsim/Makefile \
@@ -587,6 +590,7 @@ AC_CONFIG_FILES([ \
        src/Main/runfgfs \
        src/Main/runfgfs.bat \
        src/Model/Makefile \
+       src/MultiPlayer/Makefile \
        src/Navaids/Makefile \
        src/Network/Makefile \
        src/NetworkOLK/Makefile \
@@ -636,10 +640,10 @@ else
     echo "Using FGEnvironment"
 fi
 
-if test "x$with_old_menubar" != "x"; then
-    echo "Using old menubar"
-else
-    echo "Defaulting to new XML-configurable menubar"
+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"
 fi
 
 if test "x$with_threads" = "xyes"; then