Revision 73b46a95

View differences:

configure
1192 1192
    SLIB_EXTRA_CMD="-lib /machine:i386 /def:\$(@:${SLIBSUF}=.def)"
1193 1193
    SLIB_INSTALL_EXTRA_CMD="-install -m 644 \$(SLIBNAME_WITH_MAJOR:\$(SLIBSUF)=.lib) \"\$(SHLIBDIR)/\$(SLIBNAME_WITH_MAJOR:\$(SLIBSUF)=.lib)\""
1194 1194
    SHFLAGS="-shared -Wl,--output-def,\$(@:${SLIBSUF}=.def),--out-implib,lib\$(SLIBNAME:\$(SLIBSUF)=.dll.a) -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-image-base"
1195
    enabled network && add_extralibs -lws2_32
1196 1195
    ;;
1197 1196
  cygwin*)
1198 1197
    targetos=cygwin
......
1542 1541
check_header termios.h
1543 1542
check_header conio.h
1544 1543

  
1545
check_header arpa/inet.h
1546
check_header winsock2.h
1547

  
1548 1544
check_func inet_aton
1549 1545
enabled zlib && check_lib zlib.h zlibVersion -lz || zlib="no"
1550 1546

  
......
1631 1627
check_func2 windows.h GetProcessTimes
1632 1628

  
1633 1629
check_func fork
1634
check_func closesocket ||
1635
    check_func2 winsock2.h closesocket
1636 1630

  
1637 1631
test "$vhook" = "default" && vhook="$dlopen"
1638 1632

  
......
1688 1682
texi2html -version >/dev/null 2>&1 && enable texi2html || disable texi2html
1689 1683

  
1690 1684
##########################################
1685
# Network check
1686

  
1687
if enabled network; then
1688
    # Prefer arpa/inet.h over winsock2
1689
    if check_header arpa/inet.h ; then
1690
        check_func closesocket
1691
    elif check_header winsock2.h ; then
1692
        add_extralibs -lws2_32
1693
        check_func2 winsock2.h closesocket
1694
    fi
1695
fi
1696

  
1697
##########################################
1691 1698
# IPv6 check
1692 1699

  
1693 1700
enabled network && enabled ipv6 && check_ld <<EOF && ipv6=yes || ipv6=no

Also available in: Unified diff