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"
- AC_MSG_RESULT($hla_libs)
+ LDFLAGS="$saved_LDFLAGS"
+ AC_MSG_RESULT($have_rti13)
fi
AC_LANG_POP()
fi
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
+# defaults to no
+AC_ARG_WITH(fgpanel, [ --with-fgpanel Include fgpanel application (EXPERIMENTAL) [default=no]], [], [with_fgpanel=no])
+if test "x$with_fgpanel" = "xyes"; then
+ AC_DEFINE([WITH_FGPANEL], 1, [Define to enable fgpanel application])
+fi
+AM_CONDITIONAL(WITH_FGPANEL, test "x$with_fgpanel" = "xyes")
+
dnl Used by JSBSim to conditionally compile in fgfs interface code
AC_DEFINE([FGFS], 1, [Define so that JSBSim compiles in 'library' mode])
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!"
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!"
exit
fi
-AC_MSG_CHECKING([for SimGear 2.2.0 or newer])
+AC_MSG_CHECKING([for SimGear 2.5.0 or newer])
AC_TRY_RUN([
#include <stdio.h>
#define XSTRINGIFY(X) #X
#define MIN_MAJOR 2
-#define MIN_MINOR 2
+#define MIN_MINOR 3
#define MIN_MICRO 0
int main() {
# libsvn support defaults to yes
save_LIBS=$LIBS
save_CPPFLAGS=$CPPFLAGS
-AC_ARG_WITH(libsvn, [ --without-libsvn Do not use libsvn for terrasync [default=no]], [], [with_libsvn=yes])
+AC_ARG_WITH(libsvn, [ --without-libsvn Do not use built-in subversion (libsvn) for terrasync/fgfs [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)
+ echo "Using built-in subversion (libsvn) for scenery downloads."
+ AC_SEARCH_LIBS(svn_client_checkout, svn_client-1,
+ [AC_DEFINE([HAVE_LIBSVN_CLIENT_1], [1], [Define to 1 if you have libsvn_client-1])],
+ [AC_MSG_ERROR(svn_client-1 library not found.)],)
+ AC_SEARCH_LIBS(svn_cmdline_init, svn_subr-1, , [AC_MSG_ERROR(svn_subr-1 library not found.)],)
+ AC_SEARCH_LIBS(svn_ra_initialize, svn_ra-1, , [AC_MSG_ERROR(svn_ra-1 library not found.)],)
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"
+ echo "Libsvn not found. Will use command line subversion for scenery downloads."
svn_LIBS=""
svn_CPPFLAGS=""
fi
else
-echo "Libsvn explicitly disabled. TerraSync will use command line subversion"
+echo "Libsvn explicitly disabled. Will use command line subversion for scenery downloads."
svn_LIBS=""
svn_CPPFLAGS=""
fi
utils/propmerge/Makefile \
utils/TerraSync/Makefile \
utils/xmlgrep/Makefile \
- utils/fgviewer/Makefile
+ utils/fgviewer/Makefile \
+ utils/fgpanel/Makefile
])
AC_OUTPUT
echo "Event input: no"
fi
+if test "x$with_fgpanel" = "xyes"; then
+ echo "fgpanel: yes"
+else
+ echo "fgpanel: no"
+fi
+
if test "x$enable_sp_fdms" != "xno"; then
echo "Include special purpose flight models: yes"
else