X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=1e58d02c6fbcdaf346c672fd3ea3ef3162f5511a;hb=92010f9f9483082bbf83638a49e08053f53c5daa;hp=a7e4d2d5779388ba6e5c0421b3c5f5ec7f81175f;hpb=d3865a9bf991f5641d0b979f39276a99a5172753;p=flightgear.git

diff --git a/configure.ac b/configure.ac
index a7e4d2d57..1e58d02c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ dnl Require at least automake 2.52
 AC_PREREQ(2.52)
 
 dnl Initialize the automake stuff
-AM_INIT_AUTOMAKE(FlightGear, 0.9.3)
+AM_INIT_AUTOMAKE(FlightGear, 0.9.4)
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET
@@ -70,18 +70,6 @@ fi
 AM_CONDITIONAL(ENABLE_MPLAYER_AS, test "x$with_multiplayer" != "xno")
 
 
-# Specify if we want to use WeatherCM instead of FGEnvironment.
-# default to with_weathercm=no
-AC_ARG_WITH(weathercm, [  --with-weathercm        Use WeatherCM instead of FGEnvironment])
-if test "x$with_weathercm" = "xyes" ; then
-    echo "Building with WeatherCM"
-    AC_DEFINE([FG_WEATHERCM], 1,
-              [Define to build with Christian Mayer's weather code])
-else
-    echo "Building with FGEnvironment"
-fi
-AM_CONDITIONAL(ENABLE_WEATHERCM, test "x$with_weathercm" = "xyes")
-
 dnl Thread related checks
 AC_ARG_WITH(threads, [  --with-threads          Include tile loading threads [default=no]])
 if test "x$with_threads" = "xyes"; then
@@ -103,7 +91,7 @@ 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 controll whether clouds3d should be compiled in or not
+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")
 
@@ -116,6 +104,12 @@ case "${host}" in
     echo no EXTRA_DIRS for $host
     ;;
 
+*-*-cygwin*)
+    if test -d /usr/local ; then
+        EXTRA_DIRS="${EXTRA_DIRS} /usr/local"
+    fi
+    ;;
+
 *)
     if test -d /usr/X11R6 ; then
         EXTRA_DIR1="/usr/X11R6"
@@ -326,11 +320,11 @@ if test "x$ac_cv_header_plib_ul_h" != "xyes"; then
     exit
 fi
 
-AC_MSG_CHECKING([for plib 1.6.0 or newer])
+AC_MSG_CHECKING([for plib 1.7.0 or newer])
 AC_TRY_RUN([
 #include <plib/ul.h>
 
-#define MIN_PLIB_VERSION 160
+#define MIN_PLIB_VERSION 170
 
 int main() {
     int major, minor, micro;
@@ -345,7 +339,7 @@ int main() {
 ],
   AC_MSG_RESULT(yes),
   [AC_MSG_RESULT(wrong version);
-   AC_MSG_ERROR([Install plib 1.6.0 or later first...])],
+   AC_MSG_ERROR([Install plib 1.8.0 or later first...])],
   AC_MSG_RESULT(yes)
 )
 
@@ -367,7 +361,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then
     exit
 fi
 
-AC_MSG_CHECKING([for simgear 0.3.4 or newer])
+AC_MSG_CHECKING([for simgear 0.3.5 or newer])
 AC_TRY_RUN([
 #include <stdio.h>
 
@@ -378,7 +372,7 @@ AC_TRY_RUN([
 
 #define MIN_MAJOR 0
 #define MIN_MINOR 3
-#define MIN_MICRO 4
+#define MIN_MICRO 5
 
 int main() {
     int major, minor, micro;
@@ -481,6 +475,8 @@ AC_CONFIG_FILES([ \
 	man/pstest.1 \
         scripts/Makefile \
         scripts/debug/Makefile \
+        scripts/perl/Makefile \
+        scripts/perl/examples/Makefile \
         scripts/python/Makefile \
 	src/Makefile \
 	src/Include/Makefile \
@@ -520,7 +516,6 @@ AC_CONFIG_FILES([ \
 	src/Sound/Makefile \
 	src/Systems/Makefile \
 	src/Time/Makefile \
-	src/WeatherCM/Makefile \
 	tests/Makefile \
 	utils/Makefile \
 	utils/TerraSync/Makefile \
@@ -546,12 +541,6 @@ fi
 echo -n "Automake version: "
 automake --version | head -1
 
-if test "x$with_weathercm" != "x"; then
-    echo "WeatherCM instead of FGEnvironment: $with_weathercm"
-else
-    echo "Using FGEnvironment"
-fi
-
 if test "x$with_multiplayer" != "xno"; then
     echo "Building with multiplayer support"
 fi