X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=9a2b50ea71d30a0aaedf356ba209b11fd44fe88f;hb=ca69697ca67d0029db4ade2c73c10fd9bcbb29a3;hp=253ae23b3333960d1832443cdea96da367eabdf8;hpb=480b8c53307ce12a1c2c7c7b812275bda96b51e6;p=flightgear.git diff --git a/configure.ac b/configure.ac index 253ae23b3..9a2b50ea7 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ AC_PREREQ(2.52) dnl Initialize the automake stuff dnl set the $host variable based on local machine/os AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE(FlightGear, 0.9.9) +AM_INIT_AUTOMAKE(FlightGear, 0.9.10) dnl Checks for programs. AC_PROG_MAKE_SET @@ -38,6 +38,14 @@ if test "x$with_plib" != "x" ; then EXTRA_DIRS="${EXTRA_DIRS} $with_plib" fi +# specify the osg location +AC_ARG_WITH(osg, [ --with-osg=PREFIX Specify the prefix path to osg]) + +if test "x$with_osg" != "x" ; then + echo "osg prefix is $with_osg" + EXTRA_DIRS="${EXTRA_DIRS} $with_osg" +fi + dnl Determine an extra directories to add to include/lib search paths case "${host}" in *-apple-darwin* | *-*-mingw32*) @@ -90,20 +98,12 @@ 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 Multiplayer support -# default to with_network=yes -AC_ARG_WITH(multiplayer, [ --with-multiplayer Include multiplayer support [default=yes]]) - -if test "x$with_multiplayer" = "xno"; then - echo "Building without any kind of multiplayer support" +AC_ARG_ENABLE(sp_fdms, [ --enable-sp-fdms Include special purpose Flight Models], [enable_sp_fdms="$enableval"] ) +if test "x$enable_sp_fdms" != "xno"; then + AC_DEFINE([ENABLE_SP_FDM], 1, [Define to include special purpose FDMs]) else - echo "Building with multiplayer support" - AC_DEFINE([FG_MPLAYER_AS], 1, [Define to build with multiplayer support]) + AC_DEFINE([ENABLE_SP_FDM], 0, [Define to include special purpose FDMs]) fi -AM_CONDITIONAL(ENABLE_MPLAYER_AS, test "x$with_multiplayer" != "xno") - -AC_ARG_ENABLE(sp_fdms, [ --enable-sp-fdms Include special purpose Flight Models], [enable_sp_fdms="$enableval"] ) -AC_DEFINE([ENABLE_SP_FMDS], test "x$enable_sp_fdms" = "xyes", [Define to include special purpose FDMs]) AM_CONDITIONAL(ENABLE_SP_FDM, test "x$enable_sp_fdms" != "xno") @@ -118,14 +118,6 @@ fi AC_CHECK_HEADER(pthread.h) AM_CONDITIONAL(WITH_THREADS, test "x$with_threads" = "xyes") -dnl Festival related checks -# defaults to yes -AC_ARG_WITH(festival, [ --with-festival Use festival speech software [default=no]], [], [with_festival=no]) -if test "x$with_festival" = "xyes"; then - AC_DEFINE([USE_FESTIVAL], 1, [Define to enable festival speech software]) -fi -AM_CONDITIONAL(USE_FESTIVAL, test "x$with_festival" = "xyes") - dnl Used by JSBSim to conditionally compile in fgfs interface code AC_DEFINE([FGFS], 1, [Define so that JSBSim compiles in 'library' mode]) @@ -207,11 +199,18 @@ base_LIBS="$LIBS" dnl Check for SDL if enabled. AC_ARG_ENABLE(sdl, [ --enable-sdl Configure to use SDL instead of GLUT], [enable_sdl="$enableval"]) +AC_ARG_ENABLE(osgviewer, [ --enable-osgviewer Configure to use osgViewer], [enable_osgviewer="$enableval"]) AM_CONDITIONAL(USE_SDL, test "x$enable_sdl" = "xyes") +AM_CONDITIONAL(USE_OSGVIEWER, test "x$enable_osgviewer" = "xyes") if test "x$enable_sdl" = "xyes"; then AC_DEFINE([PU_USE_SDL], 1, [Define to use SDL]) else - AC_DEFINE([PU_USE_GLUT], 1, [Define to use glut]) + if test "x$enable_osgviewer" = "xyes"; then + AC_DEFINE([ENABLE_OSGVIEWER], 1, [Define to use osgViewer in renderer]) + AC_DEFINE([PU_USE_NATIVE], 1, [Define to use native system]) + else + AC_DEFINE([PU_USE_GLUT], 1, [Define to use glut]) + fi fi dnl check for OpenGL related libraries @@ -396,7 +395,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then exit fi -AC_MSG_CHECKING([for simgear 0.3.9 or newer]) +AC_MSG_CHECKING([for simgear 0.3.10 or newer]) AC_TRY_RUN([ #include @@ -407,7 +406,7 @@ AC_TRY_RUN([ #define MIN_MAJOR 0 #define MIN_MINOR 3 -#define MIN_MICRO 9 +#define MIN_MICRO 10 int main() { int major, minor, micro; @@ -481,7 +480,7 @@ dnl Checks for header files. AC_HEADER_STDC AC_CHECK_HEADERS( \ fcntl.h getopt.h malloc.h memory.h stdlib.h sys/param.h sys/stat.h \ - sys/time.h sys/timeb.h unistd.h windows.h values.h ) + sys/time.h sys/timeb.h unistd.h windows.h values.h ) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -495,7 +494,7 @@ LIBS="$base_LIBS $network_LIBS $opengl_LIBS" AC_TYPE_SIGNAL AC_FUNC_VPRINTF AC_CHECK_FUNCS( [ \ - ftime gettimeofday timegm memcpy bcopy mktime strstr rand mkfifo \ + ftime gettimeofday timegm memcpy bcopy mktime strstr rand mkfifo \ random drand48 setitimer getitimer signal GetLocalTime rint getrusage \ truncf ] ) LIBS=$old_LIBS @@ -511,15 +510,17 @@ AC_CONFIG_FILES([ \ man/gl-info.1 \ man/js_demo.1 \ man/pstest.1 \ - scripts/Makefile \ - scripts/debug/Makefile \ - scripts/perl/Makefile \ - scripts/perl/examples/Makefile \ - scripts/python/Makefile \ + scripts/Makefile \ + scripts/debug/Makefile \ + scripts/perl/Makefile \ + scripts/perl/examples/Makefile \ + scripts/python/Makefile \ src/Makefile \ src/Include/Makefile \ src/Include/version.h \ src/Include/config.h-msvc6 \ + src/Include/config.h-msvc71 \ + src/Include/config.h-msvc8 \ src/Aircraft/Makefile \ src/Airports/Makefile \ src/ATC/Makefile \ @@ -534,7 +535,7 @@ AC_CONFIG_FILES([ \ src/FDM/JSBSim/initialization/Makefile \ src/FDM/JSBSim/input_output/Makefile \ src/FDM/JSBSim/math/Makefile \ - src/FDM/JSBSim/models/Makefile \ + src/FDM/JSBSim/models/Makefile \ src/FDM/JSBSim/models/flight_control/Makefile \ src/FDM/JSBSim/models/atmosphere/Makefile \ src/FDM/JSBSim/models/propulsion/Makefile \ @@ -547,6 +548,7 @@ AC_CONFIG_FILES([ \ src/Input/Makefile \ src/Instrumentation/Makefile \ src/Instrumentation/KLN89/Makefile \ + src/Instrumentation/HUD/Makefile \ src/Main/Makefile \ src/Main/runfgfs \ src/Main/runfgfs.bat \