update paths.

[flightgear.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a505a5b3497b3c81002e1d4bee8151a5b27dfa53..031bfe6cb2ca8247e4e5d393329b3436e836b9dc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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
@@ -240,6 +226,7 @@ case "${host}" in
     fi
 
     LIBS="$LIBS -lglu32 -lopengl32 -luser32 -lgdi32"
+    joystick_LIBS="$joystick_LIBS -lwinmm"
 
     dnl add -lwsock32 for mingwin
     case "${host}" in
@@ -257,6 +244,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 +286,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
@@ -310,7 +295,7 @@ case "${host}" in
 
     AC_SEARCH_LIBS(alGenBuffers, openal32)
     AC_SEARCH_LIBS(alutInit, [ openal32 ALut ] )
-    LIBS="$LIBS -lwinmm -ldsound -ldxguid -lole32"
+    LIBS="$LIBS -ldsound -ldxguid -lole32"
     openal_LIBS="$LIBS"
     ;;
 
@@ -341,6 +326,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