X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=41ceae44401dec01fd412da46ef04c1962b6d48d;hb=81797885ce38edf58d786b3e54555aca3070a08e;hp=031bfe6cb2ca8247e4e5d393329b3436e836b9dc;hpb=1a93ac450a3566dd6c357c8a2b19f4e039d8f060;p=flightgear.git

diff --git a/configure.ac b/configure.ac
index 031bfe6cb..41ceae444 100644
--- 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)
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET
@@ -34,7 +34,8 @@ case "${host}" in
     if test "$CXX" = "CC"; then
         AR="CC -ar"
         ARFLAGS="-o"
-        CXXFLAGS="$CXXFLAGS -I$with_simgear/include/simgear/compatibility"
+        CXXFLAGS="$CXXFLAGS -c99 -I$with_simgear/include/simgear/compatibility"
+        CFLAGS="$CFLAGS -c99"
     else
         AR="ar"
         ARFLAGS="cru"
@@ -73,11 +74,8 @@ AM_CONDITIONAL(ENABLE_SP_FDM, test "x$enable_sp_fdms" != "xno")
 
 dnl Thread related checks
 # defaults to yes
-with_threads=yes
-AC_ARG_WITH(threads, [  --with-threads          Include tile loading threads [default=yes]])
-if test "x$with_threads" != "xyes"; then
-    AC_DEFINE([ENABLE_THREADS], 0, [Define to enable threaded tile paging])
-else
+AC_ARG_WITH(threads, [  --with-threads          Include tile loading threads [default=yes]], [], [with_threads=yes])
+if test "x$with_threads" = "xyes"; then
     AC_DEFINE([ENABLE_THREADS], 1, [Define to enable threaded tile paging])
     CXXFLAGS="$CXXFLAGS -D_REENTRANT"
     CFLAGS="$CFLAGS -D_REENTRANT"
@@ -96,10 +94,6 @@ fi
 dnl Used by JSBSim to conditionally compile in fgfs interface code
 AC_DEFINE([FGFS], 1, [Define so that JSBSim compiles in 'library' mode])
 
-dnl Used to control whether clouds3d should be compiled in or not
-AC_DEFINE([FG_USE_CLOUDS_3D], 1, [Define to use 3D cloud support])
-AM_CONDITIONAL(FG_USE_CLOUDS_3D, test "x" = "x")
-
 # Check for MS Windows environment
 AC_CHECK_HEADER(windows.h)
 
@@ -122,7 +116,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
@@ -180,7 +174,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
 
@@ -196,7 +190,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"
@@ -232,7 +227,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
 
@@ -312,6 +307,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
@@ -365,7 +361,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)
 )
 
@@ -387,7 +383,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>
 
@@ -398,7 +394,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;
@@ -513,7 +509,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 \
@@ -536,8 +531,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 \
@@ -546,9 +539,11 @@ AC_CONFIG_FILES([ \
 	src/Traffic/Makefile \
 	tests/Makefile \
 	utils/Makefile \
-	utils/TerraSync/Makefile \
-	utils/Modeller/Makefile \
+	utils/GPSsmooth/Makefile \
 	utils/js_server/Makefile \
+	utils/Modeller/Makefile \
+	utils/TerraSync/Makefile \
+	utils/xmlgrep/Makefile \
 ])
 AC_OUTPUT