reinit(): destroy, reload and re-open dialogs (menu: Debug -> GUI Reload)

[flightgear.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 845dc6924d24e07f5d73cb29f34958e91ab211d8..2af7fb8d7230f69bf22a4f9c19e7259857e707d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_PREREQ(2.52)
 dnl Initialize the automake stuff
 dnl set the $host variable based on local machine/os
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(FlightGear, 0.9.8)
+AM_INIT_AUTOMAKE(FlightGear, 0.9.9-pre1)
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET
@@ -119,7 +119,7 @@ case "${host}" in
     if test -d /opt/X11R6 ; then
         EXTRA_DIR2="/opt/X11R6"
     fi
-    EXTRA_DIRS="${EXTRA_DIRS} $EXTRA_DIR1 $EXTRA_DIR2 /usr/local/"
+    EXTRA_DIRS="${EXTRA_DIRS} $EXTRA_DIR1 $EXTRA_DIR2 /usr/local"
     ;;
 
 esac
@@ -177,7 +177,7 @@ AC_SEARCH_LIBS(pthread_cancel, [pthread c_r])
 if test "x$ac_cv_header_pthread_h" = "xyes"; then
   if test "x$ac_cv_search_pthread_exit" = "x-lc_r"; then
     CXXFLAGS="-pthread $CXXFLAGS"
-    CFLAGS="-pthread $FLAGS"
+    CFLAGS="-pthread $CFLAGS"
   fi
 fi
 
@@ -193,7 +193,8 @@ network_LIBS="$LIBS"
 LIBS=""
 
 dnl check for some default libraries
-AC_SEARCH_LIBS(cos, m)
+AC_SEARCH_LIBS(sqrt, [am ffm fm fastm m])
+AC_SEARCH_LIBS(ceil, m)
 AC_SEARCH_LIBS(dlclose, dl)
 
 base_LIBS="$LIBS"
@@ -229,7 +230,7 @@ case "${host}" in
     case "${host}" in
     *-*-mingw32*)
         echo "********** BUILDING FOR MINGW32 *************"
-        base_LIBS="$base_LIBS -lws2_32"
+        network_LIBS="$network_LIBS -lws2_32"
         ;;
     esac
 
@@ -309,6 +310,7 @@ case "${host}" in
     save_LIBS=$LIBS
     LIBS="$LIBS $thread_LIBS"
     AC_SEARCH_LIBS(alGenBuffers, openal)
+    AC_SEARCH_LIBS(alutInit, [ alut openal ] )
     OPENAL_OK="$ac_cv_search_alGenBuffers"
     openal_LIBS="$LIBS"
     LIBS=$save_LIBS
@@ -362,7 +364,7 @@ int main() {
 ],
   AC_MSG_RESULT(yes),
   [AC_MSG_RESULT(wrong version);
-   AC_MSG_ERROR([Install plib 1.8.0 or later first...])],
+   AC_MSG_ERROR([Install plib 1.8.4 or later first...])],
   AC_MSG_RESULT(yes)
 )
 
@@ -384,7 +386,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then
     exit
 fi
 
-AC_MSG_CHECKING([for simgear 0.3.8 or newer])
+AC_MSG_CHECKING([for simgear 0.3.9 or newer])
 AC_TRY_RUN([
 #include <stdio.h>
 
@@ -395,7 +397,7 @@ AC_TRY_RUN([
 
 #define MIN_MAJOR 0
 #define MIN_MINOR 3
-#define MIN_MICRO 8
+#define MIN_MICRO 9
 
 int main() {
     int major, minor, micro;
@@ -510,7 +512,6 @@ AC_CONFIG_FILES([ \
        src/Autopilot/Makefile \
        src/Cockpit/Makefile \
        src/Cockpit/built_in/Makefile \
-       src/Controls/Makefile \
        src/Environment/Makefile \
        src/FDM/Balloon/Makefile \
        src/FDM/ExternalNet/Makefile \
@@ -533,8 +534,6 @@ AC_CONFIG_FILES([ \
        src/MultiPlayer/Makefile \
        src/Navaids/Makefile \
        src/Network/Makefile \
-       src/Objects/Makefile \
-       src/Replay/Makefile \
        src/Scenery/Makefile \
        src/Scripting/Makefile \
        src/Sound/Makefile \
@@ -547,6 +546,7 @@ AC_CONFIG_FILES([ \
        utils/js_server/Makefile \
        utils/Modeller/Makefile \
        utils/TerraSync/Makefile \
+       utils/xmlgrep/Makefile \
 ])
 AC_OUTPUT