summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-14 12:06:38 +0000
committercehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-14 12:06:38 +0000
commit3e2af067eca38c629aacf3d4f1b26d16c8a63fe9 (patch)
treea79e8b007f70c952ebe0871f10197880e8075e62
parent1cda8b002fb19c3da14760fe1f9fc76992a05c29 (diff)
downloadmpv-3e2af067eca38c629aacf3d4f1b26d16c8a63fe9.tar.bz2
mpv-3e2af067eca38c629aacf3d4f1b26d16c8a63fe9.tar.xz
Fix compilation after recent changes in FFmpeg.
Patch by Etienne Buira, etienne D buira A free D fr git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30302 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-xconfigure64
1 files changed, 64 insertions, 0 deletions
diff --git a/configure b/configure
index 3dab6bab0c..ed5d89c9dd 100755
--- a/configure
+++ b/configure
@@ -680,6 +680,9 @@ _tv_dshow=auto
_pvr=auto
_network=yes
_winsock2_h=auto
+_struct_addrinfo=auto
+_getaddrinfo=auto
+_struct_sockaddr_storage=auto
_smb=auto
_vidix=auto
_vidix_pcidb=yes
@@ -3100,6 +3103,64 @@ else
fi
+echocheck "netdb.h, struct addrinfo"
+if test "$_struct_addrinfo" = auto; then
+ _struct_addrinfo=no
+ cat > $TMPC << EOF
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+int main(void) { struct addrinfo ai; return 0; }
+EOF
+ cc_check && _struct_addrinfo=yes
+fi
+echores "$_struct_addrinfo"
+
+if test "$_struct_addrinfo" = yes; then
+ def_addrinfo="#define HAVE_STRUCT_ADDRINFO 1"
+else
+ def_addrinfo="#define HAVE_STRUCT_ADDRINFO 0"
+fi
+
+
+echocheck "netdb.h, getaddrinfo()"
+if test "$_getaddrinfo" = auto; then
+ _getaddrinfo=no
+ cat > $TMPC << EOF
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+int main(void) { (void) getaddrinfo(0, 0, 0, 0); return 0; }
+EOF
+ cc_check && _getaddrinfo=yes
+fi
+echores "$_getaddrinfo"
+
+if test "$_getaddrinfo" = yes; then
+ def_getaddrinfo="#define HAVE_GETADDRINFO 1"
+else
+ def_getaddrinfo="define HAVE_GETADDRINFO 0"
+fi
+
+
+echocheck "sockaddr_storage"
+if test "$_struct_sockaddr_storage" = auto; then
+ _struct_sockaddr_storage=no
+ cat > $TMPC << EOF
+#include <sys/socket.h>
+int main(void) { struct sockaddr_storage sas; return 0; }
+EOF
+ cc_check && _struct_sockaddr_storage=yes
+fi
+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"
+fi
+
+
echocheck "arpa/inet.h"
arpa_inet_h=no
def_arpa_inet_h='#define HAVE_ARPA_INET_H 0'
@@ -8907,6 +8968,9 @@ $def_network
$def_smb
$def_socklen_t
$def_vstream
+$def_addrinfo
+$def_getaddrinfo
+$def_sockaddr_storage
/* libvo options */