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

[flightgear.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index cd41238ff9be946231b46c534c7460f828ff0833..179d63f514e6d55b33fea8c6b569ce039a65bd9c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -296,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])
 
@@ -575,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>
 
@@ -585,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() {
@@ -811,26 +819,29 @@ dnl Check for Subversion library support
 # 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
@@ -940,7 +951,8 @@ AC_CONFIG_FILES([ \
        utils/propmerge/Makefile \
        utils/TerraSync/Makefile \
        utils/xmlgrep/Makefile \
-       utils/fgviewer/Makefile
+       utils/fgviewer/Makefile \
+       utils/fgpanel/Makefile
 ])
 AC_OUTPUT
 
@@ -977,6 +989,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