summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-08-28 15:55:58 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-08-28 15:55:58 +0000
commit0b03ca9d27df2576fc2026389d3d60abacd3808f (patch)
tree5838eb2e4bb773832baf6f830199b51e013b847c /configure
parent0f45d2efeb3ae8b7fd015ec4bb178d061f6b4880 (diff)
downloadmpv-0b03ca9d27df2576fc2026389d3d60abacd3808f.tar.bz2
mpv-0b03ca9d27df2576fc2026389d3d60abacd3808f.tar.xz
removed old input code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7112 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure33
1 files changed, 8 insertions, 25 deletions
diff --git a/configure b/configure
index c309434e00..533ccc749d 100755
--- a/configure
+++ b/configure
@@ -957,7 +957,6 @@ _tv_v4l=auto
_tv_bsdbt848=auto
_streaming=yes
_vidix=auto
-_new_input=yes
_joystick=no
_xvid=auto
_divx4linux=auto
@@ -1097,8 +1096,6 @@ for ac_option do
--disable-streaming) _streaming=no ;;
--enable-vidix) _vidix=yes ;;
--disable-vidix) _vidix=no ;;
- --enable-new-input) _new_input=yes ;;
- --disable-new-input) _new_input=no ;;
--enable-joystick) _joystick=yes ;;
--disable-joystick) _joystick=no ;;
--enable-xvid) _xvid=yes ;;
@@ -4153,22 +4150,16 @@ else
fi
echo Checking for vidix ... "$_vidix"
-_def_new_input='#undef HAVE_NEW_INPUT'
_def_joystick='#undef HAVE_JOYSTICK'
-echo Checking for new input ... "$_new_input"
-if test "$_new_input" = yes ; then
- _def_new_input='#define HAVE_NEW_INPUT 1'
- _ld_new_input="-Linput -linput"
- if test "$_joystick" = yes ; then
- if linux ; then
- # TODO add some check
- _def_joystick='#define HAVE_JOYSTICK 1'
- else
- _joystick="no (unsupported under $system_name)"
- fi
+if test "$_joystick" = yes ; then
+ if linux ; then
+ # TODO add some check
+ _def_joystick='#define HAVE_JOYSTICK 1'
+ else
+ _joystick="no (unsupported under $system_name)"
fi
- echo Checking for joystick ... "$_joystick"
fi
+echo Checking for joystick ... "$_joystick"
echocheck "lirc"
if test "$_lirc" = auto ; then
@@ -4183,11 +4174,7 @@ EOF
fi
if test "$_lirc" = yes ; then
_def_lirc='#define HAVE_LIRC 1'
- if test "$_new_input" = yes ; then
- _ld_new_input="$_ld_new_input -llirc_client"
- else
- _ld_lirc='-llirc_client'
- fi
+ _ld_lirc='-llirc_client'
else
_def_lirc='#undef HAVE_LIRC'
fi
@@ -4293,7 +4280,6 @@ MENCODER = $_mencoder
ENCORE_LIB = $_ld_encore $_ld_mp3lame
DIRECTFB_INC = $_inc_directfb
DIRECTFB_LIB = $_ld_directfb
-NEW_INPUT_LIB = $_ld_new_input
CDPARANOIA_INC = $_inc_cdparnoia
CDPARANOIA_LIB = $_ld_cdparanoia
@@ -4647,9 +4633,6 @@ $_def_cdparanoia
/* enables / disables vidix usage */
$_def_vidix
-/* enables / disables new input */
-$_def_new_input
-
/* enables / disables new input joystick support */
$_def_joystick