[libxslt] Build without winsock
- From: Nick Wellnhofer <nwellnhof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libxslt] Build without winsock
- Date: Tue, 12 Feb 2019 12:38:04 +0000 (UTC)
commit 1ffe17a071468a51e6f32b7d6d70da4b9424cca9
Author: Nick Wellnhofer <wellnhofer aevum de>
Date: Wed Jan 30 13:57:16 2019 +0100
Build without winsock
Fixes bug #481434:
https://bugzilla.gnome.org/show_bug.cgi?id=481434
configure.ac | 7 +------
win32/Makefile.mingw | 2 +-
win32/Makefile.msvc | 2 +-
3 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 10101803..74fb5e6e 100644
--- 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
index 4fc42fe3..ad6ecdf2 100644
--- 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
index a6d57a12..2e4742bb 100644
--- 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]