X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=ed46c80a3f951ccded668ac02f73c82641a27462;hb=0a4cb2469274b4f88ceaf4494a10dfeec820df2a;hp=083aab14420048caa4532bd271d8903d21d84332;hpb=e57e85c5639ddc90416ab40043f14752f37355f5;p=flightgear.git diff --git a/configure.ac b/configure.ac index 083aab144..ed46c80a3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,5 @@ dnl Process this file with autoget.sh to produce a working configure dnl script. -dnl -dnl $Id$ AC_INIT AC_CONFIG_SRCDIR([src/Aircraft/aircraft.cxx]) @@ -10,7 +8,9 @@ dnl Require at least automake 2.52 AC_PREREQ(2.52) dnl Initialize the automake stuff -AM_INIT_AUTOMAKE(FlightGear, 0.9.1) +dnl set the $host variable based on local machine/os +AC_CANONICAL_TARGET +AM_INIT_AUTOMAKE(FlightGear, 0.9.8-pre2) dnl Checks for programs. AC_PROG_MAKE_SET @@ -29,9 +29,6 @@ if test "x$with_simgear" != "x" ; then EXTRA_DIRS="${EXTRA_DIRS} $with_simgear" fi -dnl set the $host variable based on local machine/os -AC_CANONICAL_HOST - case "${host}" in *-*-irix*) if test "$CXX" = "CC"; then @@ -57,38 +54,35 @@ 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 multiplayer support [default=yes]]) + +if test "x$with_multiplayer" = "xno"; then + echo "Building without any kind of multiplayer support" 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 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") +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") -# Specify if we want to use WeatherCM instead of FGEnvironment. -# default to with_weathercm=no -AC_ARG_WITH(new-environment, [ --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 +# defaults to yes +with_threads=yes +AC_ARG_WITH(threads, [ --with-threads Include tile loading threads [default=yes]]) +if test "x$with_threads" != "xyes"; then + AC_DEFINE([ENABLE_THREADS], 0, [Define to enable threaded tile paging]) +else AC_DEFINE([ENABLE_THREADS], 1, [Define to enable threaded tile paging]) CXXFLAGS="$CXXFLAGS -D_REENTRANT" CFLAGS="$CFLAGS -D_REENTRANT" - AC_CHECK_HEADER(pthread.h) fi +AC_CHECK_HEADER(pthread.h) AM_CONDITIONAL(WITH_THREADS, test "x$with_threads" = "xyes") # specify the plib location @@ -99,17 +93,13 @@ if test "x$with_plib" != "x" ; then EXTRA_DIRS="${EXTRA_DIRS} $with_plib" fi -# specify the metakit location -AC_ARG_WITH(metakit, [ --with-metakit=PREFIX Specify the prefix path to metakit]) - -if test "x$with_metakit" != "x" ; then - echo "metakit prefix is $with_metakit" - EXTRA_DIRS="${EXTRA_DIRS} $with_metakit" -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 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") + # Check for MS Windows environment AC_CHECK_HEADER(windows.h) @@ -119,6 +109,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" @@ -126,7 +122,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 /usr/local/" ;; esac @@ -152,17 +148,25 @@ if test "$have_timezone" = yes; then fi dnl add correct audio libs and configure for audio support -audio_LIBS="-lplibsl -lplibsm" +LIBS="-lplibsl -lplibsm" + +dnl search for FreeBSD library +AC_SEARCH_LIBS(hid_init, usbhid) + case "${host}" in *-*-cygwin* | *-*-mingw32*) - audio_LIBS="$audio_LIBS -lwinmm" + LIBS="$LIBS -lwinmm" + ;; +*-apple-darwin*) + LIBS="$LIBS -framework IOKit -framework CoreFoundation" ;; - *-*-irix* ) - audio_LIBS="$audio_LIBS -laudio" + LIBS="$LIBS -laudio" ;; esac +audio_LIBS="$LIBS" +LIBS="" AC_SUBST(audio_LIBS) dnl ENABLE_AUDIO_SUPPORT could be depricated at any time in favor of @@ -185,28 +189,39 @@ esac dnl Checks for libraries. -null_LIBS="$LIBS" +dnl Thread related checks +AC_SEARCH_LIBS(pthread_cancel, [pthread c_r]) +if test "x$ac_cv_header_pthread_h" = "xyes"; then + if test "x$ac_cv_search_pthread_exit" = "x-lc_r"; then + CXXFLAGS="-pthread $CXXFLAGS" + CFLAGS="-pthread $FLAGS" + fi +fi -AC_CHECK_LIB(m, cos) +thread_LIBS="$LIBS" +LIBS="" -base_LIBS="$LIBS" +dnl search for network related libraries +AC_SEARCH_LIBS(inet_addr, xnet) +AC_SEARCH_LIBS(socket, socket) +AC_SEARCH_LIBS(main, nsl) -dnl Thread related checks -AC_CHECK_LIB(pthread, pthread_exit) -AC_CHECK_LIB(socket, socket) +network_LIBS="$LIBS" +LIBS="" + +dnl check for some default libraries +AC_SEARCH_LIBS(cos, m) +AC_SEARCH_LIBS(dlclose, dl) + +base_LIBS="$LIBS" -dnl check for glut location -AC_CHECK_HEADER(GL/glut.h) -if test "x$ac_cv_header_GL_glut_h" = "xyes"; then - AC_DEFINE([GLUT_H], "GL/glut.h", [Define as glut.h include location]) +dnl Check for SDL if enabled. +AC_ARG_ENABLE(sdl, [ --enable-sdl Configure to use SDL instead of GLUT], [enable_sdl="$enableval"]) +AM_CONDITIONAL(USE_SDL, test "x$enable_sdl" = "xyes") +if test "x$enable_sdl" = "xyes"; then + AC_DEFINE([PU_USE_SDL], 1, [Define to use SDL]) 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]) - else - echo "Neither GL/glut.h nor GLUT/glut.h found. Cannot continue" - exit - fi + AC_DEFINE([PU_USE_GLUT], 1, [Define to use glut]) fi dnl check for OpenGL related libraries @@ -218,8 +233,13 @@ case "${host}" in AC_DEFINE([WIN32], 1, [Define for Win32 platforms]) AC_DEFINE([NOMINMAX], 1, [Define for Win32 platforms]) - LIBS="$LIBS -lglut32 -lglu32 -lopengl32" - LIBS="$LIBS -luser32 -lgdi32" + if test "x$enable_sdl" = "xyes"; then + AC_SEARCH_LIBS(SDL_Init, SDL) + else + LIBS="$LIBS -lglut32" + fi + + LIBS="$LIBS -lglu32 -lopengl32 -luser32 -lgdi32" dnl add -lwsock32 for mingwin case "${host}" in @@ -236,7 +256,7 @@ case "${host}" in *-apple-darwin*) dnl Mac OS X - LIBS="$LIBS -framework GLUT -framework OpenGL -framework Carbon -lobjc" + LIBS="$LIBS -framework GLUT -framework OpenGL -framework AGL -framework Carbon -lobjc" ;; *) @@ -244,47 +264,34 @@ case "${host}" in dnl Skip X11 library tests if requested. if test "x$no_x" != "xyes"; then - AC_CHECK_LIB(X11, XCreateWindow) - AC_CHECK_LIB(Xext, XShmCreateImage) - AC_CHECK_LIB(Xi, XGetExtensionVersion) - AC_CHECK_LIB(ICE, IceOpenConnection) - AC_CHECK_LIB(SM, SmcOpenConnection) - AC_CHECK_LIB(Xt, XtMalloc) - AC_CHECK_LIB(Xmu, XmuLookupStandardColormap) + AC_SEARCH_LIBS(XCreateWindow, X11) + AC_SEARCH_LIBS(XShmCreateImage, Xext) + AC_SEARCH_LIBS(XGetExtensionVersion, Xi) + AC_SEARCH_LIBS(IceOpenConnection, ICE) + AC_SEARCH_LIBS(SmcOpenConnection, SM) + AC_SEARCH_LIBS(XtMalloc, Xt) + AC_SEARCH_LIBS(XmuLookupStandardColormap, Xmu) fi - AC_CHECK_LIB(GLcore, glNewList) - if test "x$ac_cv_lib_GLcore_glNewList" = "xno" ; then - dnl if no GLcore, check for GL - AC_CHECK_LIB(GL, glNewList) - if test "x$ac_cv_lib_GL_glNewList" = "xno" ; then - dnl if no GL, check for MesaGL - AC_CHECK_LIB(MesaGL, glNewList) - fi - else - dnl if GLcore found, then also check for GL - AC_CHECK_LIB(GL, glXCreateContext) + AC_SEARCH_LIBS(glNewList, [ GL GLcore MesaGL ]) + if test "x$ac_cv_search_glNewList" = "x-lGLcore"; then + dnl if GLcore found, then also check for GL + AC_SEARCH_LIBS(glXCreateContext, GL) fi dnl if using mesa, check for xmesa.h - if test "x$ac_cv_lib_MesaGL_glNewList" = "xyes" ; then - AC_CHECK_HEADER(GL/fxmesa.h) - if test "x$ac_cv_header_GL_fxmesa_h" = "xyes"; then - AC_DEFINE([XMESA], 1, [Define for fxmesa]) + if test "x$ac_cv_search_glNewList" = "x-lMesaGL"; then + AC_CHECK_HEADER(GL/fxmesa.h) + if test "x$ac_cv_header_GL_fxmesa_h" = "xyes"; then + AC_DEFINE([XMESA], 1, [Define for fxmesa]) AC_DEFINE([FX], 1, [Define for fxmesa]) fi fi - AC_CHECK_LIB(GLU, gluLookAt) - if test "x$ac_cv_lib_GLU_gluLookAt" = "xno" ; then - dnl if no GLU, check for MesaGLU - AC_CHECK_LIB(MesaGLU, gluLookAt) - fi - - AC_CHECK_LIB(glut, glutGetModifiers) - if test "x$ac_cv_lib_glut_glutGetModifiers" = "xno" ; then - dnl if no "real" glut, check for freeglut - AC_CHECK_LIB(freeglut, glutGetModifiers) + AC_SEARCH_LIBS(gluLookAt, [ GLU MesaGLU ]) + AC_SEARCH_LIBS(glutGetModifiers, [ glut freeglut ]) + if test "x$enable_sdl" = "xyes"; then + AC_SEARCH_LIBS(SDL_Init, SDL) fi ;; @@ -293,8 +300,47 @@ esac opengl_LIBS="$LIBS" LIBS="$base_LIBS" +dnl search for FreeBSD library +AC_SEARCH_LIBS(hid_init, usbhid) + +dnl check for OpenAL libraries +case "${host}" in +*-*-cygwin* | *-*-mingw32*) + dnl CygWin under Windoze. + + AC_SEARCH_LIBS(alGenBuffers, openal32) + AC_SEARCH_LIBS(alutInit, [ openal32 ALut ] ) + LIBS="$LIBS -lwinmm -ldsound -ldxguid -lole32" + openal_LIBS="$LIBS" + ;; + +*-apple-darwin*) + dnl Mac OS X + + LIBS="$LIBS -framework IOKit -framework OpenAL" + openal_LIBS="$LIBS" + ;; + +*) + dnl default unix style machines + + save_LIBS=$LIBS + LIBS="$LIBS $thread_LIBS" + AC_SEARCH_LIBS(alGenBuffers, openal) + OPENAL_OK="$ac_cv_search_alGenBuffers" + openal_LIBS="$LIBS" + LIBS=$save_LIBS + ;; + +esac + +LIBS="$base_LIBS" + AC_SUBST(base_LIBS) +AC_SUBST(openal_LIBS) AC_SUBST(opengl_LIBS) +AC_SUBST(thread_LIBS) +AC_SUBST(network_LIBS) # The following are C++ items that need to be tested for with the c++ # compiler @@ -314,11 +360,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.8.0 or newer]) AC_TRY_RUN([ #include -#define MIN_PLIB_VERSION 160 +#define MIN_PLIB_VERSION 170 int main() { int major, minor, micro; @@ -333,63 +379,14 @@ 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) ) dnl If we get here then plib is available, so force use of plib dnl joystick lib AC_DEFINE([ENABLE_PLIB_JOYSTICK], 1, [Define to enable plib joystick support]) -AC_DEFINE([FG_PLIB_JOYSTICK_GETNAME], 1, - [Define to enable plib joystick name support]) -dnl Check for MetaKit -AC_CHECK_HEADER(mk4.h) -if test "x$ac_cv_header_mk4_h" != "xyes"; then - echo - echo "MetaKit library not found." - echo - echo "If your OS does not provide an installable package for MetaKit" - echo "you will have to compile and install it first yourself. A copy" - echo "of metakit-$(VERSION).tar.gz is included with SimGear. You will" - echo "have to untar this source code, and follow it's included instructions" - echo "to compile and install on your system." - echo - echo "configure aborted." - exit -fi - -AC_MSG_CHECKING([for metakit 2.4.3 or newer]) -saved_LIBS="$LIBS" -LIBS="$saved_LIBS -lmk4" -AC_TRY_RUN([ -#include - -#define MIN_MK4_VERSION 243 - -int main() { - int major, minor, micro; - - if ( d4_MetaKitLibraryVersion < MIN_MK4_VERSION ) { - return -1; - } - - return 0; -} - -], - AC_MSG_RESULT(yes), - [AC_MSG_RESULT(wrong version); - AC_MSG_ERROR([ - -Install metakit 2.4.3 or later first. - -Or, the compiler may not be finding your libmk4.so library. -Please check the config.log file for specific details of the -failure if you believe you have the correct metakit version. -Also, look up this issue in the FlightGear FAQ.])], - AC_MSG_RESULT(yes) -) dnl Check for the presence of SimGear AC_CHECK_HEADER(simgear/version.h) @@ -404,7 +401,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then exit fi -AC_MSG_CHECKING([for simgear 0.3.0 or newer]) +AC_MSG_CHECKING([for simgear 0.3.8 or newer]) AC_TRY_RUN([ #include @@ -415,20 +412,19 @@ AC_TRY_RUN([ #define MIN_MAJOR 0 #define MIN_MINOR 3 -#define MIN_MICRO 0 +#define MIN_MICRO 8 int main() { int major, minor, micro; - printf("%d.%d.%d or greater... ", MIN_MAJOR, MIN_MINOR, MIN_MICRO); + /* printf("%d.%d.%d or greater, ", MIN_MAJOR, MIN_MINOR, MIN_MICRO); */ + printf("[found %s] ... ", STRINGIFY(SIMGEAR_VERSION)); sscanf( STRINGIFY(SIMGEAR_VERSION), "%d.%d.%d", &major, &minor, µ ); - if ( major < MIN_MAJOR ) { - return -1; - } else if ( major == MIN_MAJOR && minor < MIN_MINOR ) { - return -1; - } else if ( major == MIN_MAJOR && minor == MIN_MINOR && micro < MIN_MICRO ){ + if ( (major < MIN_MAJOR) || + (major == MIN_MAJOR && minor < MIN_MINOR) || + (major == MIN_MAJOR && minor == MIN_MINOR && micro < MIN_MICRO) ) { return -1; } @@ -444,7 +440,7 @@ int main() { LIBS="$saved_LIBS" -dnl Check if SimGear was built with Norman JPEG factory support +dnl Check if SimGear was built with Norman's JPEG factory support AC_CHECK_HEADER(simgear/screen/jpgfactory.hxx) if test "x$ac_cv_header_simgear_screen_jpgfactory_hxx" = "xyes"; then AC_CHECK_LIB(jpeg, jpeg_start_compress) @@ -486,7 +482,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 winbase.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,11 +491,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( \ - ftime gettimeofday timegm memcpy bcopy mktime strstr rand \ - random drand48 setitimer getitimer signal GetLocalTime rint getrusage ) +AC_CHECK_FUNCS( [ \ + ftime gettimeofday timegm memcpy bcopy mktime strstr rand mkfifo \ + random drand48 setitimer getitimer signal GetLocalTime rint getrusage \ + truncf ] ) +LIBS=$old_LIBS AM_CONFIG_HEADER(src/Include/config.h) @@ -514,10 +514,13 @@ 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 \ src/Include/version.h \ + src/Include/config.h-msvc6 \ src/Aircraft/Makefile \ src/Airports/Makefile \ src/ATC/Makefile \ @@ -528,9 +531,11 @@ 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 \ + src/FDM/SP/Makefile \ src/FDM/UIUCModel/Makefile \ src/FDM/YASim/Makefile \ src/FDM/Makefile \ @@ -541,18 +546,23 @@ 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/Sound/Makefile \ src/Systems/Makefile \ src/Time/Makefile \ - src/WeatherCM/Makefile \ + src/Traffic/Makefile \ tests/Makefile \ utils/Makefile \ utils/TerraSync/Makefile \ + utils/Modeller/Makefile \ + utils/js_server/Makefile \ ]) AC_OUTPUT @@ -573,12 +583,8 @@ fi echo -n "Automake version: " automake --version | head -1 -echo "New plib joystick name support: $plib_js_has_getname" - -if test "x$with_weathercm" != "x"; then - echo "WeatherCM instead of FGEnvironment: $with_weathercm" -else - echo "Using FGEnvironment" +if test "x$with_multiplayer" != "xno"; then + echo "Building with multiplayer support" fi if test "x$with_threads" = "xyes"; then @@ -586,3 +592,10 @@ if test "x$with_threads" = "xyes"; then else echo "threads: no" fi + +if test "x$enable_sp_fdms" != "xno"; then + echo "Include special purpose flight models: yes" +else + echo "Include special purpose flight models: no" +fi +