X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=8285ffce2f07f03e2d99585f0985bff293967c1a;hb=8a089f6d6f9e7851e73fd118cb9a5f5583cfe517;hp=df8ba3dcb4b4647d7633865b493a8e28a75724fc;hpb=5889a7148b492411430a7f3a76ae7847e0096ff7;p=flightgear.git diff --git a/configure.ac b/configure.ac index df8ba3dcb..8285ffce2 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autogen.sh to produce a working configure dnl script. AC_INIT -AC_CONFIG_SRCDIR([src/Aircraft/aircraft.cxx]) +AC_CONFIG_SRCDIR([src/Airports/simple.cxx]) dnl Require at least automake 2.52 AC_PREREQ(2.52) @@ -23,6 +23,10 @@ AC_PROG_INSTALL AC_PROG_LN_S AX_BOOST_BASE([1.37.0]) +# Show all compiler warnings by default +CXXFLAGS="$CXXFLAGS -Wall" +CFLAGS="$CFLAGS -Wall" + if test "x$BOOST_CPPFLAGS" != "x-I/usr/include" ; then CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" fi @@ -58,7 +62,7 @@ case "${host}" in dnl Thank you Christian Bauer from SheepSaver dnl Modified by Tatsuhiro Nishioka for accepting a given framework path - dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES, $3=FRAMEWORK_PATH) ; $3 is optional + dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES, $3=FRAMEWORK_PATH, $4=ACTION_IF_FOUND) ; AC_DEFUN([AC_CHECK_FRAMEWORK], [ AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])dnl AC_CACHE_CHECK([whether compiler supports framework $1], @@ -71,6 +75,7 @@ case "${host}" in FRAMEWORKS="$FRAMEWORKS -F$3" CXXFLAGS="$CXXFLAGS -F$3" CCFLAGS="$CCFLAGS -F$3" + CPPFLAGS="$CPPFLAGS -F$3" dnl This is needed for AC_TRY_LINK when a framework path is specified export DYLD_FRAMEWORK_PATH="${DYLD_FRAMEWORK_PATH}:$3" fi @@ -82,11 +87,12 @@ case "${host}" in AS_IF([test AS_VAR_GET(ac_Framework) = yes], [AC_DEFINE(AS_TR_CPP(HAVE_FRAMEWORK_$1), 1, [Define if framework $1 is available.])] ) + AS_IF([test AS_VAR_GET(ac_Framework) = yes], $4) AS_VAR_POPDEF([ac_Framework])dnl ]) # Mac OS X specific configure options - AC_ARG_WITH(cocoa_framework, [ --with-cocoa-framework Use the Cocoa rather than Carbon]]) + AC_ARG_WITH(cocoa_framework, [ --with-cocoa-framework Use the Cocoa rather than Carbon]) if test "x$with_cocoa_framework" != "x" ; then macAPI=Cocoa AC_MSG_NOTICE([Using Cocoa framework]) @@ -95,21 +101,21 @@ case "${host}" in AC_MSG_NOTICE([Using Carbon framework]) fi - AC_ARG_WITH(osg_framework, [ --with-osg-framework=PREFIX Specify the prefix path to osg frameworks [default=standard framework paths]]) + AC_ARG_WITH(osg_framework, [ --with-osg-framework=PREFIX Specify the prefix path to osg frameworks [default=standard framework paths]]) if test "x$with_osg_framework" != "x" ; then echo "osg prefix is $with_osg_framework" export DYLD_FRAMEWORK_PATH="$DYLD_FRAMEWORK_PATH:$with_osg_framework" fi - AC_ARG_WITH(plib_framework, [ --with-plib-framework=PREFIX Specify the prefix path to PLIB framework [default=standard framework paths]]) + AC_ARG_WITH(plib_framework, [ --with-plib-framework=PREFIX Specify the prefix path to PLIB framework [default=standard framework paths]]) if test "x$with_plib_framework" != "x" ; then echo "plib prefix is $with_plib_framework" export DYLD_FRAMEWORK_PATH="$DYLD_FRAMEWORK_PATH:$with_plib_framework" fi - AC_ARG_WITH(openal_framework, [ --with-openal-framework=PREFIX Speicfy the prefix path to OpenAL.framework ]) - if test "x$with_openal_framework" != "x"; then - echo "OpenAL framework prefix is $with_openal_framework" + AC_ARG_WITH(alut_framework, [ --with-alut-framework=PREFIX Specify the prefix path to ALUT.framework ]) + if test "x$with_alut_framework" != "x"; then + echo "ALUT framework prefix is $with_alut_framework" fi ;; @@ -177,15 +183,13 @@ AM_CONDITIONAL(ENABLE_SP_FDM, test "x$enable_sp_fdms" != "xno") # Specify whether we want to compile ATCDCL. # default to with_atcdcl=yes -AC_ARG_ENABLE(atcdcl, [ --enable-atcdcl Compile and link the depricated atc/ai module], [enable_atcdcl="$enableval"] ) -if test "x$enable_atcdcl" != "xno"; then +AC_ARG_ENABLE(atcdcl, [ --enable-atcdcl Compile and link the deprecated atc/ai module], [], [enable_atcdcl="$enableval"] ) +if test "x$enable_atcdcl" = "xyes"; then AC_DEFINE([ENABLE_ATCDCL], 1, [Define to include old ATC/AI module]) else AC_DEFINE([ENABLE_ATCDCL], 0, [Define to include old ATC/AI module]) fi -AM_CONDITIONAL(ENABLE_ATCDCL, test "x$enable_atcdcl" != "xno") - - +AM_CONDITIONAL(ENABLE_ATCDCL, test "x$enable_atcdcl" = "xyes") dnl EXPERIMENTAL generic event driven input device # defaults to no @@ -229,7 +233,6 @@ if test "x$with_threads" = "xyes"; then fi AC_CHECK_HEADER(pthread.h) - dnl Used by JSBSim to conditionally compile in fgfs interface code AC_DEFINE([FGFS], 1, [Define so that JSBSim compiles in 'library' mode]) @@ -312,7 +315,7 @@ AC_SEARCH_LIBS(clock_gettime, rt) base_LIBS="$LIBS" 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(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") @@ -365,6 +368,7 @@ case "${host}" in dnl Mac OS X LIBS="$LIBS -framework GLUT -framework OpenGL -framework AGL -framework $macAPI -lobjc" + LDFLAGS="$LDFLAGS -headerpad_max_install_names" joystick_LIBS="$joystick_LIBS -framework IOKit -framework CoreFoundation" ;; @@ -428,19 +432,15 @@ case "${host}" in *-apple-darwin*) dnl Mac OS X - # Mac OS X has OpenAL.framework with ALUT by default - # so we can use it without checking it. - # Note: SimGear needs to check the existance of alut.h since it includes the header. - LIBS="$LIBS -framework IOKit -framework OpenAL" - openal_LIBS="$LIBS" - OPENAL_OK="yes" - ALUT_OK="yes" + # Mac OS X has OpenAL.framework, but no ALUT, by default, so we + # require use of a non-Apple ALUT.framework which we provide + openal_LIBS="-framework IOKit -framework OpenAL" - dnl Check for OpenAL.framework when --with-openal-framework is specified - if test "x$with_openal_framework" != "x"; then - AC_CHECK_FRAMEWORK(OpenAL, [#include ], $with_openal_framework) - fi - + AC_CHECK_FRAMEWORK(OpenAL, [#include ], "", [OPENAL_OK="yes"]) + AC_CHECK_FRAMEWORK(ALUT, [#include ], $with_alut_framework, [ + ALUT_OK="yes" + openal_LIBS="$openal_LIBS -framework ALUT" + ]) ;; *) @@ -747,10 +747,9 @@ fi dnl Check for Subversion library support save_LIBS=$LIBS save_CPPFLAGS=$CPPFLAGS -LIBS="" +LIBS="`apr-1-config --link-ld`" 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 glut.h]) +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="" @@ -758,6 +757,7 @@ if test "x$ac_cv_header_svn_client_h" != "xyes"; then else echo "TerraSync will use integrated subversion library" AC_SEARCH_LIBS(svn_client_checkout, svn_client-1) + AC_SEARCH_LIBS(svn_cmdline_init, svn_subr-1) svn_LIBS=$LIBS svn_CPPFLAGS=$CPPFLAGS AC_SUBST(svn_LIBS) @@ -815,10 +815,6 @@ AC_CONFIG_FILES([ \ 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/Include/config.h-msvc90 \ src/Aircraft/Makefile \ src/Airports/Makefile \ src/ATC/Makefile \ @@ -914,8 +910,9 @@ else echo "Include special purpose flight models: no" fi -if test "x$enable_atcdcl" != "xno"; then +if test "x$enable_atcdcl" = "xyes"; then echo "Build depricated ATC/AI module: yes" else echo "Build depricated ATC/AI module: no" fi +