[SCM] mplayer/master: Enable joystick support on Linux only, Closes: #638408

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 187c5b2c84d22f44dccf7137f7ff36870dd97a8f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Sep 2 09:25:39 2011 +0200

    Enable joystick support on Linux only, Closes: #638408
    
    Conflicts:
    
    	debian/rules

diff --git a/debian/rules b/debian/rules
index c57904e..187a113 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,6 @@ CONFIGURE_FLAGS = \
 	--disable-libdvdcss-internal \
 	--disable-dvdread-internal \
 	--disable-ffmpeg_a \
-	--enable-joystick \
 	$(archconf)
 
 ifeq ($(DEB_HOST_ARCH),i386)
@@ -83,7 +82,7 @@ CONFIGURE_FLAGS += --enable-debug
 endif
 
 ifeq (linux,$(DEB_HOST_ARCH_OS))
-    CONFIGURE_FLAGS += --enable-mga --enable-3dfx --enable-tdfxfb
+    CONFIGURE_FLAGS += --enable-mga --enable-3dfx --enable-tdfxfb --enable-joystick
     sound_backend := alsa
 else
     sound_backend := oss

-- 
mplayer packaging