[sane-devel] [PATCH v2 06/14] bldchn, don't always disable net backend on win32

[Ruediger Meier]

From: Ruediger Meier <ruediger.meier at ga-group.nl>

Building net backend will still fail but how else we could try it.
---
 acinclude.m4 |    5 +++--
 configure    |   10 ++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 38d1819..7cc4228 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -693,8 +693,9 @@ for be in ${BACKENDS}; do
     ;;
 
     net)
-    if test "${ac_cv_header_sys_socket_h}" = "no"; then
-      echo "*** $be backend requires sys/socket.h - $DISABLE_MSG"
+    if test "${ac_cv_header_sys_socket_h}" != "yes" \
+      && test "${ac_cv_header_winsock2_h}" != "yes"; then
+      echo "*** $be backend requires sys/socket.h or winsock2.h - $DISABLE_MSG"
       backend_supported="no"
     fi
     ;;
diff --git a/configure b/configure
index ba1df33..7f60bb9 100755
--- a/configure
+++ b/configure
@@ -17942,8 +17942,9 @@ for be in ${BACKENDS}; do
     ;;
 
     net)
-    if test "${ac_cv_header_sys_socket_h}" = "no"; then
-      echo "*** $be backend requires sys/socket.h - $DISABLE_MSG"
+    if test "${ac_cv_header_sys_socket_h}" != "yes" \
+      && test "${ac_cv_header_winsock2_h}" != "yes"; then
+      echo "*** $be backend requires sys/socket.h or winsock2.h - $DISABLE_MSG"
       backend_supported="no"
     fi
     ;;
@@ -18106,8 +18107,9 @@ for be in ${BACKENDS}; do
     ;;
 
     net)
-    if test "${ac_cv_header_sys_socket_h}" = "no"; then
-      echo "*** $be backend requires sys/socket.h - $DISABLE_MSG"
+    if test "${ac_cv_header_sys_socket_h}" != "yes" \
+      && test "${ac_cv_header_winsock2_h}" != "yes"; then
+      echo "*** $be backend requires sys/socket.h or winsock2.h - $DISABLE_MSG"
       backend_supported="no"
     fi
     ;;
-- 
1.7.6.1