1
0
Fork 0

Merge branch 'next' of git://gitorious.org/fg/flightgear into next

This commit is contained in:
Frederic Bouvier 2011-01-23 21:08:09 +01:00
commit fe03a4d799
2 changed files with 4 additions and 1 deletions

View file

@ -271,9 +271,11 @@ if test "x$with_rti13" != "xno"; then
if test "x$simgear_hla" = "xyes" ; then
AC_MSG_CHECKING([for hla libraries])
saved_LIBS="$LIBS"
saved_LDFLAGS="$LDFLAGS"
for rti13libs in "-lRTI-NG -lFedTime" "-lRTI-NGd -lFedTimed" ; do
if test "x$hla_libs" = "x" ; then
LIBS="-lsghla13 -lsghla -lsgxml -lsgstructure -lsgmath -lsgdebug -lsgtiming $rti13libs -lrt $saved_LIBS"
LDFLAGS="$HLA_LDFLAGS $saved_LDFLAGS"
AC_TRY_LINK([
#include <simgear/hla/HLA13Federate.hxx>
],[
@ -282,6 +284,7 @@ if test "x$with_rti13" != "xno"; then
fi
done
LIBS="$saved_LIBS"
LDFLAGS="$saved_LDFLAGS"
AC_MSG_RESULT($hla_libs)
fi
AC_LANG_POP()

View file

@ -561,7 +561,7 @@ FGMultiplayMgr::SendMyPosition(const FGExternalMotionData& motionInfo)
{
// Current local data is invalid (NaN), so stop MP transmission.
// => Be nice to older FG versions (no NaN checks) and don't waste bandwidth.
SG_LOG(SG_NETWORK, SG_DEBUG, "FGMultiplayMgr::SendMyPosition - "
SG_LOG(SG_NETWORK, SG_ALERT, "FGMultiplayMgr::SendMyPosition - "
<< "Local data is invalid (NaN). Data not transmitted.");
return;
}