Build without winsock

Fixes bug #481434: https://bugzilla.gnome.org/show_bug.cgi?id=481434
GNOME · Feb 12, 2019 · 1ffe17a · 1ffe17a
1 parent b93a4d0
commit 1ffe17a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/configure.ac b/configure.ac
@@ -582,14 +582,9 @@ AC_SUBST(LIBXSLT_DEFAULT_PLUGINS_PATH)
 WIN32_EXTRA_LIBADD=
 WIN32_EXTRA_LDFLAGS=
 case "$host" in
- *-*-cygwin*)
+ *-*-cygwin*|*-*-mingw*)
  WIN32_EXTRA_LDFLAGS="-no-undefined"
  ;;
- *-*-mingw*)
- WIN32_EXTRA_LIBADD="-lwsock32"
- WIN32_EXTRA_LDFLAGS="-no-undefined"
- AC_DEFINE([_WINSOCKAPI_],1,[Using the Win32 Socket implementation])
- ;;
 esac
 AC_SUBST(WIN32_EXTRA_LIBADD)
 AC_SUBST(WIN32_EXTRA_LDFLAGS)

diff --git a/win32/Makefile.mingw b/win32/Makefile.mingw
@@ -55,7 +55,7 @@ CFLAGS += -I$(BASEDIR) -I$(XSLT_SRCDIR) -I$(INCPREFIX)
 # The linker and its options.
 LD = gcc.exe
 LDFLAGS += -Wl,-L,$(BINDIR) -Wl,-L,$(LIBPREFIX)
-LIBS = -lwsock32
+LIBS =
 
 # The archiver and its options.
 AR = ar.exe

diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
@@ -59,7 +59,7 @@ CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
 LD = link.exe
 LDFLAGS = /nologo
 LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX)
-LIBS = wsock32.lib
+LIBS =
 
 # The archiver and its options.
 AR = lib.exe