Martin Spott:

Remove all dependencies of plib's SL sound library.

diff --git a/configure.ac b/configure.ac
index a505a5b3497b3c81002e1d4bee8151a5b27dfa53..4b6a6ce0066a667a1524c40a95f26d7f455d6741 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -147,27 +147,14 @@ 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)
+AC_SUBST(joystick_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
@@ -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

diff --git a/src/Input/Makefile.am b/src/Input/Makefile.am
index f848a67d956f4c6225a4667c341fd66def3eed7c..6671e74f09a4b15e5727684a6f003a84a2ee9a9e 100644 (file)
--- a/src/Input/Makefile.am
+++ b/src/Input/Makefile.am
@@ -6,10 +6,10 @@ bin_PROGRAMS = js_demo fgjs
 
 js_demo_SOURCES = js_demo.cxx
 
-js_demo_LDADD = -lplibjs $(base_LIBS) $(audio_LIBS) -lplibul
+js_demo_LDADD = -lplibjs $(base_LIBS) $(joystick_LIBS) -lplibul
 
 fgjs_SOURCES = fgjs.cxx jsinput.cxx jsinput.h jssuper.cxx jssuper.h
 
-fgjs_LDADD = -lplibjs $(base_LIBS) $(audio_LIBS) -lplibul
+fgjs_LDADD = -lplibjs $(base_LIBS) $(joystick_LIBS) -lplibul
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/utils/Modeller/Makefile.am b/utils/Modeller/Makefile.am
index f8cf987f11eefb8a38094cf50fa48ee71819ec2d..1583e4285c5109b7ec25cc3a3761ad67f3df5752 100644 (file)
--- a/utils/Modeller/Makefile.am
+++ b/utils/Modeller/Makefile.am
@@ -1,7 +1,7 @@
 noinst_PROGRAMS = threedconvert animassist normalmap
 
 threedconvert_SOURCES = 3dconvert.cxx
-threedconvert_LDADD = -lplibssg -lplibsg -lplibul $(opengl_LIBS) $(audio_LIBS)
+threedconvert_LDADD = -lplibssg -lplibsg -lplibul $(opengl_LIBS) $(joystick_LIBS)
 
 animassist_SOURCES = animassist.c
 animassist_LDADD = $(base_LIBS)

diff --git a/utils/js_server/Makefile.am b/utils/js_server/Makefile.am
index 2fcaa0535f12573dcdb00bba5c859f89e3bdbce9..b17acf235de8698229e77a04b1d6a2b61a2ee329 100644 (file)
--- a/utils/js_server/Makefile.am
+++ b/utils/js_server/Makefile.am
@@ -1,4 +1,4 @@
 sbin_PROGRAMS = js_server
 
 js_server_SOURCES = js_server.cxx
-js_server_LDADD = -lplibjs -lplibnet -lplibul $(base_LIBS) $(audio_LIBS) $(network_LIBS)
+js_server_LDADD = -lplibjs -lplibnet -lplibul $(base_LIBS) $(joystick_LIBS) $(network_LIBS)