Mercurial > mplayer.hg

comparison configure @ 10121:d42177a0da2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changed the STREAMING defines to MPLAYER_NETWORK to avoid name definition clash.
author bertrand
date Sat, 17 May 2003 12:24:01 +0000
parents 7b338ec311e2
children e7fd61bf7f57
comparison
equal deleted inserted replaced
10120:1827efc60279 10121:d42177a0da2a
151 --disable-tv disable TV Interface (tv/dvb grabbers) [enable] 151 --disable-tv disable TV Interface (tv/dvb grabbers) [enable]
152 --disable-tv-v4l disable Video4Linux TV Interface support [autodetect] 152 --disable-tv-v4l disable Video4Linux TV Interface support [autodetect]
153 --disable-tv-bsdbt848 disable BSD BT848 Interface support [autodetect] 153 --disable-tv-bsdbt848 disable BSD BT848 Interface support [autodetect]
154 --disable-edl disable EDL (edit decision list) support [enable] 154 --disable-edl disable EDL (edit decision list) support [enable]
155 --disable-rtc disable RTC (/dev/rtc) on Linux [autodetect] 155 --disable-rtc disable RTC (/dev/rtc) on Linux [autodetect]
156 --disable-streaming disable network streaming support 156 --disable-network disable network support (for: http/mms/rtp) [enable]
157 (support for: http/mms/rtp) [enable]
158 --enable-smb enable Samba (SMB) input support [autodetect] 157 --enable-smb enable Samba (SMB) input support [autodetect]
159 --enable-live enable LIVE.COM Streaming Media support [disable] 158 --enable-live enable LIVE.COM Streaming Media support [disable]
160 --enable-dvdnav enable dvdnav support [disable] 159 --enable-dvdnav enable dvdnav support [disable]
161 --disable-dvdread Disable libdvdread support [autodetect] 160 --disable-dvdread Disable libdvdread support [autodetect]
162 --disable-mpdvdkit Disable mpdvdkit/mpdvdkit2 support [autodetect] 161 --disable-mpdvdkit Disable mpdvdkit/mpdvdkit2 support [autodetect]
1054 _select=yes 1053 _select=yes
1055 _tv=yes 1054 _tv=yes
1056 _tv_v4l=auto 1055 _tv_v4l=auto
1057 _tv_bsdbt848=auto 1056 _tv_bsdbt848=auto
1058 _edl=yes 1057 _edl=yes
1059 _streaming=yes 1058 _network=yes
1060 _smbsupport=auto 1059 _smbsupport=auto
1061 _vidix=auto 1060 _vidix=auto
1062 _joystick=no 1061 _joystick=no
1063 _xvid=auto 1062 _xvid=auto
1064 _divx4linux=auto 1063 _divx4linux=auto
1227 --disable-tv-bsdbt848) _tv_bsdbt848=no ;; 1226 --disable-tv-bsdbt848) _tv_bsdbt848=no ;;
1228 --enable-tv-v4l) _tv_v4l=yes ;; 1227 --enable-tv-v4l) _tv_v4l=yes ;;
1229 --disable-tv-v4l) _tv_v4l=no ;; 1228 --disable-tv-v4l) _tv_v4l=no ;;
1230 --enable-fastmemcpy) _fastmemcpy=yes ;; 1229 --enable-fastmemcpy) _fastmemcpy=yes ;;
1231 --disable-fastmemcpy) _fastmemcpy=no ;; 1230 --disable-fastmemcpy) _fastmemcpy=no ;;
1232 --enable-streaming) _streaming=yes ;; 1231 --enable-network) _network=yes ;;
1233 --disable-streaming) _streaming=no ;; 1232 --disable-network) _network=no ;;
1234 --enable-smb) _smbsupport=yes ;; 1233 --enable-smb) _smbsupport=yes ;;
1235 --disable-smb) _smbsupport=no ;; 1234 --disable-smb) _smbsupport=no ;;
1236 --enable-vidix) _vidix=yes ;; 1235 --enable-vidix) _vidix=yes ;;
1237 --disable-vidix) _vidix=no ;; 1236 --disable-vidix) _vidix=no ;;
1238 --enable-joystick) _joystick=yes ;; 1237 --enable-joystick) _joystick=yes ;;
1846 # NOTE: needed for SunOS at least 1845 # NOTE: needed for SunOS at least
1847 _ld_sock="$_ld_sock -lresolv" 1846 _ld_sock="$_ld_sock -lresolv"
1848 echores "yes (using $_ld_sock)" 1847 echores "yes (using $_ld_sock)"
1849 else 1848 else
1850 _use_aton=no 1849 _use_aton=no
1851 _streaming=no 1850 _network=no
1852 echores "no (=> streaming support disabled)" 1851 echores "no (=> network support disabled)"
1853 fi 1852 fi
1854 fi 1853 fi
1855 1854
1856 _def_use_aton='#undef USE_ATON' 1855 _def_use_aton='#undef USE_ATON'
1857 if test "$_use_aton" != no; then 1856 if test "$_use_aton" != no; then
4340 fi; 4339 fi;
4341 done 4340 done
4342 fi 4341 fi
4343 4342
4344 echocheck "LIVE.COM Streaming Media libraries" 4343 echocheck "LIVE.COM Streaming Media libraries"
4345 if test "$_live" = auto && test "$_streaming" = yes ; then 4344 if test "$_live" = auto && test "$_network" = yes ; then
4346 _live=yes 4345 _live=yes
4347 test "$_livelibdir" || _live=no 4346 test "$_livelibdir" || _live=no
4348 # TODO: deeper, more reliable test of libs, and version! 4347 # TODO: deeper, more reliable test of libs, and version!
4349 # (users may have empty live/ dir or something different there, for 4348 # (users may have empty live/ dir or something different there, for
4350 # example 'live config files', or they may have old, incompatibel version) 4349 # example 'live config files', or they may have old, incompatibel version)
4351 fi 4350 fi
4352 if test "$_live" = yes && test "$_streaming" = yes ; then 4351 if test "$_live" = yes && test "$_network" = yes ; then
4353 echores "yes (using $_livelibdir)" 4352 echores "yes (using $_livelibdir)"
4354 _def_live='#define STREAMING_LIVE_DOT_COM 1' 4353 _def_live='#define STREAMING_LIVE_DOT_COM 1'
4355 _live_libs_def="# LIVE.COM Streaming Media libraries: 4354 _live_libs_def="# LIVE.COM Streaming Media libraries:
4356 LIVE_LIB_DIR = $_livelibdir 4355 LIVE_LIB_DIR = $_livelibdir
4357 LIVE_LIBS = \$(LIVE_LIB_DIR)/liveMedia/libliveMedia.a 4356 LIVE_LIBS = \$(LIVE_LIB_DIR)/liveMedia/libliveMedia.a
4785 _def_select='#define HAVE_AUDIO_SELECT 1' 4784 _def_select='#define HAVE_AUDIO_SELECT 1'
4786 fi 4785 fi
4787 echores "$_select" 4786 echores "$_select"
4788 4787
4789 4788
4790 echocheck "streaming" 4789 echocheck "network"
4791 # FIXME streaming check 4790 # FIXME network check
4792 if test "$_streaming" != no ; then 4791 if test "$_network" != no ; then
4793 _def_streaming='#define STREAMING 1' 4792 _def_network='#define MPLAYER_NETWORK 1'
4794 _ld_streaming="$_ld_sock" 4793 _ld_network="$_ld_sock"
4795 _inputmodules="streaming $_inputmodules" 4794 _inputmodules="network $_inputmodules"
4796 else 4795 else
4797 _noinputmodules="streaming $_noinputmodules" 4796 _noinputmodules="network $_noinputmodules"
4798 _def_streaming='#undef STREAMING' 4797 _def_network='#undef MPLAYER_NETWORK'
4799 fi 4798 fi
4800 echores "$_streaming" 4799 echores "$_network"
4801 4800
4802 # endian testing 4801 # endian testing
4803 echocheck "byte order" 4802 echocheck "byte order"
4804 if test "$_big_endian" = auto ; then 4803 if test "$_big_endian" = auto ; then
4805 cat > $TMPC <<EOF 4804 cat > $TMPC <<EOF
5212 EXTRA_INC = $_inc_extra $_inc_gtk 5211 EXTRA_INC = $_inc_extra $_inc_gtk
5213 STRIPBINARIES = $_stripbinaries 5212 STRIPBINARIES = $_stripbinaries
5214 5213
5215 $_live_libs_def 5214 $_live_libs_def
5216 5215
5217 STREAMING = $_streaming 5216 MPLAYER_NETWORK = $_network
5218 STREAMING_LIVE_DOT_COM = $_live 5217 STREAMING_LIVE_DOT_COM = $_live
5219 STREAMING_LIB = $_ld_streaming $_ld_live 5218 MPLAYER_NETWORK_LIB = $_ld_network $_ld_live
5220 DVBIN = $_dvbin 5219 DVBIN = $_dvbin
5221 VIDIX = $_vidix 5220 VIDIX = $_vidix
5222 SHARED_PP = $_shared_pp 5221 SHARED_PP = $_shared_pp
5223 CONFIG_PP = yes 5222 CONFIG_PP = yes
5224 CONFIG_RISKY = yes 5223 CONFIG_RISKY = yes
5731 5730
5732 /* enable FAAD (AAC) support */ 5731 /* enable FAAD (AAC) support */
5733 $_def_faad 5732 $_def_faad
5734 $_def_faad_version 5733 $_def_faad_version
5735 5734
5736 /* enable streaming */ 5735 /* enable network */
5737 $_def_streaming 5736 $_def_network
5738 5737
5739 /* define this to use inet_aton() instead of inet_pton() */ 5738 /* define this to use inet_aton() instead of inet_pton() */
5740 $_def_use_aton 5739 $_def_use_aton
5741 5740
5742 /* enables / disables cdparanoia support */ 5741 /* enables / disables cdparanoia support */