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

[flightgear.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 179d63f514e6d55b33fea8c6b569ce039a65bd9c..1dcd3d14b6c46af1c31e42abecec574279df3d2f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -263,29 +263,30 @@ if test "x$with_rti13" != "xno"; then
     AC_MSG_CHECKING([for simgear HLA/RTI support])
     AC_LANG_PUSH(C++)
     AC_TRY_COMPILE([
-        #include <simgear/hla/HLA13Federate.hxx>
+        #include <simgear/hla/HLAFederate.hxx>
         ],[
-        new simgear::HLA13Federate;
+        new simgear::HLAFederate;
         ], simgear_hla=yes, simgear_hla=no)
     AC_MSG_RESULT($simgear_hla)
     if test "x$simgear_hla" = "xyes" ; then
         AC_MSG_CHECKING([for hla libraries])
         saved_LIBS="$LIBS"
         saved_LDFLAGS="$LDFLAGS"
+        have_rti13=no
         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"
+                LIBS="-lsghla -lsgrti13 -lsgrti -lsgxml -lsgstructure -lsgmath -lsgdebug -lsgtiming $rti13libs -lrt $saved_LIBS"
                 LDFLAGS="$HLA_LDFLAGS $saved_LDFLAGS"
                 AC_TRY_LINK([
-                    #include <simgear/hla/HLA13Federate.hxx>
+                    #include <simgear/hla/HLAFederate.hxx>
                     ],[
-                    new simgear::HLA13Federate;
+                    new simgear::HLAFederate;
                     ], [hla_libs="$rti13libs"; have_rti13=yes],)
             fi
         done
         LIBS="$saved_LIBS"
         LDFLAGS="$saved_LDFLAGS"
-        AC_MSG_RESULT($hla_libs)
+        AC_MSG_RESULT($have_rti13)
     fi
     AC_LANG_POP()
 fi
@@ -293,7 +294,7 @@ dnl Currently only the rti13 variant, but in the future also rti1516
 AM_CONDITIONAL(WITH_HLA, test "x$have_rti13" = "xyes")
 if test "x$have_rti13" = "xyes" ; then
     AC_DEFINE([FG_HAVE_HLA], 1, [Define if HLA/RTI is available.])
-    AC_SUBST(HLA_LIBS, "-lsghla13 -lsghla $hla_libs")
+    AC_SUBST(HLA_LIBS, "-lsghla -lsgrti13 -lsgrti $hla_libs")
 fi
 
 dnl EXPERIMENTAL fgpanel application
@@ -529,7 +530,7 @@ case "${host}" in
 
 esac
 
-if test "$OPENAL_OK" == "no"; then
+if test "$OPENAL_OK" = "no"; then
     echo
     echo "You *must* have the openal library installed on your system to build"
     echo "SimGear!"
@@ -540,7 +541,7 @@ if test "$OPENAL_OK" == "no"; then
     exit
 fi
 
-if test "$ALUT_OK" == "no"; then
+if test "$ALUT_OK" = "no"; then
     echo
     echo "You *must* have the alut library installed on your system to build"
     echo "SimGear!"
@@ -583,7 +584,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then
     exit
 fi
 
-AC_MSG_CHECKING([for SimGear 2.3.0 or newer])
+AC_MSG_CHECKING([for SimGear 2.5.0 or newer])
 AC_TRY_RUN([
 #include <stdio.h>