Mercurial > mplayer.hg

comparison configure @ 31683:db0b49579eeb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename network build system variable and command line option to networking. This avoids conflicts with the FFmpeg variable of the same name.
author diego
date Sat, 17 Jul 2010 13:14:53 +0000
parents d4ea2e6111aa
children 87831e7308b3
comparison
equal deleted inserted replaced
31682:d4ea2e6111aa 31683:db0b49579eeb
271 --disable-tv-v4l1 disable Video4Linux TV interface [autodetect] 271 --disable-tv-v4l1 disable Video4Linux TV interface [autodetect]
272 --disable-tv-v4l2 disable Video4Linux2 TV interface [autodetect] 272 --disable-tv-v4l2 disable Video4Linux2 TV interface [autodetect]
273 --disable-tv-bsdbt848 disable BSD BT848 interface [autodetect] 273 --disable-tv-bsdbt848 disable BSD BT848 interface [autodetect]
274 --disable-pvr disable Video4Linux2 MPEG PVR [autodetect] 274 --disable-pvr disable Video4Linux2 MPEG PVR [autodetect]
275 --disable-rtc disable RTC (/dev/rtc) on Linux [autodetect] 275 --disable-rtc disable RTC (/dev/rtc) on Linux [autodetect]
276 --disable-network disable networking [enable] 276 --disable-networking disable networking [enable]
277 --enable-winsock2_h enable winsock2_h [autodetect] 277 --enable-winsock2_h enable winsock2_h [autodetect]
278 --enable-smb enable Samba (SMB) input [autodetect] 278 --enable-smb enable Samba (SMB) input [autodetect]
279 --enable-live enable LIVE555 Streaming Media [autodetect] 279 --enable-live enable LIVE555 Streaming Media [autodetect]
280 --enable-nemesi enable Nemesi Streaming Media [autodetect] 280 --enable-nemesi enable Nemesi Streaming Media [autodetect]
281 --enable-librtmp enable RTMPDump Streaming Media [autodetect] 281 --enable-librtmp enable RTMPDump Streaming Media [autodetect]
711 _tv_v4l1=auto 711 _tv_v4l1=auto
712 _tv_v4l2=auto 712 _tv_v4l2=auto
713 _tv_bsdbt848=auto 713 _tv_bsdbt848=auto
714 _tv_dshow=auto 714 _tv_dshow=auto
715 _pvr=auto 715 _pvr=auto
716 _network=yes 716 networking=yes
717 _winsock2_h=auto 717 _winsock2_h=auto
718 _struct_addrinfo=auto 718 _struct_addrinfo=auto
719 _getaddrinfo=auto 719 _getaddrinfo=auto
720 _struct_sockaddr_storage=auto 720 _struct_sockaddr_storage=auto
721 _smb=auto 721 _smb=auto
1152 --disable-pvr) _pvr=no ;; 1152 --disable-pvr) _pvr=no ;;
1153 --enable-fastmemcpy) _fastmemcpy=yes ;; 1153 --enable-fastmemcpy) _fastmemcpy=yes ;;
1154 --disable-fastmemcpy) _fastmemcpy=no ;; 1154 --disable-fastmemcpy) _fastmemcpy=no ;;
1155 --enable-hardcoded-tables) hardcoded_tables=yes ;; 1155 --enable-hardcoded-tables) hardcoded_tables=yes ;;
1156 --disable-hardcoded-tables) hardcoded_tables=no ;; 1156 --disable-hardcoded-tables) hardcoded_tables=no ;;
1157 --enable-network) _network=yes ;; 1157 --enable-networking) networking=yes ;;
1158 --disable-network) _network=no ;; 1158 --disable-networking) networking=no ;;
1159 --enable-winsock2_h) _winsock2_h=yes ;; 1159 --enable-winsock2_h) _winsock2_h=yes ;;
1160 --disable-winsock2_h) _winsock2_h=no ;; 1160 --disable-winsock2_h) _winsock2_h=no ;;
1161 --enable-smb) _smb=yes ;; 1161 --enable-smb) _smb=yes ;;
1162 --disable-smb) _smb=no ;; 1162 --disable-smb) _smb=no ;;
1163 --enable-vidix) _vidix=yes ;; 1163 --enable-vidix) _vidix=yes ;;
3373 def_closesocket='#define HAVE_CLOSESOCKET 0' 3373 def_closesocket='#define HAVE_CLOSESOCKET 0'
3374 fi 3374 fi
3375 echores "$_closesocket" 3375 echores "$_closesocket"
3376 3376
3377 3377
3378 echocheck "network" 3378 echocheck "networking"
3379 test $_winsock2_h = no && test $inet_pton = no && 3379 test $_winsock2_h = no && test $inet_pton = no &&
3380 test $inet_aton = no && _network=no 3380 test $inet_aton = no && networking=no
3381 if test "$_network" = yes ; then 3381 if test "$networking" = yes ; then
3382 def_network='#define CONFIG_NETWORK 1' 3382 def_network='#define CONFIG_NETWORK 1'
3383 def_networking='#define CONFIG_NETWORKING 1'
3383 extra_ldflags="$extra_ldflags $_ld_sock" 3384 extra_ldflags="$extra_ldflags $_ld_sock"
3384 inputmodules="network $inputmodules" 3385 inputmodules="networking $inputmodules"
3385 else 3386 else
3386 noinputmodules="network $noinputmodules" 3387 noinputmodules="networking $noinputmodules"
3387 def_network='#undef CONFIG_NETWORK' 3388 def_network='#undef CONFIG_NETWORK'
3389 def_networking='#undef CONFIG_NETWORKING'
3388 _ftp=no 3390 _ftp=no
3389 libavprotocols=$(echo $libavprotocols | sed -e s/GOPHER_PROTOCOL// -e s/HTTP_PROTOCOL// -e s/RTMP_PROTOCOL// -e s/RTP_PROTOCOL// -e s/TCP_PROTOCOL// -e s/UDP_PROTOCOL//) 3391 libavprotocols=$(echo $libavprotocols | sed -e s/GOPHER_PROTOCOL// -e s/HTTP_PROTOCOL// -e s/RTMP_PROTOCOL// -e s/RTP_PROTOCOL// -e s/TCP_PROTOCOL// -e s/UDP_PROTOCOL//)
3390 libavdemuxers=$(echo $libavdemuxers | sed -e s/RTSP_DEMUXER// -e s/SDP_DEMUXER//) 3392 libavdemuxers=$(echo $libavdemuxers | sed -e s/RTSP_DEMUXER// -e s/SDP_DEMUXER//)
3391 fi 3393 fi
3392 echores "$_network" 3394 echores "$networking"
3393 3395
3394 3396
3395 echocheck "inet6" 3397 echocheck "inet6"
3396 if test "$_inet6" = auto ; then 3398 if test "$_inet6" = auto ; then
3397 cat > $TMPC << EOF 3399 cat > $TMPC << EOF
6240 def_havelibcdio='no' 6242 def_havelibcdio='no'
6241 fi 6243 fi
6242 echores "$_libcdio" 6244 echores "$_libcdio"
6243 6245
6244 if test "$_cdda" = yes ; then 6246 if test "$_cdda" = yes ; then
6245 test $_cddb = auto && test $_network = yes && _cddb=yes 6247 test $_cddb = auto && test $networking = yes && _cddb=yes
6246 def_cdparanoia='#define CONFIG_CDDA 1' 6248 def_cdparanoia='#define CONFIG_CDDA 1'
6247 inputmodules="cdda $inputmodules" 6249 inputmodules="cdda $inputmodules"
6248 else 6250 else
6249 def_cdparanoia='#undef CONFIG_CDDA' 6251 def_cdparanoia='#undef CONFIG_CDDA'
6250 noinputmodules="cdda $noinputmodules" 6252 noinputmodules="cdda $noinputmodules"
7140 nocodecmodules="qtx $nocodecmodules" 7142 nocodecmodules="qtx $nocodecmodules"
7141 fi 7143 fi
7142 echores "$_qtx" 7144 echores "$_qtx"
7143 7145
7144 echocheck "Nemesi Streaming Media libraries" 7146 echocheck "Nemesi Streaming Media libraries"
7145 if test "$_nemesi" = auto && test "$_network" = yes ; then 7147 if test "$_nemesi" = auto && test "$networking" = yes ; then
7146 _nemesi=no 7148 _nemesi=no
7147 if $_pkg_config libnemesi --atleast-version=0.6.3 ; then 7149 if $_pkg_config libnemesi --atleast-version=0.6.3 ; then
7148 extra_cflags="$extra_cflags $($_pkg_config --cflags libnemesi)" 7150 extra_cflags="$extra_cflags $($_pkg_config --cflags libnemesi)"
7149 extra_ldflags="$extra_ldflags $($_pkg_config --libs libnemesi)" 7151 extra_ldflags="$extra_ldflags $($_pkg_config --libs libnemesi)"
7150 _nemesi=yes 7152 _nemesi=yes
7153 if test "$_nemesi" = yes; then 7155 if test "$_nemesi" = yes; then
7154 _native_rtsp=no 7156 _native_rtsp=no
7155 def_nemesi='#define CONFIG_LIBNEMESI 1' 7157 def_nemesi='#define CONFIG_LIBNEMESI 1'
7156 inputmodules="nemesi $inputmodules" 7158 inputmodules="nemesi $inputmodules"
7157 else 7159 else
7158 _native_rtsp="$_network" 7160 _native_rtsp="$networking"
7159 _nemesi=no 7161 _nemesi=no
7160 def_nemesi='#undef CONFIG_LIBNEMESI' 7162 def_nemesi='#undef CONFIG_LIBNEMESI'
7161 noinputmodules="nemesi $noinputmodules" 7163 noinputmodules="nemesi $noinputmodules"
7162 fi 7164 fi
7163 echores "$_nemesi" 7165 echores "$_nemesi"
7164 7166
7165 echocheck "LIVE555 Streaming Media libraries" 7167 echocheck "LIVE555 Streaming Media libraries"
7166 if test "$_live" = auto && test "$_network" = yes ; then 7168 if test "$_live" = auto && test "$networking" = yes ; then
7167 cat > $TMPCPP << EOF 7169 cat > $TMPCPP << EOF
7168 #include <liveMedia.hh> 7170 #include <liveMedia.hh>
7169 #if (LIVEMEDIA_LIBRARY_VERSION_INT < 1141257600) 7171 #if (LIVEMEDIA_LIBRARY_VERSION_INT < 1141257600)
7170 #error Please upgrade to version 2006.03.03 or later of the "LIVE555 Streaming Media" libraries - available from <www.live555.com/liveMedia/> 7172 #error Please upgrade to version 2006.03.03 or later of the "LIVE555 Streaming Media" libraries - available from <www.live555.com/liveMedia/>
7171 #endif 7173 #endif
7192 if cxx_check -I/usr/include/liveMedia -I/usr/include/UsageEnvironment -I/usr/include/groupsock $ld_tmp; then 7194 if cxx_check -I/usr/include/liveMedia -I/usr/include/UsageEnvironment -I/usr/include/groupsock $ld_tmp; then
7193 _live_dist=yes 7195 _live_dist=yes
7194 fi 7196 fi
7195 fi 7197 fi
7196 fi 7198 fi
7197 if test "$_live" = yes && test "$_network" = yes; then 7199 if test "$_live" = yes && test "$networking" = yes; then
7198 test $_livelibdir && res_comment="using $_livelibdir" 7200 test $_livelibdir && res_comment="using $_livelibdir"
7199 def_live='#define CONFIG_LIVE555 1' 7201 def_live='#define CONFIG_LIVE555 1'
7200 inputmodules="live555 $inputmodules" 7202 inputmodules="live555 $inputmodules"
7201 elif test "$_live_dist" = yes && test "$_network" = yes; then 7203 elif test "$_live_dist" = yes && test "$networking" = yes; then
7202 res_comment="using distribution version" 7204 res_comment="using distribution version"
7203 _live="yes" 7205 _live="yes"
7204 def_live='#define CONFIG_LIVE555 1' 7206 def_live='#define CONFIG_LIVE555 1'
7205 extra_ldflags="$extra_ldflags $ld_tmp" 7207 extra_ldflags="$extra_ldflags $ld_tmp"
7206 extra_cxxflags="-I/usr/include/liveMedia -I/usr/include/UsageEnvironment \ 7208 extra_cxxflags="-I/usr/include/liveMedia -I/usr/include/UsageEnvironment \
7212 noinputmodules="live555 $noinputmodules" 7214 noinputmodules="live555 $noinputmodules"
7213 fi 7215 fi
7214 echores "$_live" 7216 echores "$_live"
7215 7217
7216 echocheck "RTMPDump Streaming Media library" 7218 echocheck "RTMPDump Streaming Media library"
7217 if test "$_librtmp" = auto && test "$_network" = yes ; then 7219 if test "$_librtmp" = auto && test "$networking" = yes ; then
7218 cat > $TMPC << EOF 7220 cat > $TMPC << EOF
7219 #include <librtmp/rtmp.h> 7221 #include <librtmp/rtmp.h>
7220 int main(void) { RTMP r; RTMP_Socket(&r); return 0; } 7222 int main(void) { RTMP r; RTMP_Socket(&r); return 0; }
7221 EOF 7223 EOF
7222 cc_check -lrtmp && _librtmp=yes && extra_ldflags="$extra_ldflags -lrtmp" 7224 cc_check -lrtmp && _librtmp=yes && extra_ldflags="$extra_ldflags -lrtmp"
7226 cc_check $_inc_tmp $_ld_tmp && _librtmp=yes && \ 7228 cc_check $_inc_tmp $_ld_tmp && _librtmp=yes && \
7227 extra_ldflags="$extra_ldflags $_ld_tmp" && \ 7229 extra_ldflags="$extra_ldflags $_ld_tmp" && \
7228 extra_cflags="$extra_cflags $_inc_tmp" 7230 extra_cflags="$extra_cflags $_inc_tmp"
7229 fi 7231 fi
7230 fi 7232 fi
7231 if test "$_librtmp" = yes && test "$_network" = yes; then 7233 if test "$_librtmp" = yes && test "$networking" = yes; then
7232 nolibrtmp=no 7234 nolibrtmp=no
7233 def_librtmp='#define CONFIG_LIBRTMP 1' 7235 def_librtmp='#define CONFIG_LIBRTMP 1'
7234 inputmodules="librtmp $inputmodules" 7236 inputmodules="librtmp $inputmodules"
7235 else 7237 else
7236 nolibrtmp=yes 7238 nolibrtmp=yes
8662 MP3LIB = $_mp3lib 8664 MP3LIB = $_mp3lib
8663 MPG123 = $_mpg123 8665 MPG123 = $_mpg123
8664 MUSEPACK = $_musepack 8666 MUSEPACK = $_musepack
8665 NAS = $_nas 8667 NAS = $_nas
8666 NATIVE_RTSP = $_native_rtsp 8668 NATIVE_RTSP = $_native_rtsp
8667 NETWORK = $_network 8669 NETWORKING = $networking
8668 OPENAL = $_openal 8670 OPENAL = $_openal
8669 OSS = $_ossaudio 8671 OSS = $_ossaudio
8670 PE_EXECUTABLE = $_pe_executable 8672 PE_EXECUTABLE = $_pe_executable
8671 PNG = $_png 8673 PNG = $_png
8672 PNM = $_pnm 8674 PNM = $_pnm
9120 $def_inet6 9122 $def_inet6
9121 $def_inet_aton 9123 $def_inet_aton
9122 $def_inet_pton 9124 $def_inet_pton
9123 $def_live 9125 $def_live
9124 $def_nemesi 9126 $def_nemesi
9125 $def_network 9127 $def_networking
9126 $def_smb 9128 $def_smb
9127 $def_socklen_t 9129 $def_socklen_t
9128 $def_struct_ipv6_mreq 9130 $def_struct_ipv6_mreq
9129 $def_struct_sockaddr_in6 9131 $def_struct_sockaddr_in6
9130 $def_struct_sockaddr_sa_len 9132 $def_struct_sockaddr_sa_len
9253 $def_log2 9255 $def_log2
9254 $def_log2f 9256 $def_log2f
9255 $def_lrint 9257 $def_lrint
9256 $def_mlib 9258 $def_mlib
9257 $def_mkstemp 9259 $def_mkstemp
9260 $def_network
9258 $def_pic 9261 $def_pic
9259 $def_posix_memalign 9262 $def_posix_memalign
9260 $def_pthreads 9263 $def_pthreads
9261 $def_round 9264 $def_round
9262 $def_roundf 9265 $def_roundf