X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=b64b972ff6090e3a1f96caa04745cdfa7d38abb7;hb=849b1d156783ba4c70b929a53abad6ce702427b1;hp=d7f7a65a6001dd45e32a3e66eaea1cf496947e28;hpb=70dd6279a742030271b5b0927501f59bc9aecb98;p=flightgear.git

diff --git a/configure.ac b/configure.ac
index d7f7a65a6..b64b972ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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()
@@ -293,6 +296,14 @@ if test "x$have_rti13" = "xyes" ; then
     AC_SUBST(HLA_LIBS, "-lsghla13 -lsghla $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])
 
@@ -572,7 +583,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then
     exit
 fi
 
-AC_MSG_CHECKING([for SimGear 2.2.0 or newer])
+AC_MSG_CHECKING([for SimGear 2.3.0 or newer])
 AC_TRY_RUN([
 #include <stdio.h>
 
@@ -582,7 +593,7 @@ AC_TRY_RUN([
 #define XSTRINGIFY(X) #X
 
 #define MIN_MAJOR 2
-#define MIN_MINOR 2
+#define MIN_MINOR 3
 #define MIN_MICRO 0
 
 int main() {
@@ -937,7 +948,8 @@ AC_CONFIG_FILES([ \
 	utils/propmerge/Makefile \
 	utils/TerraSync/Makefile \
 	utils/xmlgrep/Makefile \
-	utils/fgviewer/Makefile
+	utils/fgviewer/Makefile \
+	utils/fgpanel/Makefile
 ])
 AC_OUTPUT
 
@@ -974,6 +986,12 @@ else
     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