X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=0900a1ba8fa4be8b27af5d6a12f4f8472c1f6664;hb=fcb67de4f51ad4ee668f368807c434ad8ac953f2;hp=a7298ea325d919091edbfd553895bff5666570fe;hpb=ddbafac793b688c08d508e507c7ab0f279c689d3;p=flightgear.git

diff --git a/configure.ac b/configure.ac
index a7298ea32..0900a1ba8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,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.5-pre1)
+AM_INIT_AUTOMAKE(FlightGear, 0.9.6-pre1)
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET
@@ -324,7 +324,9 @@ case "${host}" in
 *-*-cygwin* | *-*-mingw32*)
     dnl CygWin under Windoze.
 
-    LIBS="$LIBS -lopenal32 -lwinmm -ldsound -ldxguid -lole32"
+    AC_SEARCH_LIBS(alGenBuffers, openal32)
+    AC_SEARCH_LIBS(alutInit, [ openal32 ALut ] )
+    LIBS="$LIBS -lwinmm -ldsound -ldxguid -lole32"
     ;;
 
 *-apple-darwin*)
@@ -409,7 +411,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then
     exit
 fi
 
-AC_MSG_CHECKING([for simgear 0.3.6 or newer])
+AC_MSG_CHECKING([for simgear 0.3.7 or newer])
 AC_TRY_RUN([
 #include <stdio.h>
 
@@ -420,20 +422,19 @@ AC_TRY_RUN([
 
 #define MIN_MAJOR 0
 #define MIN_MINOR 3
-#define MIN_MICRO 6
+#define MIN_MICRO 7
 
 int main() {
     int major, minor, micro;
 
-    printf("%d.%d.%d or greater... ", MIN_MAJOR, MIN_MINOR, MIN_MICRO);
+    /* printf("%d.%d.%d or greater, ", MIN_MAJOR, MIN_MINOR, MIN_MICRO); */
+    printf("[found %s] ... ", STRINGIFY(SIMGEAR_VERSION));
 
     sscanf( STRINGIFY(SIMGEAR_VERSION), "%d.%d.%d", &major, &minor, &micro );
 
-    if ( major < MIN_MAJOR ) {
-	 return -1;
-    } else if ( major == MIN_MAJOR && minor < MIN_MINOR ) {
-	 return -1;
-    } else if ( major == MIN_MAJOR && minor == MIN_MINOR && micro < MIN_MICRO ){
+    if ( (major < MIN_MAJOR) ||
+         (major == MIN_MAJOR && minor < MIN_MINOR) ||
+         (major == MIN_MAJOR && minor == MIN_MINOR && micro < MIN_MICRO) ) {
 	 return -1;
     }
 
@@ -449,7 +450,7 @@ int main() {
 
 LIBS="$saved_LIBS"
 
-dnl Check if SimGear was built with Norman JPEG factory support
+dnl Check if SimGear was built with Norman's JPEG factory support
 AC_CHECK_HEADER(simgear/screen/jpgfactory.hxx)
 if test "x$ac_cv_header_simgear_screen_jpgfactory_hxx" = "xyes"; then
     AC_CHECK_LIB(jpeg, jpeg_start_compress)