X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=1af45ab9dfaaf21fb7e4d0f00563af965320aa6f;hb=65fd0c9c7a6ce872976e0299b6fb2bbde8d523b6;hp=7c8aa4065b39b24a1cfba15e14bf569d8f8b9d9b;hpb=29aae322c76667e4dac10270b2ca9430e058957a;p=flightgear.git diff --git a/configure.ac b/configure.ac index 7c8aa4065..1af45ab9d 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.10) +AM_INIT_AUTOMAKE(FlightGear, 1.9.1) dnl Checks for programs. AC_PROG_MAKE_SET @@ -20,9 +20,14 @@ AC_PROG_CXX AC_PROG_RANLIB AC_PROG_INSTALL AC_PROG_LN_S +AX_BOOST_BASE([1.34.0]) + +if test "x$BOOST_CPPFLAGS" != "x-I/usr/include" ; then + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" +fi # specify the simgear location -AC_ARG_WITH(simgear, [ --with-simgear=PREFIX Specify the prefix path to simgear]) +AC_ARG_WITH(simgear, [ --with-simgear=PREFIX Specify the prefix path to SimGear]) if test "x$with_simgear" != "x" ; then echo "SimGear prefix path is $with_simgear" @@ -98,7 +103,7 @@ if test "x$with_logging" = "xno" ; then AC_DEFINE([FG_NDEBUG], 1, [Define for no logging output]) fi -AC_ARG_ENABLE(sp_fdms, [ --enable-sp-fdms Include special purpose Flight Models], [enable_sp_fdms="$enableval"] ) +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 @@ -194,26 +199,29 @@ dnl check for some default libraries AC_SEARCH_LIBS(sqrt, [am ffm fm fastm m]) AC_SEARCH_LIBS(ceil, m) AC_SEARCH_LIBS(dlclose, dl) +AC_SEARCH_LIBS(clock_gettime, rt) 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"]) +dnl Check for SDL or glut if enabled. +AC_ARG_ENABLE(osgviewer, [ --enable-osgviewer Configure to use osgViewer(default)], [enable_osgviewer="$enableval"]) +AC_ARG_ENABLE(sdl, [ --enable-sdl Configure to use SDL], [enable_sdl="$enableval"]) +AC_ARG_ENABLE(glut, [ --enable-glut Configure to use GLUT], [enable_glut="$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 - 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 +AM_CONDITIONAL(USE_GLUT, test "x$enable_glut" = "xyes") +if test "x$enable_sdl" != "xyes" -a "x$enable_glut" != "xyes" -a "x$enable_osgviewer" != "xno"; then + enable_osgviewer="yes" fi +if test \( "x$enable_osgviewer" = "xyes" \ + -a \( "x$enable_sdl" = "xyes" -o "x$enable_glut" = "xyes" \) \) \ + -o \( "x$enable_sdl" = "xyes" -a "x$enable_glut" = "xyes" \); then + echo " Only one of --enable-osgviewer, --enable-sdl, or --enable -glut may" + echo " be supplied." + exit +fi +AC_DEFINE([PU_USE_NONE], 1, [Define to use application's pu callbacks]) -AC_ARG_ENABLE(osgdebug, [ --enable-osgdebug Use OSG debug libraries], [enable_osgdebug="$enableval"]) +AC_ARG_ENABLE(osgdebug, [ --enable-osgdebug Use OSG debug libraries], [enable_osgdebug="$enableval"]) dnl check for OpenGL related libraries case "${host}" in @@ -388,7 +396,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then exit fi -AC_MSG_CHECKING([for simgear 0.3.10 or newer]) +AC_MSG_CHECKING([for SimGear 1.9.0 or newer]) AC_TRY_RUN([ #include @@ -397,9 +405,9 @@ AC_TRY_RUN([ #define STRINGIFY(X) XSTRINGIFY(X) #define XSTRINGIFY(X) #X -#define MIN_MAJOR 0 -#define MIN_MINOR 3 -#define MIN_MICRO 10 +#define MIN_MAJOR 1 +#define MIN_MINOR 9 +#define MIN_MICRO 0 int main() { int major, minor, micro; @@ -421,7 +429,7 @@ int main() { ], AC_MSG_RESULT(yes), [AC_MSG_RESULT(wrong version); - AC_MSG_ERROR([Install latest simgear first...])], + AC_MSG_ERROR([Install latest SimGear first...])], AC_MSG_RESULT(yes) ) @@ -464,11 +472,11 @@ if test "x$ac_cv_header_plib_ul_h" != "xyes"; then exit fi -AC_MSG_CHECKING([for plib 1.8.4 or newer]) +AC_MSG_CHECKING([for plib 1.8.5 or newer]) AC_TRY_RUN([ #include -#define MIN_PLIB_VERSION 184 +#define MIN_PLIB_VERSION 185 int main() { int major, minor, micro; @@ -483,7 +491,7 @@ int main() { ], AC_MSG_RESULT(yes), [AC_MSG_RESULT(wrong version); - AC_MSG_ERROR([Install plib 1.8.4 or later first...])], + AC_MSG_ERROR([Install plib 1.8.5 or later first...])], AC_MSG_RESULT(yes) ) @@ -534,6 +542,7 @@ case "${host}" in AC_CHECK_LIB(osgUtild,osgUtilGetVersion) AC_CHECK_LIB(osgDBd,osgDBGetVersion) AC_CHECK_LIB(osgSimd,osgSimGetVersion) + AC_CHECK_LIB(osgParticled,osgParticleGetVersion) AC_CHECK_LIB(osgd,osgGetVersion) AC_CHECK_LIB(OpenThreadsd,OpenThreadsGetVersion) else @@ -544,6 +553,7 @@ case "${host}" in AC_CHECK_FRAMEWORK(osgUtil, [#include ]) AC_CHECK_FRAMEWORK(osgDB, [#include ]) AC_CHECK_FRAMEWORK(osgSim, [#include ]) + AC_CHECK_FRAMEWORK(osgParticle, [#include ]) AC_CHECK_FRAMEWORK(osg, [#include ]) AC_CHECK_FRAMEWORK(OpenThreads, [#include ]) fi @@ -558,6 +568,7 @@ case "${host}" in AC_CHECK_LIB(osgGAd,osgGAGetVersion) AC_CHECK_LIB(osgViewerd,osgViewerGetVersion) AC_CHECK_LIB(osgSimd,osgSimGetVersion) + AC_CHECK_LIB(osgParticled,osgParticleGetVersion) LIBS="$LIBS -losgFXd" else AC_CHECK_LIB(OpenThreads,OpenThreadsGetVersion) @@ -568,6 +579,7 @@ case "${host}" in AC_CHECK_LIB(osgGA,osgGAGetVersion) AC_CHECK_LIB(osgViewer,osgViewerGetVersion) AC_CHECK_LIB(osgSim,osgSimGetVersion) + AC_CHECK_LIB(osgParticle,osgParticleGetVersion) LIBS="$LIBS -losgFX" fi ;; @@ -591,7 +603,34 @@ if test "x$ac_cv_header_zlib_h" != "xyes"; then echo fi +dnl Check for Subversion library support +save_LIBS=$LIBS +save_CPPFLAGS=$CPPFLAGS +LIBS="" +CPPFLAGS="-I/usr/include/subversion-1 `apr-1-config --includes`" +AC_CHECK_LIB(svn_client-1, svn_client_checkout3) +AC_CHECK_HEADERS([svn_client.h]) +if test "x$ac_cv_header_svn_client_h" != "xyes"; then + echo "TerraSync will shell out for command line subversion" + svn_LIBS="" + svn_CPPFLAGS="" +else + echo "TerraSync will use integrated subversion library" + AC_SEARCH_LIBS(svn_client_checkout, svn_client-1) + svn_LIBS=$LIBS + svn_CPPFLAGS=$CPPFLAGS + AC_SUBST(svn_LIBS) + AC_SUBST(svn_CPPFLAGS) +fi +LIBS=$save_LIBS +CPPFLAGS=$save_CPPFLAGS +AC_MSG_CHECKING([for feenableexcept]) +AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define _GNU_SOURCE +#include ]], [[feenableexcept(FE_DIVBYZERO)]])], +[AC_DEFINE([HAVE_FEENABLEEXCEPT], 1, [define if system has fenableexcept])], +AC_MSG_RESULT([yes]), +AC_MSG_RESULT([no])) dnl Checks for header files. AC_HEADER_STDC @@ -641,11 +680,11 @@ AC_CONFIG_FILES([ \ src/Aircraft/Makefile \ src/Airports/Makefile \ src/ATC/Makefile \ + src/ATCDCL/Makefile \ src/Autopilot/Makefile \ src/Cockpit/Makefile \ src/Cockpit/built_in/Makefile \ src/Environment/Makefile \ - src/FDM/Balloon/Makefile \ src/FDM/ExternalNet/Makefile \ src/FDM/ExternalPipe/Makefile \ src/FDM/JSBSim/Makefile \ @@ -683,10 +722,14 @@ AC_CONFIG_FILES([ \ tests/Makefile \ utils/Makefile \ utils/GPSsmooth/Makefile \ + utils/fgadmin/Makefile + utils/fgadmin/src/Makefile \ utils/js_server/Makefile \ utils/Modeller/Makefile \ + utils/propmerge/Makefile \ utils/TerraSync/Makefile \ utils/xmlgrep/Makefile \ + utils/fgviewer/Makefile \ ]) AC_OUTPUT