Mercurial > mplayer.hg
comparison configure @ 35946:ebc74746041d
configure: cosmetics: Move some config.h entries to more sensible places
Also rename some related variables.
| author | diego |
|---|---|
| date | Fri, 22 Mar 2013 15:37:40 +0000 |
| parents | a8baf85f7b6e |
| children | f156407eef7b |
comparison
equal
deleted
inserted
replaced
| 35945:a8baf85f7b6e | 35946:ebc74746041d |
|---|---|
| 3378 cc_check $cc_check_winsock2_h && _struct_addrinfo=yes | 3378 cc_check $cc_check_winsock2_h && _struct_addrinfo=yes |
| 3379 fi | 3379 fi |
| 3380 echores "$_struct_addrinfo" | 3380 echores "$_struct_addrinfo" |
| 3381 | 3381 |
| 3382 if test "$_struct_addrinfo" = yes; then | 3382 if test "$_struct_addrinfo" = yes; then |
| 3383 def_addrinfo="#define HAVE_STRUCT_ADDRINFO 1" | 3383 def_struct_addrinfo="#define HAVE_STRUCT_ADDRINFO 1" |
| 3384 else | 3384 else |
| 3385 def_addrinfo="#define HAVE_STRUCT_ADDRINFO 0" | 3385 def_struct_addrinfo="#define HAVE_STRUCT_ADDRINFO 0" |
| 3386 fi | 3386 fi |
| 3387 | 3387 |
| 3388 | 3388 |
| 3389 echocheck "netdb.h, getaddrinfo()" | 3389 echocheck "netdb.h, getaddrinfo()" |
| 3390 if test "$_getaddrinfo" = auto; then | 3390 if test "$_getaddrinfo" = auto; then |
| 3425 cc_check $cc_check_winsock2_h && _struct_sockaddr_storage=yes | 3425 cc_check $cc_check_winsock2_h && _struct_sockaddr_storage=yes |
| 3426 fi | 3426 fi |
| 3427 echores "$_struct_sockaddr_storage" | 3427 echores "$_struct_sockaddr_storage" |
| 3428 | 3428 |
| 3429 if test "$_struct_sockaddr_storage" = yes; then | 3429 if test "$_struct_sockaddr_storage" = yes; then |
| 3430 def_sockaddr_storage="#define HAVE_STRUCT_SOCKADDR_STORAGE 1" | 3430 def_struct_sockaddr_storage="#define HAVE_STRUCT_SOCKADDR_STORAGE 1" |
| 3431 else | 3431 else |
| 3432 def_sockaddr_storage="#define HAVE_STRUCT_SOCKADDR_STORAGE 0" | 3432 def_struct_sockaddr_storage="#define HAVE_STRUCT_SOCKADDR_STORAGE 0" |
| 3433 fi | 3433 fi |
| 3434 | 3434 |
| 3435 | 3435 |
| 3436 echocheck "struct ipv6_mreq" | 3436 echocheck "struct ipv6_mreq" |
| 3437 _struct_ipv6_mreq=no | 3437 _struct_ipv6_mreq=no |
| 8670 #define MPLAYER_DATADIR "$_datadir" | 8670 #define MPLAYER_DATADIR "$_datadir" |
| 8671 #define MPLAYER_CONFDIR "$_confdir" | 8671 #define MPLAYER_CONFDIR "$_confdir" |
| 8672 #define MPLAYER_LIBDIR "$_libdir" | 8672 #define MPLAYER_LIBDIR "$_libdir" |
| 8673 | 8673 |
| 8674 /* definitions needed by included libraries */ | 8674 /* definitions needed by included libraries */ |
| 8675 #define HAVE_INTTYPES_H 1 | |
| 8676 /* libmpeg2 */ | 8675 /* libmpeg2 */ |
| 8677 $def_fast_inttypes | 8676 $def_fast_inttypes |
| 8678 /* libdvdcss */ | 8677 /* libdvdcss */ |
| 8679 #define HAVE_ERRNO_H 1 | 8678 #define HAVE_ERRNO_H 1 |
| 8679 #define HAVE_INTTYPES_H 1 | |
| 8680 #define HAVE_UNISTD_H 1 | |
| 8681 $def_dvdcss | |
| 8680 /* libdvdcss + libdvdread */ | 8682 /* libdvdcss + libdvdread */ |
| 8681 #define HAVE_LIMITS_H 1 | 8683 #define HAVE_LIMITS_H 1 |
| 8682 /* libdvdcss */ | |
| 8683 #define HAVE_UNISTD_H 1 | |
| 8684 /* libdvdread */ | 8684 /* libdvdread */ |
| 8685 #define HAVE_DLFCN_H 1 | |
| 8686 #define HAVE_MEMCPY 1 | |
| 8685 #define STDC_HEADERS 1 | 8687 #define STDC_HEADERS 1 |
| 8686 #define HAVE_MEMCPY 1 | |
| 8687 /* libdvdnav */ | 8688 /* libdvdnav */ |
| 8688 #define READ_CACHE_TRACE 0 | 8689 #define READ_CACHE_TRACE 0 |
| 8689 /* libdvdread */ | |
| 8690 #define HAVE_DLFCN_H 1 | |
| 8691 $def_dvdcss | |
| 8692 | 8690 |
| 8693 | 8691 |
| 8694 /* system headers */ | 8692 /* system headers */ |
| 8695 $def_alloca_h | 8693 $def_alloca_h |
| 8696 $def_altivec_h | 8694 $def_altivec_h |
| 8909 $def_inet_pton | 8907 $def_inet_pton |
| 8910 $def_live | 8908 $def_live |
| 8911 $def_nemesi | 8909 $def_nemesi |
| 8912 $def_networking | 8910 $def_networking |
| 8913 $def_smb | 8911 $def_smb |
| 8914 $def_socklen_t | |
| 8915 $def_struct_ipv6_mreq | |
| 8916 $def_struct_sockaddr_in6 | |
| 8917 $def_struct_sockaddr_sa_len | |
| 8918 $def_vstream | 8912 $def_vstream |
| 8919 $def_addrinfo | |
| 8920 $def_getaddrinfo | |
| 8921 $def_sockaddr_storage | |
| 8922 | 8913 |
| 8923 | 8914 |
| 8924 /* libvo options */ | 8915 /* libvo options */ |
| 8925 $def_3dfx | 8916 $def_3dfx |
| 8926 $def_aa | 8917 $def_aa |
| 9051 $def_local_aligned_8 | 9042 $def_local_aligned_8 |
| 9052 $def_local_aligned_16 | 9043 $def_local_aligned_16 |
| 9053 $def_os2threads | 9044 $def_os2threads |
| 9054 $def_pic | 9045 $def_pic |
| 9055 $def_pthreads | 9046 $def_pthreads |
| 9047 $def_socklen_t | |
| 9048 $def_struct_addrinfo | |
| 9049 $def_struct_ipv6_mreq | |
| 9050 $def_struct_sockaddr_in6 | |
| 9051 $def_struct_sockaddr_sa_len | |
| 9052 $def_struct_sockaddr_storage | |
| 9056 $def_threads | 9053 $def_threads |
| 9057 $def_w32threads | 9054 $def_w32threads |
| 9058 $def_xform_asm | 9055 $def_xform_asm |
| 9059 $def_xmm_clobbers | 9056 $def_xmm_clobbers |
| 9060 $def_yasm | 9057 $def_yasm |
| 9069 $def_cbrtf | 9066 $def_cbrtf |
| 9070 $def_cosf | 9067 $def_cosf |
| 9071 $def_expf | 9068 $def_expf |
| 9072 $def_exp2 | 9069 $def_exp2 |
| 9073 $def_exp2f | 9070 $def_exp2f |
| 9071 $def_getaddrinfo | |
| 9074 $def_isinf | 9072 $def_isinf |
| 9075 $def_isnan | 9073 $def_isnan |
| 9076 $def_ldexpf | 9074 $def_ldexpf |
| 9077 $def_llrint | 9075 $def_llrint |
| 9078 $def_llrintf | 9076 $def_llrintf |