X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.ac;h=cc8c61087fa079ab911ea58fc43edcfca42af392;hb=02a757f9e670e8036169145ff289b24081f703e8;hp=a2c48a0fb79c8c31067cf6fd318a61ec9a7db8a5;hpb=8b53b86aa0f9c5a25ff5490689417ccce42e406e;p=flightgear.git

diff --git a/configure.ac b/configure.ac
index a2c48a0fb..cc8c61087 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,5 @@
 dnl Process this file with autoget.sh to produce a working configure
 dnl script.
-dnl
-dnl $Id$
 
 AC_INIT
 AC_CONFIG_SRCDIR([src/Aircraft/aircraft.cxx])
@@ -12,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.6)
+AM_INIT_AUTOMAKE(FlightGear, 0.9.8)
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET
@@ -149,21 +147,13 @@ if test "$have_timezone" = yes; then
     AC_DEFINE([HAVE_TIMEZONE], 1, [Define if system has timezone variable])
 fi
 
-dnl add correct audio libs and configure for audio support
-audio_LIBS="-lplibsl -lplibsm"
-case "${host}" in
-*-*-cygwin* | *-*-mingw32*)
-    audio_LIBS="$audio_LIBS -lwinmm"
-    ;;
-*-apple-darwin*)
-    audio_LIBS="$audio_LIBS -framework IOKit -framework CoreFoundation"
-    ;;
-*-*-irix* )
-    audio_LIBS="$audio_LIBS -laudio"
-    ;;
 
-esac
-AC_SUBST(audio_LIBS)
+dnl add joystick support libraries
+dnl search for FreeBSD library
+AC_SEARCH_LIBS(hid_init, usbhid)
+joystick_LIBS="$LIBS"
+LIBS=""
+
 
 dnl ENABLE_AUDIO_SUPPORT could be depricated at any time in favor of
 dnl just assuming we have audio support on all platform.  We can
@@ -186,23 +176,12 @@ esac
 dnl Checks for libraries.
 
 dnl Thread related checks
-AC_CHECK_LIB(pthread, pthread_exit)
-if test "x$ac_cv_lib_pthread_pthread_exit" != "xyes" \
-   -a "x$ac_cv_header_pthread_h" = "xyes"; then
-    dnl FreeBSD: System has pthread.h, but -lpthread library check
-    dnl fails.  See if we need -pthread instead of -lpthread and look
-    dnl for the functions in libc_r.
-    save_CXXFLAGS="$CXXFLAGS"
-    save_CFLAGS="$CFLAGS"
+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 $CFLAGS"
-    save_LIBS=$LIBS
-    AC_CHECK_LIB(c_r, pthread_exit)
-    if test "x$ac_cv_lib_c_r_pthread_exit" != "xyes"; then
-        CXXFLAGS=$save_CXXFLAGS
-        CFLAGS=$save_CFLAGS
-    fi
-    LIBS=$save_LIBS
+    CFLAGS="-pthread $FLAGS"
+  fi
 fi
 
 thread_LIBS="$LIBS"
@@ -231,22 +210,6 @@ else
     AC_DEFINE([PU_USE_GLUT], 1, [Define to use glut])
 fi
 
-dnl check for glut location
-AC_CHECK_HEADER(GL/glut.h)
-if test "x$ac_cv_header_GL_glut_h" = "xyes"; then
-    AC_DEFINE([FG_GLUT_H], <GL/glut.h>, [Define as glut.h include location])
-else
-    AC_CHECK_HEADER(GLUT/glut.h)
-    if test "x$ac_cv_header_GLUT_glut_h" = "xyes"; then
-        AC_DEFINE([FG_GLUT_H], <GLUT/glut.h>, [Define as glut.h include location])
-    else
-        if test "x$enable_sdl" != "xyes"; then
-            echo "Neither GL/glut.h nor GLUT/glut.h found.  Cannot continue"
-            exit
-        fi
-    fi
-fi
-
 dnl check for OpenGL related libraries
 case "${host}" in
 *-*-cygwin* | *-*-mingw32*)
@@ -280,6 +243,7 @@ case "${host}" in
     dnl Mac OS X
 
     LIBS="$LIBS -framework GLUT -framework OpenGL -framework AGL -framework Carbon -lobjc"
+    joystick_LIBS="$joystick_LIBS -framework IOKit -framework CoreFoundation"
     ;;
 
 *)
@@ -321,7 +285,7 @@ case "${host}" in
 esac
 
 opengl_LIBS="$LIBS"
-LIBS="$base_LIBS"
+LIBS="$base_LIBS $joystick_LIBS"
 
 dnl check for OpenAL libraries
 case "${host}" in
@@ -331,23 +295,29 @@ case "${host}" in
     AC_SEARCH_LIBS(alGenBuffers, openal32)
     AC_SEARCH_LIBS(alutInit, [ openal32 ALut ] )
     LIBS="$LIBS -lwinmm -ldsound -ldxguid -lole32"
+    openal_LIBS="$LIBS"
     ;;
 
 *-apple-darwin*)
     dnl Mac OS X
 
     LIBS="$LIBS -framework IOKit -framework OpenAL"
+    openal_LIBS="$LIBS"
     ;;
 
 *)
     dnl default unix style machines
 
+    save_LIBS=$LIBS
+    LIBS="$LIBS $thread_LIBS"
     AC_SEARCH_LIBS(alGenBuffers, openal)
+    OPENAL_OK="$ac_cv_search_alGenBuffers"
+    openal_LIBS="$LIBS"
+    LIBS=$save_LIBS
     ;;
 
 esac
 
-openal_LIBS="$LIBS"
 LIBS="$base_LIBS"
 
 AC_SUBST(base_LIBS)
@@ -355,6 +325,7 @@ AC_SUBST(openal_LIBS)
 AC_SUBST(opengl_LIBS)
 AC_SUBST(thread_LIBS)
 AC_SUBST(network_LIBS)
+AC_SUBST(joystick_LIBS)
 
 # The following are C++ items that need to be tested for with the c++
 # compiler
@@ -374,11 +345,11 @@ if test "x$ac_cv_header_plib_ul_h" != "xyes"; then
     exit
 fi
 
-AC_MSG_CHECKING([for plib 1.8.0 or newer])
+AC_MSG_CHECKING([for plib 1.8.4 or newer])
 AC_TRY_RUN([
 #include <plib/ul.h>
 
-#define MIN_PLIB_VERSION 170
+#define MIN_PLIB_VERSION 184
 
 int main() {
     int major, minor, micro;
@@ -415,7 +386,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then
     exit
 fi
 
-AC_MSG_CHECKING([for simgear 0.3.7 or newer])
+AC_MSG_CHECKING([for simgear 0.3.8 or newer])
 AC_TRY_RUN([
 #include <stdio.h>
 
@@ -426,7 +397,7 @@ AC_TRY_RUN([
 
 #define MIN_MAJOR 0
 #define MIN_MINOR 3
-#define MIN_MICRO 7
+#define MIN_MICRO 8
 
 int main() {
     int major, minor, micro;