X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=f415fcaa76f9840135c17c1043c927c7bebf6523;hb=1912444886284e44d7bd03e9fd68eafba7147376;hp=716cd68a1603e90006f885e758deeda74a69c765;hpb=40533f50df6a40b86bb443afc149332d62eb1e73;p=simgear.git diff --git a/configure.ac b/configure.ac index 716cd68a..f415fcaa 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ dnl Require at least automake 2.52 AC_PREREQ(2.52) dnl Initialize the automake stuff -AM_INIT_AUTOMAKE(SimGear, 1.9.1) +AM_INIT_AUTOMAKE(SimGear, 2.0.0) dnl Specify KAI C++ compiler and flags. dnl Borrowed with slight modification from blitz distribution. @@ -34,10 +34,11 @@ 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]) if test "x$BOOST_CPPFLAGS" != "x-I/usr/include" ; then CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" @@ -144,6 +145,15 @@ AC_ARG_WITH(osg_framework, [ --with-osg-framework=PREFIX Specify the prefix if test "x$with_osg_framework" != "x"; then echo "osg framework prefix is $with_osg_framework" + CPPFLAGS = "$CPPFLAGS -F$with-osg-framework" + export DYLD_FRAMEWORK_PATH="$DYLD_FRAMEWORK_PATH:$with_osg_framework" +fi + +dnl specifying ALUT.framework (for user provided ALUT.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 dnl Determine an extra directories to add to include/lib search paths @@ -215,6 +225,7 @@ LIBS="" dnl check for some default libraries AC_SEARCH_LIBS(cos, m) +AC_SEARCH_LIBS(clock_gettime, rt) base_LIBS="$LIBS" @@ -291,7 +302,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" @@ -302,15 +313,21 @@ case "${host}" in *-apple-darwin*) dnl Mac OS X - LIBS="$LIBS -framework IOKit -framework OpenAL" + LIBS="$LIBS -framework IOKit -framework OpenAL -framework ALUT" openal_LIBS="$LIBS" - # not sure how to test if OpenAL exists on MacOS (does it come by default?) - OPENAL_OK="yes" - ALUT_OK="yes" + + if test "x$with_openal_lib" != "x"; then + echo "libopenal is not supported on Mac OS platform." + openal_LIBS="" + fi + + AC_CHECK_HEADERS([OpenAL/al.h],[OPENAL_OK="yes"]) + # Looking for alut.h + AC_CHECK_HEADERS([ALUT/alut.h],[ALUT_OK="yes"]) 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_TRUE) ; $3 is optional AC_DEFUN([AC_CHECK_FRAMEWORK], [ AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])dnl AC_CACHE_CHECK([whether compiler supports framework $1], @@ -322,6 +339,7 @@ case "${host}" in elif test "`echo $FRAMEWORKS | grep -- -F$3`" = ""; then FRAMEWORKS="$FRAMEWORKS -F$3" CXXFLAGS="$CXXFLAGS -F$3" + CPPFLAGS="$CPPFLAGS -F$3" CCFLAGS="$CCFLAGS -F$3" dnl This is needed for AC_TRY_LINK when a framework path is specified export DYLD_FRAMEWORK_PATH="${DYLD_FRAMEWORK_PATH}:$3" @@ -334,9 +352,16 @@ 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 ]) + dnl Check for ALUT.framework when --with-alut-framework is specified + if test "x$with_alut_framework" != "x"; then + AC_CHECK_FRAMEWORK(ALUT, [#include ], $with_alut_framework, [ALUT_OK="yes"]) + fi + ;; *) @@ -411,11 +436,18 @@ 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 + +AC_CHECK_LIB(plibul,ulInit) +if test "x$ac_cv_header_plib_ul_h" != "xyes" \ + -o "x$ac_cv_lib_plibul_ulInit" != "xyes" ; then echo echo "You *must* have the plib library installed on your system to build" echo "SimGear!" echo + echo " LIBS: '$LIBS'" + echo " LDFLAGS: '$LDFLAGS'" + echo " CPPFLAGS: '$CPPFLAGS'" + echo echo "Please see README.plib for more details." echo echo "configure aborted." @@ -429,8 +461,6 @@ AC_TRY_RUN([ #define MIN_PLIB_VERSION 185 int main() { - int major, minor, micro; - if ( PLIB_VERSION < MIN_PLIB_VERSION ) { return -1; } @@ -451,18 +481,18 @@ LIBS="$saved_LIBS" case "${host}" in *-apple-darwin*) if test "x$with_osg_framework" != "x"; then - 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_SUBST(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_SUBST(osg_FRAMEWORKS) AC_CHECK_FRAMEWORK(OpenThreads, [#include ], $with_osg_framework) openthreads_FRAMEWORK="$FRAMEWORKS" FRAMEWORKS="" @@ -472,18 +502,33 @@ case "${host}" in dnl This is needed when osg dynamic libs are specified dnl instead of OSG frameworks on Mac OS X dnl - LDFLAGS="$LDFLAGS -L$with_osg" + AC_CHECK_LIB(OpenThreads,OpenThreadsGetVersion) + fi + ;; +*) + if test "x$enable_osgdebug" = "xyes"; then + AC_CHECK_LIB(OpenThreadsd,OpenThreadsGetVersion) + else + AC_CHECK_LIB(OpenThreads,OpenThreadsGetVersion) fi ;; esac + 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 + +if test "x$ac_cv_header_osg_Version" != "xyes" -o "x$ac_cv_lib_OpenThreads_OpenThreadsGetVersion" != "xyes"; then if test "x$ac_cv_framework_osg" != "xyes"; then echo - echo "You *must* have the OpenSceneGraph support library installed on your system" + echo "You *must* have the OpenThreads library installed on your system" echo "to build this version of SimGear!" + echo " Maybe you need to specify --with-osg=DIR." + echo " Maybe you need to specify some LDFLAGS to help the linker." + echo + echo " LIBS: '$LIBS'" + echo " LDFLAGS: '$LDFLAGS'" + echo " CPPFLAGS: '$CPPFLAGS'" echo echo "Please see README.OSG for more details." echo @@ -498,6 +543,10 @@ if test "x$ac_cv_header_boost_version_hpp" != "xyes"; then echo "You *must* have the Boost library installed on your system" echo "to build this version of SimGear!" echo + echo " LIBS: '$LIBS'" + echo " LDFLAGS: '$LDFLAGS'" + echo " CPPFLAGS: '$CPPFLAGS'" + echo echo "configure aborted." exit fi