FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ehofman/config' into next

Browse Source
This commit is contained in:
Tim Moore
2010-02-10 14:56:36 +01:00
parent d3f575547c 6786a7be4a
commit c4506b8e6c
2 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+24 -16
View File
@@ -475,18 +475,18 @@ LIBS="$saved_LIBS"
case "${host}" in case "${host}" in
*-apple-darwin*) *-apple-darwin*)
if test "x$with_osg_framework" != "x"; then if test "x$with_osg_framework" != "x"; then
AC_CHECK_FRAMEWORK(osgViewer, [#include <osgViewer/Version>], $with_osg_framework) # AC_CHECK_FRAMEWORK(osgViewer, [#include <osgViewer/Version>], $with_osg_framework)
AC_CHECK_FRAMEWORK(osgGA, [#include <osgGA/Version>], $with_osg_framework) # AC_CHECK_FRAMEWORK(osgGA, [#include <osgGA/Version>], $with_osg_framework)
AC_CHECK_FRAMEWORK(osgText, [#include <osgText/Version>], $with_osg_framework) # AC_CHECK_FRAMEWORK(osgText, [#include <osgText/Version>], $with_osg_framework)
AC_CHECK_FRAMEWORK(osgFX, [#include <osgFX/AnisotropicLighting>], $with_osg_framework) # AC_CHECK_FRAMEWORK(osgFX, [#include <osgFX/AnisotropicLighting>], $with_osg_framework)
AC_CHECK_FRAMEWORK(osgUtil, [#include <osgUtil/Version>], $with_osg_framework) # AC_CHECK_FRAMEWORK(osgUtil, [#include <osgUtil/Version>], $with_osg_framework)
AC_CHECK_FRAMEWORK(osgDB, [#include <osgDB/Version>], $with_osg_framework) # AC_CHECK_FRAMEWORK(osgDB, [#include <osgDB/Version>], $with_osg_framework)
AC_CHECK_FRAMEWORK(osgSim, [#include <osgSim/Version>], $with_osg_framework) # AC_CHECK_FRAMEWORK(osgSim, [#include <osgSim/Version>], $with_osg_framework)
AC_CHECK_FRAMEWORK(osgParticle, [#include <osgParticle/Version>], $with_osg_framework) # AC_CHECK_FRAMEWORK(osgParticle, [#include <osgParticle/Version>], $with_osg_framework)
AC_CHECK_FRAMEWORK(osg, [#include <osg/Version>], $with_osg_framework) # AC_CHECK_FRAMEWORK(osg, [#include <osg/Version>], $with_osg_framework)
osg_FRAMEWORKS="$FRAMEWORKS" # osg_FRAMEWORKS="$FRAMEWORKS"
FRAMEWORKS="" # FRAMEWORKS=""
AC_SUBST(osg_FRAMEWORKS) # AC_SUBST(osg_FRAMEWORKS)
AC_CHECK_FRAMEWORK(OpenThreads, [#include <OpenThreads/Version>], $with_osg_framework) AC_CHECK_FRAMEWORK(OpenThreads, [#include <OpenThreads/Version>], $with_osg_framework)
openthreads_FRAMEWORK="$FRAMEWORKS" openthreads_FRAMEWORK="$FRAMEWORKS"
FRAMEWORKS="" FRAMEWORKS=""
@@ -496,18 +496,26 @@ case "${host}" in
dnl This is needed when osg dynamic libs are specified dnl This is needed when osg dynamic libs are specified
dnl instead of OSG frameworks on Mac OS X dnl instead of OSG frameworks on Mac OS X
dnl 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 fi
;; ;;
esac esac
AM_CONDITIONAL(HAVE_FRAMEWORK_OSG, test "x$ac_cv_framework_osg" != "x") AM_CONDITIONAL(HAVE_FRAMEWORK_OSG, test "x$ac_cv_framework_osg" != "x")
AC_CHECK_HEADER(osg/Version) 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 if test "x$ac_cv_framework_osg" != "xyes"; then
echo echo
echo "You *must* have the OpenSceneGraph support library installed on your system" echo "Warning: The OpenThreads library was not found on this system."
echo "to build this version of SimGear!" echo " Mybe you forgot to sepcify --with-osg?"
echo "Without the OpenSceneGraph library FlightGear will not work."
echo echo
echo "Please see README.OSG for more details." echo "Please see README.OSG for more details."
echo echo
simgear/props/Makefile.am
+1 -1
View File
@@ -15,7 +15,7 @@ libsgprops_a_SOURCES = \
props_io.cxx \ props_io.cxx \
AtomicChangeListener.cxx AtomicChangeListener.cxx
noinst_PROGRAMS = props_test check_PROGRAMS = props_test
props_test_SOURCES = props_test.cxx props_test_SOURCES = props_test.cxx
props_test_LDADD = \ props_test_LDADD = \