Mercurial > mplayer.hg
changeset 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 |
| files | configure |
| diffstat | 1 files changed, 18 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Fri Mar 22 15:37:38 2013 +0000 +++ b/configure Fri Mar 22 15:37:40 2013 +0000 @@ -3380,9 +3380,9 @@ echores "$_struct_addrinfo" if test "$_struct_addrinfo" = yes; then - def_addrinfo="#define HAVE_STRUCT_ADDRINFO 1" -else - def_addrinfo="#define HAVE_STRUCT_ADDRINFO 0" + def_struct_addrinfo="#define HAVE_STRUCT_ADDRINFO 1" +else + def_struct_addrinfo="#define HAVE_STRUCT_ADDRINFO 0" fi @@ -3427,9 +3427,9 @@ echores "$_struct_sockaddr_storage" if test "$_struct_sockaddr_storage" = yes; then - def_sockaddr_storage="#define HAVE_STRUCT_SOCKADDR_STORAGE 1" -else - def_sockaddr_storage="#define HAVE_STRUCT_SOCKADDR_STORAGE 0" + def_struct_sockaddr_storage="#define HAVE_STRUCT_SOCKADDR_STORAGE 1" +else + def_struct_sockaddr_storage="#define HAVE_STRUCT_SOCKADDR_STORAGE 0" fi @@ -8672,23 +8672,21 @@ #define MPLAYER_LIBDIR "$_libdir" /* definitions needed by included libraries */ -#define HAVE_INTTYPES_H 1 /* libmpeg2 */ $def_fast_inttypes /* libdvdcss */ #define HAVE_ERRNO_H 1 +#define HAVE_INTTYPES_H 1 +#define HAVE_UNISTD_H 1 +$def_dvdcss /* libdvdcss + libdvdread */ #define HAVE_LIMITS_H 1 -/* libdvdcss */ -#define HAVE_UNISTD_H 1 /* libdvdread */ +#define HAVE_DLFCN_H 1 +#define HAVE_MEMCPY 1 #define STDC_HEADERS 1 -#define HAVE_MEMCPY 1 /* libdvdnav */ #define READ_CACHE_TRACE 0 -/* libdvdread */ -#define HAVE_DLFCN_H 1 -$def_dvdcss /* system headers */ @@ -8911,14 +8909,7 @@ $def_nemesi $def_networking $def_smb -$def_socklen_t -$def_struct_ipv6_mreq -$def_struct_sockaddr_in6 -$def_struct_sockaddr_sa_len $def_vstream -$def_addrinfo -$def_getaddrinfo -$def_sockaddr_storage /* libvo options */ @@ -9053,6 +9044,12 @@ $def_os2threads $def_pic $def_pthreads +$def_socklen_t +$def_struct_addrinfo +$def_struct_ipv6_mreq +$def_struct_sockaddr_in6 +$def_struct_sockaddr_sa_len +$def_struct_sockaddr_storage $def_threads $def_w32threads $def_xform_asm @@ -9071,6 +9068,7 @@ $def_expf $def_exp2 $def_exp2f +$def_getaddrinfo $def_isinf $def_isnan $def_ldexpf