# 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_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
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)
man/pstest.1 \
scripts/Makefile \
scripts/debug/Makefile \
+ scripts/perl/Makefile \
+ scripts/perl/examples/Makefile \
scripts/python/Makefile \
src/Makefile \
src/Include/Makefile \
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 \
tests/Makefile \
utils/Makefile \
utils/TerraSync/Makefile \
+ utils/Modeller/Makefile \
utils/js_server/Makefile \
- utils/3dconvert/Makefile \
])
AC_OUTPUT
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
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"
+ echo "Building with multiplayer support"
fi
if test "x$with_threads" = "xyes"; then