X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=0afede1a48ed68220a57e6b9d6bc75ae836de932;hb=c54cea8055c02156613e94f628cc5a1b39be85c1;hp=dc57f2307dfd11a325cc35d5fc87724acec47fb9;hpb=9afec17205548965d522b2a9c0a66ce12322dd25;p=flightgear.git diff --git a/configure.ac b/configure.ac index dc57f2307..0afede1a4 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]) @@ -12,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.6) +AM_INIT_AUTOMAKE(FlightGear, 0.9.10) dnl Checks for programs. AC_PROG_MAKE_SET @@ -29,14 +27,58 @@ AC_ARG_WITH(simgear, [ --with-simgear=PREFIX Specify the prefix path to simge if test "x$with_simgear" != "x" ; then echo "SimGear prefix path is $with_simgear" EXTRA_DIRS="${EXTRA_DIRS} $with_simgear" + CXXFLAGS="$CXXFLAGS -I$with_simgear" fi +# specify the plib location +AC_ARG_WITH(plib, [ --with-plib=PREFIX Specify the prefix path to plib]) + +if test "x$with_plib" != "x" ; then + echo "plib prefix is $with_plib" + 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*) + 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" + fi + if test -d /opt/X11R6 ; then + EXTRA_DIR2="/opt/X11R6" + fi + EXTRA_DIRS="${EXTRA_DIRS} $EXTRA_DIR1 $EXTRA_DIR2 /usr/local" + ;; + +esac +wi_EXTRA_DIRS(no, ${EXTRA_DIRS}) + + case "${host}" in *-*-irix*) if test "$CXX" = "CC"; then AR="CC -ar" ARFLAGS="-o" - CXXFLAGS="$CXXFLAGS -I$with_simgear/include/simgear/compatibility" + CXXFLAGS="$CXXFLAGS -c99 -I$with_simgear/include/simgear/compatibility" + CFLAGS="$CFLAGS -c99" else AR="ar" ARFLAGS="cru" @@ -56,30 +98,19 @@ 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") dnl Thread related checks # 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_ARG_WITH(threads, [ --with-threads Include tile loading threads [default=yes]], [], [with_threads=yes]) +if test "x$with_threads" = "xyes"; then AC_DEFINE([ENABLE_THREADS], 1, [Define to enable threaded tile paging]) CXXFLAGS="$CXXFLAGS -D_REENTRANT" CFLAGS="$CFLAGS -D_REENTRANT" @@ -87,50 +118,12 @@ fi AC_CHECK_HEADER(pthread.h) AM_CONDITIONAL(WITH_THREADS, test "x$with_threads" = "xyes") -# specify the plib location -AC_ARG_WITH(plib, [ --with-plib=PREFIX Specify the prefix path to plib]) - -if test "x$with_plib" != "x" ; then - echo "plib prefix is $with_plib" - EXTRA_DIRS="${EXTRA_DIRS} $with_plib" -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) -dnl Determine an extra directories to add to include/lib search paths -case "${host}" in -*-apple-darwin* | *-*-mingw32*) - 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" - fi - if test -d /opt/X11R6 ; then - EXTRA_DIR2="/opt/X11R6" - fi - EXTRA_DIRS="${EXTRA_DIRS} $EXTRA_DIR1 $EXTRA_DIR2 /usr/local/" - ;; - -esac -wi_EXTRA_DIRS(no, ${EXTRA_DIRS}) - - dnl Using AM_CONDITIONAL is a step out of the protected little dnl automake fold so it is potentially dangerous. But, we are dnl beginning to run into cases where the standard checks are not @@ -149,27 +142,13 @@ if test "$have_timezone" = yes; then AC_DEFINE([HAVE_TIMEZONE], 1, [Define if system has timezone variable]) fi -dnl add correct audio libs and configure for audio support -LIBS="-lplibsl -lplibsm" +dnl add joystick support libraries dnl search for FreeBSD library AC_SEARCH_LIBS(hid_init, usbhid) - -case "${host}" in -*-*-cygwin* | *-*-mingw32*) - LIBS="$LIBS -lwinmm" - ;; -*-apple-darwin*) - LIBS="$LIBS -framework IOKit -framework CoreFoundation" - ;; -*-*-irix* ) - LIBS="$LIBS -laudio" - ;; - -esac -audio_LIBS="$LIBS" +joystick_LIBS="$LIBS" LIBS="" -AC_SUBST(audio_LIBS) + dnl ENABLE_AUDIO_SUPPORT could be depricated at any time in favor of dnl just assuming we have audio support on all platform. We can @@ -196,7 +175,7 @@ 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" + CFLAGS="-pthread $CFLAGS" fi fi @@ -212,7 +191,8 @@ network_LIBS="$LIBS" LIBS="" dnl check for some default libraries -AC_SEARCH_LIBS(cos, m) +AC_SEARCH_LIBS(sqrt, [am ffm fm fastm m]) +AC_SEARCH_LIBS(ceil, m) AC_SEARCH_LIBS(dlclose, dl) base_LIBS="$LIBS" @@ -242,12 +222,13 @@ case "${host}" in fi LIBS="$LIBS -lglu32 -lopengl32 -luser32 -lgdi32" + joystick_LIBS="$joystick_LIBS -lwinmm" dnl add -lwsock32 for mingwin case "${host}" in *-*-mingw32*) echo "********** BUILDING FOR MINGW32 *************" - base_LIBS="$base_LIBS -lws2_32" + network_LIBS="$network_LIBS -lws2_32" ;; esac @@ -259,6 +240,7 @@ case "${host}" in dnl Mac OS X LIBS="$LIBS -framework GLUT -framework OpenGL -framework AGL -framework Carbon -lobjc" + joystick_LIBS="$joystick_LIBS -framework IOKit -framework CoreFoundation" ;; *) @@ -300,10 +282,7 @@ case "${host}" in esac opengl_LIBS="$LIBS" -LIBS="$base_LIBS" - -dnl search for FreeBSD library -AC_SEARCH_LIBS(hid_init, usbhid) +LIBS="$base_LIBS $joystick_LIBS" dnl check for OpenAL libraries case "${host}" in @@ -312,7 +291,7 @@ case "${host}" in AC_SEARCH_LIBS(alGenBuffers, openal32) AC_SEARCH_LIBS(alutInit, [ openal32 ALut ] ) - LIBS="$LIBS -lwinmm -ldsound -ldxguid -lole32" + LIBS="$LIBS -ldsound -ldxguid -lole32" openal_LIBS="$LIBS" ;; @@ -329,6 +308,7 @@ case "${host}" in save_LIBS=$LIBS LIBS="$LIBS $thread_LIBS" AC_SEARCH_LIBS(alGenBuffers, openal) + AC_SEARCH_LIBS(alutInit, [ alut openal ] ) OPENAL_OK="$ac_cv_search_alGenBuffers" openal_LIBS="$LIBS" LIBS=$save_LIBS @@ -343,6 +323,7 @@ AC_SUBST(openal_LIBS) AC_SUBST(opengl_LIBS) AC_SUBST(thread_LIBS) AC_SUBST(network_LIBS) +AC_SUBST(joystick_LIBS) # The following are C++ items that need to be tested for with the c++ # compiler @@ -362,11 +343,11 @@ if test "x$ac_cv_header_plib_ul_h" != "xyes"; then exit fi -AC_MSG_CHECKING([for plib 1.8.0 or newer]) +AC_MSG_CHECKING([for plib 1.8.4 or newer]) AC_TRY_RUN([ #include -#define MIN_PLIB_VERSION 170 +#define MIN_PLIB_VERSION 184 int main() { int major, minor, micro; @@ -381,7 +362,7 @@ int main() { ], AC_MSG_RESULT(yes), [AC_MSG_RESULT(wrong version); - AC_MSG_ERROR([Install plib 1.8.0 or later first...])], + AC_MSG_ERROR([Install plib 1.8.4 or later first...])], AC_MSG_RESULT(yes) ) @@ -391,7 +372,11 @@ AC_DEFINE([ENABLE_PLIB_JOYSTICK], 1, [Define to enable plib joystick support]) dnl Check for the presence of SimGear +if test "x$with_simgear" != "x"; then +AC_CHECK_HEADER($with_simgear/include/simgear/version.h, [ac_cv_header_simgear_version_h=yes], [ac_cv_header_simgear_version_h=no]) +else AC_CHECK_HEADER(simgear/version.h) +fi if test "x$ac_cv_header_simgear_version_h" != "xyes"; then echo echo "You *must* have the SimGear support library installed on your system" @@ -403,7 +388,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then exit fi -AC_MSG_CHECKING([for simgear 0.3.7 or newer]) +AC_MSG_CHECKING([for simgear 0.3.10 or newer]) AC_TRY_RUN([ #include @@ -414,7 +399,7 @@ AC_TRY_RUN([ #define MIN_MAJOR 0 #define MIN_MINOR 3 -#define MIN_MICRO 7 +#define MIN_MICRO 10 int main() { int major, minor, micro; @@ -443,7 +428,11 @@ int main() { LIBS="$saved_LIBS" dnl Check if SimGear was built with Norman's JPEG factory support +if test "x$with_simgear" != "x"; then +AC_CHECK_HEADER($with_simgear/include/simgear/screen/jpgfactory.hxx,[ac_cv_header_simgear_screen_jpgfactory_hxx=yes],[ac_cv_header_simgear_screen_jpgfactory_hxx=no]) +else AC_CHECK_HEADER(simgear/screen/jpgfactory.hxx) +fi if test "x$ac_cv_header_simgear_screen_jpgfactory_hxx" = "xyes"; then AC_CHECK_LIB(jpeg, jpeg_start_compress) if test "x$ac_cv_lib_jpeg_jpeg_start_compress" != "xyes" ; then @@ -529,13 +518,18 @@ AC_CONFIG_FILES([ \ src/Autopilot/Makefile \ src/Cockpit/Makefile \ src/Cockpit/built_in/Makefile \ - src/Controls/Makefile \ 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/JSBSim/initialization/Makefile \ + src/FDM/JSBSim/input_output/Makefile \ + src/FDM/JSBSim/math/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 \ src/FDM/LaRCsim/Makefile \ src/FDM/SP/Makefile \ src/FDM/UIUCModel/Makefile \ @@ -544,6 +538,8 @@ AC_CONFIG_FILES([ \ src/GUI/Makefile \ src/Input/Makefile \ src/Instrumentation/Makefile \ + src/Instrumentation/KLN89/Makefile \ + src/Instrumentation/HUD/Makefile \ src/Main/Makefile \ src/Main/runfgfs \ src/Main/runfgfs.bat \ @@ -552,8 +548,6 @@ AC_CONFIG_FILES([ \ src/MultiPlayer/Makefile \ src/Navaids/Makefile \ src/Network/Makefile \ - src/Objects/Makefile \ - src/Replay/Makefile \ src/Scenery/Makefile \ src/Scripting/Makefile \ src/Sound/Makefile \ @@ -562,9 +556,11 @@ AC_CONFIG_FILES([ \ src/Traffic/Makefile \ tests/Makefile \ utils/Makefile \ - utils/TerraSync/Makefile \ - utils/Modeller/Makefile \ + utils/GPSsmooth/Makefile \ utils/js_server/Makefile \ + utils/Modeller/Makefile \ + utils/TerraSync/Makefile \ + utils/xmlgrep/Makefile \ ]) AC_OUTPUT @@ -583,7 +579,7 @@ else fi echo -n "Automake version: " -automake --version | head -1 +automake --version | head -n 1 if test "x$with_multiplayer" != "xno"; then echo "Building with multiplayer support"