Sync with HEAD, change mixed in with copyright updates

diff --git a/configure.in b/configure.in
index ba9cc8a36d892e26a9bb266501f35e6f353bd6b2..48edacf25ccc8cd47ea8ab7398db4178c8b78a7a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -698,6 +698,7 @@ dnl Checks for Windows NT
 case $host_os in
   *mingw32* ) ac_cv_mingw32=yes ;;
   *cygwin* ) ac_cv_cygwin=yes ;;
+  *interix* ) ac_cv_interix=yes ;;
 esac
 
 dnl ----------------------------------------------------------------
@@ -843,7 +844,10 @@ AC_CHECK_HEADERS(  \
 )
 
 dnl Only check Winsock on MinGW
-if test "$ac_cv_mingw32" = yes -o "$ol_cv_msvc" = yes ; then
+if test "$ac_cv_mingw32" = yes \
+       -o "$ac_cv_interix" = yes \
+       -o "$ol_cv_msvc" = yes
+then
        AC_CHECK_HEADERS( winsock.h winsock2.h )
 fi