Mercurial > mplayer.hg

comparison configure @ 27461:5a30f5bc23a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename HAVE_WINSOCK preprocessor condition to HAVE_WINSOCK_H. This is what it is called in FFmpeg and more consistent with other names for similar conditionals. This fixes a potential compilation failure on MinGW, as described in Bugzilla #1262.
author diego
date Fri, 29 Aug 2008 20:05:08 +0000
parents ebf36d827c08
children ea01824701a5
comparison
equal deleted inserted replaced
27460:1b5516898adb 27461:5a30f5bc23a0
237 --disable-tv-bsdbt848 disable BSD BT848 interface [autodetect] 237 --disable-tv-bsdbt848 disable BSD BT848 interface [autodetect]
238 --disable-tv-teletext disable TV teletext interface [autodetect] 238 --disable-tv-teletext disable TV teletext interface [autodetect]
239 --disable-pvr disable Video4Linux2 MPEG PVR [autodetect] 239 --disable-pvr disable Video4Linux2 MPEG PVR [autodetect]
240 --disable-rtc disable RTC (/dev/rtc) on Linux [autodetect] 240 --disable-rtc disable RTC (/dev/rtc) on Linux [autodetect]
241 --disable-network disable networking [enable] 241 --disable-network disable networking [enable]
242 --enable-winsock2 enable winsock2 [autodetect] 242 --enable-winsock2_h enable winsock2_h [autodetect]
243 --enable-smb enable Samba (SMB) input [autodetect] 243 --enable-smb enable Samba (SMB) input [autodetect]
244 --enable-live enable LIVE555 Streaming Media [autodetect] 244 --enable-live enable LIVE555 Streaming Media [autodetect]
245 --enable-nemesi enable Nemesi Streaming Media [autodetect] 245 --enable-nemesi enable Nemesi Streaming Media [autodetect]
246 --disable-dvdnav disable libdvdnav [autodetect] 246 --disable-dvdnav disable libdvdnav [autodetect]
247 --disable-dvdread disable libdvdread [autodetect] 247 --disable-dvdread disable libdvdread [autodetect]
619 _tv_bsdbt848=auto 619 _tv_bsdbt848=auto
620 _tv_dshow=auto 620 _tv_dshow=auto
621 _tv_teletext=auto 621 _tv_teletext=auto
622 _pvr=auto 622 _pvr=auto
623 _network=yes 623 _network=yes
624 _winsock2=auto 624 _winsock2_h=auto
625 _smb=auto 625 _smb=auto
626 _vidix=auto 626 _vidix=auto
627 _vidix_pcidb=yes 627 _vidix_pcidb=yes
628 _dhahelper=no 628 _dhahelper=no
629 _svgalib_helper=no 629 _svgalib_helper=no
1020 --disable-pvr) _pvr=no ;; 1020 --disable-pvr) _pvr=no ;;
1021 --enable-fastmemcpy) _fastmemcpy=yes ;; 1021 --enable-fastmemcpy) _fastmemcpy=yes ;;
1022 --disable-fastmemcpy) _fastmemcpy=no ;; 1022 --disable-fastmemcpy) _fastmemcpy=no ;;
1023 --enable-network) _network=yes ;; 1023 --enable-network) _network=yes ;;
1024 --disable-network) _network=no ;; 1024 --disable-network) _network=no ;;
1025 --enable-winsock2) _winsock2=yes ;; 1025 --enable-winsock2_h) _winsock2_h=yes ;;
1026 --disable-winsock2) _winsock2=no ;; 1026 --disable-winsock2_h) _winsock2_h=no ;;
1027 --enable-smb) _smb=yes ;; 1027 --enable-smb) _smb=yes ;;
1028 --disable-smb) _smb=no ;; 1028 --disable-smb) _smb=no ;;
1029 --enable-vidix) _vidix=yes ;; 1029 --enable-vidix) _vidix=yes ;;
1030 --disable-vidix) _vidix=no ;; 1030 --disable-vidix) _vidix=no ;;
1031 --with-vidix-drivers=*) 1031 --with-vidix-drivers=*)
2800 EOF 2800 EOF
2801 _socklib=no 2801 _socklib=no
2802 for _ld_tmp in "" "-lsocket -lbind" "-lsocket -ldnet" "-lsocket -lnsl" "-lnsl" "-lsocket" ; do 2802 for _ld_tmp in "" "-lsocket -lbind" "-lsocket -ldnet" "-lsocket -lnsl" "-lnsl" "-lsocket" ; do
2803 cc_check $_ld_tmp && _ld_sock="$_ld_tmp" && _socklib=yes && break 2803 cc_check $_ld_tmp && _ld_sock="$_ld_tmp" && _socklib=yes && break
2804 done 2804 done
2805 if test $_winsock2 = auto && ! cygwin ; then 2805 if test $_winsock2_h = auto && ! cygwin ; then
2806 _winsock2=no 2806 _winsock2_h=no
2807 cat > $TMPC << EOF 2807 cat > $TMPC << EOF
2808 #include <winsock2.h> 2808 #include <winsock2.h>
2809 int main(void) { (void) gethostbyname(0); return 0; } 2809 int main(void) { (void) gethostbyname(0); return 0; }
2810 EOF 2810 EOF
2811 cc_check -lws2_32 && _ld_sock="-lws2_32" && _winsock2=yes 2811 cc_check -lws2_32 && _ld_sock="-lws2_32" && _winsock2_h=yes
2812 fi 2812 fi
2813 test "$_ld_sock" && _res_comment="using $_ld_sock" 2813 test "$_ld_sock" && _res_comment="using $_ld_sock"
2814 echores "$_socklib" 2814 echores "$_socklib"
2815 2815
2816 2816
2817 if test $_winsock2 = yes ; then 2817 if test $_winsock2_h = yes ; then
2818 _ld_sock="-lws2_32" 2818 _ld_sock="-lws2_32"
2819 _def_winsock2='#define HAVE_WINSOCK2 1' 2819 _def_winsock2_h='#define HAVE_WINSOCK2_H 1'
2820 else 2820 else
2821 _def_winsock2='#undef HAVE_WINSOCK2' 2821 _def_winsock2_h='#undef HAVE_WINSOCK2_H'
2822 fi 2822 fi
2823 2823
2824 2824
2825 _use_aton=no 2825 _use_aton=no
2826 echocheck "inet_pton()" 2826 echocheck "inet_pton()"
2828 #include <sys/types.h> 2828 #include <sys/types.h>
2829 #include <sys/socket.h> 2829 #include <sys/socket.h>
2830 #include <arpa/inet.h> 2830 #include <arpa/inet.h>
2831 int main(void) { (void) inet_pton(0, 0, 0); return 0; } 2831 int main(void) { (void) inet_pton(0, 0, 0); return 0; }
2832 EOF 2832 EOF
2833 if test "$_winsock2" = yes ; then 2833 if test "$_winsock2_h" = yes ; then
2834 _res_comment="using winsock2 functions instead" 2834 _res_comment="using winsock2 functions instead"
2835 echores "no" 2835 echores "no"
2836 elif cc_check $_ld_sock ; then 2836 elif cc_check $_ld_sock ; then
2837 # NOTE: Linux has libresolv but does not need it 2837 # NOTE: Linux has libresolv but does not need it
2838 : 2838 :
8628 8628
8629 /* enable vstream support */ 8629 /* enable vstream support */
8630 $_def_vstream 8630 $_def_vstream
8631 8631
8632 /* enable winsock2 instead of Unix functions*/ 8632 /* enable winsock2 instead of Unix functions*/
8633 $_def_winsock2 8633 $_def_winsock2_h
8634 8634
8635 /* define this to use inet_aton() instead of inet_pton() */ 8635 /* define this to use inet_aton() instead of inet_pton() */
8636 $_def_use_aton 8636 $_def_use_aton
8637 8637
8638 /* socklen_t support */ 8638 /* socklen_t support */