Cygwin fixes.

[flightgear.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f5d98727016fadcda6cff1528264bca818ac2e02..cc8c61087fa079ab911ea58fc43edcfca42af392 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-pre1)
+AM_INIT_AUTOMAKE(FlightGear, 0.9.8)
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET
@@ -147,27 +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
-LIBS="-lplibsl -lplibsm"
 
+dnl add joystick support libraries
 dnl search for FreeBSD library
 AC_SEARCH_LIBS(hid_init, usbhid)
-
-case "${host}" in
-*-*-cygwin* | *-*-mingw32*)
-    LIBS="$LIBS -lwinmm"
-    ;;
-*-apple-darwin*)
-    LIBS="$LIBS -framework IOKit -framework CoreFoundation"
-    ;;
-*-*-irix* )
-    LIBS="$LIBS -laudio"
-    ;;
-
-esac
-audio_LIBS="$LIBS"
+joystick_LIBS="$LIBS"
 LIBS=""
-AC_SUBST(audio_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
@@ -257,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"
     ;;
 
 *)
@@ -298,10 +285,7 @@ case "${host}" in
 esac
 
 opengl_LIBS="$LIBS"
-LIBS="$base_LIBS"
-
-dnl search for FreeBSD library
-AC_SEARCH_LIBS(hid_init, usbhid)
+LIBS="$base_LIBS $joystick_LIBS"
 
 dnl check for OpenAL libraries
 case "${host}" in
@@ -341,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
@@ -360,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;