X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=df8ba3dcb4b4647d7633865b493a8e28a75724fc;hb=9dd0d403eaf05f4a9031444dd6ba1bcb115a0e3b;hp=7b0dab42da108173f1d008a57333e4462b2d6f17;hpb=a6db6d89ff41a619569e6433409e8bf62ff98499;p=flightgear.git diff --git a/configure.ac b/configure.ac index 7b0dab42d..5f0dae1a8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,12 @@ -dnl Process this file with autoget.sh to produce a working configure +dnl Process this file with autogen.sh to produce a working configure dnl script. -AC_INIT -AC_CONFIG_SRCDIR([src/Aircraft/aircraft.cxx]) +AC_INIT(FlightGear, m4_esyscmd([cat ./version | tr -d '\n']), [http://www.flightgear.org]) + +dnl Ensure touching the version causes autoconf to re-run +AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/version']) + +AC_CONFIG_SRCDIR([src/Airports/simple.cxx]) dnl Require at least automake 2.52 AC_PREREQ(2.52) @@ -10,17 +14,46 @@ 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, 1.9.1) +AM_INIT_AUTOMAKE([dist-bzip2]) + +# variables for version.h +AC_DEFINE([HAVE_VERSION_H], 1, [Set if version.h is generated]) + +# are we running under Hudson? (defines BUILD_ID, BUILD_NUMBER in the environment) +if test "x$BUILD_ID" != "x" ; then + AC_SUBST([HUDSON_BUILD_ID], $BUILD_ID) + AC_SUBST([HUDSON_BUILD_NUMBER], $BUILD_NUMBER) +else + AC_SUBST([HUDSON_BUILD_ID], [none]) + AC_SUBST([HUDSON_BUILD_NUMBER], 0) +fi + +AC_CHECK_PROG([HAVE_GIT], git, 1) +if test "x$HAVE_GIT" != "x" ; then + # git might be installed, but we might be building from a tarball + if git rev-parse ; then + AC_SUBST([REVISION], `git rev-parse HEAD`) + else + AC_SUBST([REVISION], [none]) + fi +else + AC_SUBST([REVISION], [none]) +fi dnl Checks for programs. AC_PROG_MAKE_SET AC_PROG_CC AC_PROG_CPP AC_PROG_CXX +AC_PROG_CXXCPP AC_PROG_RANLIB AC_PROG_INSTALL AC_PROG_LN_S -AX_BOOST_BASE([1.34.0]) +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" @@ -51,6 +84,71 @@ if test "x$with_osg" != "x" ; then EXTRA_DIRS="${EXTRA_DIRS} $with_osg" fi +# specify framework related locations for Mac OS X +case "${host}" in +*-apple-darwin*) + + 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, $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], + ac_Framework, [ + saved_LIBS="$LIBS" + FRAMEWORKS="$FRAMEWORKS -framework $1" + if test "$3" = ""; then + FRAMEWORKS="$FRAMEWORKS $ADD2LD" + elif test "`echo $FRAMEWORKS | grep -- -F$3`" = ""; then + 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 + AC_TRY_LINK( + [$2], [], + [AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no); LIBS="$saved_LIBS"] + ) + ]) + 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]) + if test "x$with_cocoa_framework" != "x" ; then + macAPI=Cocoa + AC_MSG_NOTICE([Using Cocoa framework]) + else + macAPI=Carbon + 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]]) + 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]]) + 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(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 + + ;; +esac + dnl Determine an extra directories to add to include/lib search paths case "${host}" in *-apple-darwin* | *-*-mingw32*) @@ -111,12 +209,35 @@ else fi AM_CONDITIONAL(ENABLE_SP_FDM, test "x$enable_sp_fdms" != "xno") - dnl EXPERIMENTAL generic event driven input device # defaults to no AC_ARG_WITH(eventinput, [ --with-eventinput Include event driven input (EXPERIMENTAL) [default=no]], [], [with_eventinput=no]) if test "x$with_eventinput" = "xyes"; then AC_DEFINE([WITH_EVENTINPUT], 1, [Define to enable generic event driven input device]) + case "${host}" in + dnl OS specific sources for event driven input + dnl Linux and Mac OS X are supported at this moment + *-apple-darwin*) + eventinput_EXTRA_OBJS="FGMacOSXEventInput.o" + eventinput_INCUDES="" + eventinput_LIBS="" + ;; + *linux*) + dnl + dnl FIXME: include paths for dbus are hard-coded at this moment. + dnl FIXME: these must be found in configure + dnl + eventinput_EXTRA_OBJS="FGLinuxEventInput.o" + eventinput_INCLUDES="-I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/lib/dbus-1.0/include" + eventinput_LIBS="-ldbus-1 -lhal" + ;; + *) + echo "Event driven input is not supported on ${host}." + ;; + esac + AC_SUBST(eventinput_EXTRA_OBJS) + AC_SUBST(eventinput_INCLUDES) + AC_SUBST(eventinput_LIBS) fi AM_CONDITIONAL(WITH_EVENTINPUT, test "x$with_eventinput" = "xyes") @@ -129,7 +250,6 @@ if test "x$with_threads" = "xyes"; then CFLAGS="$CFLAGS -D_REENTRANT" fi AC_CHECK_HEADER(pthread.h) -AM_CONDITIONAL(WITH_THREADS, test "x$with_threads" = "xyes") dnl Used by JSBSim to conditionally compile in fgfs interface code AC_DEFINE([FGFS], 1, [Define so that JSBSim compiles in 'library' mode]) @@ -189,6 +309,7 @@ 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 $CFLAGS" + LIBS="-lsgthreads $LIBS" fi fi @@ -212,7 +333,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") @@ -264,7 +385,8 @@ case "${host}" in *-apple-darwin*) dnl Mac OS X - LIBS="$LIBS -framework GLUT -framework OpenGL -framework AGL -framework Carbon -lobjc" + 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" ;; @@ -317,7 +439,7 @@ case "${host}" in dnl CygWin under Windoze. INCLUDES="$INCLUDES -I/usr/local/include/" LIBS="$LIBS -L/usr/local/lib" - AC_SEARCH_LIBS(alGenBuffers, [ openal32 openal ] ) + AC_SEARCH_LIBS(alGenBuffers, [ openal32 openal 'openal -ldsound -lwinmm' ] ) AC_SEARCH_LIBS(alutInit, [ openal32 ALut alut ] ) LIBS="$LIBS -lwinmm -ldsound -ldxguid -lole32" openal_LIBS="$LIBS" @@ -328,11 +450,15 @@ case "${host}" in *-apple-darwin*) dnl Mac OS X - LIBS="$LIBS -framework IOKit -framework OpenAL" - openal_LIBS="$LIBS" - # not sure how to test if OpenAL exists on MacOS (does it come by default?) - 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" + + 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" + ]) ;; *) @@ -404,7 +530,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then exit fi -AC_MSG_CHECKING([for SimGear 1.9.0 or newer]) +AC_MSG_CHECKING([for SimGear 2.0.0 or newer]) AC_TRY_RUN([ #include @@ -413,8 +539,8 @@ AC_TRY_RUN([ #define STRINGIFY(X) XSTRINGIFY(X) #define XSTRINGIFY(X) #X -#define MIN_MAJOR 1 -#define MIN_MINOR 9 +#define MIN_MAJOR 2 +#define MIN_MINOR 0 #define MIN_MICRO 0 int main() { @@ -468,6 +594,18 @@ fi AM_CONDITIONAL(ENABLE_JPEG_SERVER, test "x$ac_cv_header_simgear_screen_jpgfactory_hxx" = "xyes") # Check for "plib" without which we cannot go on +case "${host}" in +*-apple-darwin*) + if test "x$with_plib_framework" != "x"; then + AC_CHECK_FRAMEWORK(PLIB, [#include ], $with_plib_framework, no) + plib_FRAMEWORK="$FRAMEWORKS" + AC_SUBST(plib_FRAMEWORK) + FRAMEWORKS="" + fi + ;; +esac +AM_CONDITIONAL(HAVE_FRAMEWORK_PLIB, test "x$ac_cv_framework_PLIB" != "x") + AC_CHECK_HEADER(plib/ul.h) if test "x$ac_cv_header_plib_ul_h" != "xyes"; then echo @@ -480,6 +618,7 @@ if test "x$ac_cv_header_plib_ul_h" != "xyes"; then exit fi +echo "$DYLD_FRAMEWORK_PATH" AC_MSG_CHECKING([for plib 1.8.5 or newer]) AC_TRY_RUN([ #include @@ -505,6 +644,51 @@ 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]) +# Find the OSG libraries. Note special handling for OS X frameworks +if test "x$with_osg_framework" = "x"; then + if test "x$enable_osgdebug" = "xyes"; then + AC_CHECK_LIB(OpenThreadsd,OpenThreadsGetVersion, , [AC_MSG_ERROR(OpenThreads library not found.)],) + AC_CHECK_LIB(osgd,osgGetVersion, , [AC_MSG_ERROR(OpenSceneGraph library not found.)],) + AC_CHECK_LIB(osgUtild,osgUtilGetVersion, , [AC_MSG_ERROR(OpenSceneGraph utility library not found.)],) + AC_CHECK_LIB(osgDBd,osgDBGetVersion, , [AC_MSG_ERROR(OpenSceneGraph database library not found.)],) + AC_CHECK_LIB(osgTextd,osgTextGetVersion, , [AC_MSG_ERROR(OpenSceneGraph Text library not found.)],) + AC_CHECK_LIB(osgGAd,osgGAGetVersion, , [AC_MSG_ERROR(OpenSceneGraph GUI Abstraction library not found.)],) + AC_CHECK_LIB(osgViewerd,osgViewerGetVersion, , [AC_MSG_ERROR(OpenSceneGraph Viewer library not found.)],) + AC_CHECK_LIB(osgSimd,osgSimGetVersion, , [AC_MSG_ERROR(OpenSceneGraph simulation library not found.)],) + AC_CHECK_LIB(osgParticled,osgParticleGetVersion, , [AC_MSG_ERROR(OpenSceneGraph Particle library not found.)],) + AC_CHECK_LIB(osgFXd, osgFXGetVersion, , [AC_MSG_ERROR(OpenSceneGraph FX library not found.)],) + else + AC_CHECK_LIB(OpenThreads,OpenThreadsGetVersion, , [AC_MSG_ERROR(OpenThreads library not found.)],) + AC_CHECK_LIB(osg,osgGetVersion, , [AC_MSG_ERROR(OpenSceneGraph library not found.)],) + AC_CHECK_LIB(osgUtil,osgUtilGetVersion, , [AC_MSG_ERROR(OpenSceneGraph utility library not found.)],) + AC_CHECK_LIB(osgDB,osgDBGetVersion, , [AC_MSG_ERROR(OpenSceneGraph database library not found.)],) + AC_CHECK_LIB(osgText,osgTextGetVersion, , [AC_MSG_ERROR(OpenSceneGraph Text library not found.)],) + AC_CHECK_LIB(osgGA,osgGAGetVersion, , [AC_MSG_ERROR(OpenSceneGraph GUI Abstraction library not found.)],) + AC_CHECK_LIB(osgViewer,osgViewerGetVersion, , [AC_MSG_ERROR(OpenSceneGraph Viewer library not found.)],) + AC_CHECK_LIB(osgSim,osgSimGetVersion, , [AC_MSG_ERROR(OpenSceneGraph simulation library not found.)],) + AC_CHECK_LIB(osgParticle,osgParticleGetVersion, , [AC_MSG_ERROR(OpenSceneGraph Particle library not found.)],) + AC_CHECK_LIB(osgFX, osgFXGetVersion, , [AC_MSG_ERROR(OpenSceneGraph FX library not found.)],) + fi +else + # Checking osg frameworks. + AC_CHECK_FRAMEWORK(osgViewer, [#include ], $with_osg_framework) + AC_CHECK_FRAMEWORK(osgGA, [#include ], $with_osg_framework) + AC_CHECK_FRAMEWORK(osgText, [#include ], $with_osg_framework) + AC_CHECK_FRAMEWORK(osgFX, [#include ], $with_osg_framework) + AC_CHECK_FRAMEWORK(osgUtil, [#include ], $with_osg_framework) + AC_CHECK_FRAMEWORK(osgDB, [#include ], $with_osg_framework) + AC_CHECK_FRAMEWORK(osgSim, [#include ], $with_osg_framework) + AC_CHECK_FRAMEWORK(osgParticle, [#include ], $with_osg_framework) + AC_CHECK_FRAMEWORK(osg, [#include ], $with_osg_framework) + osg_FRAMEWORKS="$FRAMEWORKS" + FRAMEWORKS="" + AC_CHECK_FRAMEWORK(OpenThreads, [#include ], $with_osg_framework) + openthreads_FRAMEWORK="$FRAMEWORKS" + AC_SUBST(osg_FRAMEWORKS) + AC_SUBST(openthreads_FRAMEWORK) +fi +AM_CONDITIONAL(HAVE_FRAMEWORK_OSG, test "x$ac_cv_framework_osg" != "x") + AC_CHECK_HEADER(osg/Version) if test "x$ac_cv_header_osg_Version" != "xyes"; then echo @@ -517,79 +701,48 @@ if test "x$ac_cv_header_osg_Version" != "xyes"; then exit fi -# Find the OSG libraries. Note special handling for OS X frameworks -case "${host}" in -*-apple-darwin*) - dnl Thank you Christian Bauer from SheepSaver - dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES) - AC_DEFUN([AC_CHECK_FRAMEWORK], [ - AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])dnl - AC_CACHE_CHECK([whether compiler supports framework $1], - ac_Framework, [ - saved_LIBS="$LIBS" - LIBS="$LIBS -framework $1" - AC_TRY_LINK( - [$2], [], - [AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no); LIBS="$saved_LIBS"] - ) - ]) - 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_VAR_POPDEF([ac_Framework])dnl - ]) - - if test "x$enable_osgdebug" = "xyes"; then - AC_CHECK_LIB(osgViewerd,osgViewerGetVersion) - AC_CHECK_LIB(osgGAd,osgGAGetVersion) - AC_CHECK_LIB(osgTextd,osgTextGetVersion) - LIBS="$LIBS -losgFXd" - 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) +AC_MSG_CHECKING([checking for osg::CullSettings::CLEAR_MASK]) +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#include ]], + [[osg::CullSettings::VariablesMask mask = osg::CullSettings::CLEAR_MASK;]])], + [AC_DEFINE([HAVE_CULLSETTINGS_CLEAR_MASK],1,[define if OSG has CullSettings::CLEAR_MASK]) + AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no])]) + +# Special handling for static version of OSG +if test -n "`echo "$CPPFLAGS" "$CXXFLAGS" "$CFLAGS" | grep "\-DOSG_LIBRARY_STATIC" 2>/dev/null`" ; then + saved_LIBS="$LIBS" + LIBS="" + #***** Check image support (needed for static build) ***** + AC_SEARCH_LIBS([jpeg_read_header], [jpeg], [CPPFLAGS="$CPPFLAGS -DOSG_JPEG_ENABLED"]) + AC_SEARCH_LIBS([png_read_image], [png 'png -lz'], [CPPFLAGS="$CPPFLAGS -DOSG_PNG_ENABLED"]) + AC_SEARCH_LIBS([TIFFOpen], [tiff], [CPPFLAGS="$CPPFLAGS -DOSG_TIFF_ENABLED"]) + img_LIBS="$LIBS" + LIBS="$saved_LIBS" + + if test "x$with_osg" != "x" ; then + osg_prefix="$with_osg" else - AC_CHECK_FRAMEWORK(osgViewer, [#include ]) - AC_CHECK_FRAMEWORK(osgGA, [#include ]) - AC_CHECK_FRAMEWORK(osgText, [#include ]) - AC_CHECK_FRAMEWORK(osgFX, [#include ]) - 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 ]) + osg_prefix="/usr" fi - ;; -*) - if test "x$enable_osgdebug" = "xyes"; then - AC_CHECK_LIB(OpenThreadsd,OpenThreadsGetVersion) - AC_CHECK_LIB(osgd,osgGetVersion) - AC_CHECK_LIB(osgUtild,osgUtilGetVersion) - AC_CHECK_LIB(osgDBd,osgDBGetVersion) - AC_CHECK_LIB(osgTextd,osgTextGetVersion) - 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) - AC_CHECK_LIB(osg,osgGetVersion) - AC_CHECK_LIB(osgUtil,osgUtilGetVersion) - AC_CHECK_LIB(osgDB,osgDBGetVersion) - AC_CHECK_LIB(osgText,osgTextGetVersion) - AC_CHECK_LIB(osgGA,osgGAGetVersion) - AC_CHECK_LIB(osgViewer,osgViewerGetVersion) - AC_CHECK_LIB(osgSim,osgSimGetVersion) - AC_CHECK_LIB(osgParticle,osgParticleGetVersion) - LIBS="$LIBS -losgFX" + PKG_CHECK_EXISTS([openscenegraph], [osg_version="`$PKG_CONFIG --modversion openscenegraph 2>/dev/null`"]) + LIBS="-L$osg_prefix/lib/osgPlugins-$osg_version -losgdb_bmp -losgdb_dds -losgdb_hdr -losgdb_pic -losgdb_pnm -losgdb_rgb -losgdb_tga \ + -losgdb_3ds -losgdb_ac -losgdb_ive -losgdb_osg -losgdb_txf \ + -losgVolume -losgTerrain $LIBS -losgUtil" + + if test -n "`echo "$CPPFLAGS" "$CXXFLAGS" "$CFLAGS" | grep "\-DOSG_JPEG_ENABLED" 2>/dev/null`" ; then + LIBS="$LIBS -losgdb_jpeg" + fi + if test -n "`echo "$CPPFLAGS" "$CXXFLAGS" "$CFLAGS" | grep "\-DOSG_PNG_ENABLED" 2>/dev/null`" ; then + LIBS="$LIBS -losgdb_png" + fi + if test -n "`echo "$CPPFLAGS" "$CXXFLAGS" "$CFLAGS" | grep "\-DOSG_TIFF_ENABLED" 2>/dev/null`" ; then + LIBS="$LIBS -losgdb_tiff" fi - ;; -esac + + LIBS="$LIBS $img_LIBS" +fi AC_LANG_POP @@ -610,23 +763,31 @@ if test "x$ac_cv_header_zlib_h" != "xyes"; then fi dnl Check for Subversion library support +# libsvn support defaults to yes 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 glut.h]) -if test "x$ac_cv_header_svn_client_h" != "xyes"; then - echo "TerraSync will shell out for command line subversion" +AC_ARG_WITH(libsvn, [ --without-libsvn Do not use libsvn for terrasync [default=no]], [], [with_libsvn=yes]) +if test "x$with_libsvn" = "xyes"; then + LIBS="`apr-1-config --link-ld`" + CPPFLAGS="-I/usr/include/subversion-1 `apr-1-config --includes --cppflags`" + AC_CHECK_HEADERS([svn_client.h]) + if test "x$ac_cv_header_svn_client_h" = "xyes"; then + echo "TerraSync will use libsvn" + 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) + AC_SUBST(svn_CPPFLAGS) + else + echo "Libsvn not found. TerraSync will use command line subversion" + svn_LIBS="" + svn_CPPFLAGS="" + fi +else +echo "Libsvn explicitly disabled. TerraSync will use 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 @@ -680,9 +841,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/Aircraft/Makefile \ src/Airports/Makefile \ src/ATC/Makefile \ @@ -735,7 +893,7 @@ AC_CONFIG_FILES([ \ utils/propmerge/Makefile \ utils/TerraSync/Makefile \ utils/xmlgrep/Makefile \ - utils/fgviewer/Makefile \ + utils/fgviewer/Makefile ]) AC_OUTPUT @@ -748,9 +906,9 @@ echo "=================" echo "Prefix: $prefix" if test "x$with_logging" != "x"; then - echo "Debug messages: $with_logging" + echo "Log messages: $with_logging" else - echo "Debug messages: yes" + echo "Log messages: yes" fi echo -n "Automake version: " @@ -761,15 +919,15 @@ if test "x$with_multiplayer" != "xno"; then fi if test "x$with_threads" = "xyes"; then - echo "threads: yes" + echo "Threads: yes" else - echo "threads: no" + echo "Threads: no" fi if test "x$with_eventinput" = "xyes"; then - echo "event input: yes" + echo "Event input: yes" else - echo "event input: no" + echo "Event input: no" fi if test "x$enable_sp_fdms" != "xno"; then @@ -777,4 +935,3 @@ if test "x$enable_sp_fdms" != "xno"; then else echo "Include special purpose flight models: no" fi -