X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=1e58d02c6fbcdaf346c672fd3ea3ef3162f5511a;hb=92010f9f9483082bbf83638a49e08053f53c5daa;hp=bfead80f437d226fd6221eb166119a45b0a0de9f;hpb=ff2740f085fc381cd680336642ae38e9f6f1c749;p=flightgear.git diff --git a/configure.ac b/configure.ac index bfead80f4..1e58d02c6 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ dnl Require at least automake 2.52 AC_PREREQ(2.52) dnl Initialize the automake stuff -AM_INIT_AUTOMAKE(FlightGear, 0.9.2) +AM_INIT_AUTOMAKE(FlightGear, 0.9.4) dnl Checks for programs. AC_PROG_MAKE_SET @@ -59,39 +59,17 @@ 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") -# Specify if we want to use WeatherCM instead of FGEnvironment. -# default to with_weathercm=no -AC_ARG_WITH(weathercm, [ --with-weathercm Use WeatherCM instead of FGEnvironment]) -if test "x$with_weathercm" = "xyes" ; then - echo "Building with WeatherCM" - AC_DEFINE([FG_WEATHERCM], 1, - [Define to build with Christian Mayer's weather code]) -else - echo "Building with FGEnvironment" -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 @@ -113,7 +91,7 @@ fi dnl Used by JSBSim to conditionally compile in fgfs interface code AC_DEFINE([FGFS], 1, [Define so that JSBSim compiles in 'library' mode]) -dnl Used to controll whether clouds3d should be compiled in or not +dnl Used to control whether clouds3d should be compiled in or not AC_DEFINE([FG_USE_CLOUDS_3D], 1, [Define to use 3D cloud support]) AM_CONDITIONAL(FG_USE_CLOUDS_3D, test "x" = "x") @@ -126,6 +104,12 @@ case "${host}" in echo no EXTRA_DIRS for $host ;; +*-*-cygwin*) + if test -d /usr/local ; then + EXTRA_DIRS="${EXTRA_DIRS} /usr/local" + fi + ;; + *) if test -d /usr/X11R6 ; then EXTRA_DIR1="/usr/X11R6" @@ -336,11 +320,11 @@ if test "x$ac_cv_header_plib_ul_h" != "xyes"; then exit fi -AC_MSG_CHECKING([for plib 1.6.0 or newer]) +AC_MSG_CHECKING([for plib 1.7.0 or newer]) AC_TRY_RUN([ #include -#define MIN_PLIB_VERSION 160 +#define MIN_PLIB_VERSION 170 int main() { int major, minor, micro; @@ -355,7 +339,7 @@ int main() { ], AC_MSG_RESULT(yes), [AC_MSG_RESULT(wrong version); - AC_MSG_ERROR([Install plib 1.6.0 or later first...])], + AC_MSG_ERROR([Install plib 1.8.0 or later first...])], AC_MSG_RESULT(yes) ) @@ -364,29 +348,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 - -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 @@ -400,7 +361,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then exit fi -AC_MSG_CHECKING([for simgear 0.3.3 or newer]) +AC_MSG_CHECKING([for simgear 0.3.5 or newer]) AC_TRY_RUN([ #include @@ -411,7 +372,7 @@ AC_TRY_RUN([ #define MIN_MAJOR 0 #define MIN_MINOR 3 -#define MIN_MICRO 3 +#define MIN_MICRO 5 int main() { int major, minor, micro; @@ -491,11 +452,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) @@ -510,6 +475,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 \ @@ -538,10 +505,10 @@ 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 \ @@ -549,10 +516,11 @@ AC_CONFIG_FILES([ \ src/Sound/Makefile \ src/Systems/Makefile \ src/Time/Makefile \ - src/WeatherCM/Makefile \ tests/Makefile \ utils/Makefile \ utils/TerraSync/Makefile \ + utils/Modeller/Makefile \ + utils/js_server/Makefile \ ]) AC_OUTPUT @@ -564,16 +532,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 @@ -583,16 +541,8 @@ fi echo -n "Automake version: " automake --version | head -1 -if test "x$with_weathercm" != "x"; then - echo "WeatherCM instead of FGEnvironment: $with_weathercm" -else - echo "Using FGEnvironment" -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