X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=65f8972529d876347d424d023c3348a02451793e;hb=a6129a38d05468627c39902609c6e96926171408;hp=daacc73eb6e3b74303076c81849945f65fd7183d;hpb=d55f2bd017a11c5eaf0c6150221ac51c75042830;p=flightgear.git

diff --git a/configure.ac b/configure.ac
index daacc73eb..65f897252 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,36 +59,16 @@ 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")
 
-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
@@ -374,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
@@ -501,11 +458,15 @@ AC_HEADER_TIME
 AC_STRUCT_TM
 
 dnl Checks for library functions.
+old_LIBS=$LIBS
+LIBS="$base_LIBS $network_LIBS $opengl_LIBS"
 AC_TYPE_SIGNAL
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS( \
+AC_CHECK_FUNCS( [ \
         ftime gettimeofday timegm memcpy bcopy mktime strstr rand mkfifo \
-	random drand48 setitimer getitimer signal GetLocalTime rint getrusage )
+	random drand48 setitimer getitimer signal GetLocalTime rint getrusage \
+	truncf ] )
+LIBS=$old_LIBS
 
 AM_CONFIG_HEADER(src/Include/config.h)
 
@@ -520,6 +481,8 @@ AC_CONFIG_FILES([ \
 	man/pstest.1 \
         scripts/Makefile \
         scripts/debug/Makefile \
+        scripts/perl/Makefile \
+        scripts/perl/examples/Makefile \
         scripts/python/Makefile \
 	src/Makefile \
 	src/Include/Makefile \
@@ -548,15 +511,14 @@ 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 \
 	src/Scripting/Makefile \
-	src/Server/Makefile \
 	src/Sound/Makefile \
 	src/Systems/Makefile \
 	src/Time/Makefile \
@@ -564,6 +526,8 @@ AC_CONFIG_FILES([ \
 	tests/Makefile \
 	utils/Makefile \
 	utils/TerraSync/Makefile \
+	utils/Modeller/Makefile \
+	utils/js_server/Makefile \
 ])
 AC_OUTPUT
 
@@ -575,16 +539,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
@@ -601,13 +555,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"
-fi
-
-if test "x$with_multiserver" != "xno"; then
-    echo "Using multiplayer client/server support"
+    echo "Building with multiplayer support"
 fi
 
 if test "x$with_threads" = "xyes"; then