Link against -lws2_32 on Windows.

Gnulib commit df1da811, "Fix link errors on Windows when close
module is used", adds a Makefile variable $(LIB_CLOSE) that expands
to -lws2_32.  This commit adds that variable to the linker command
line.

It might not be necessary to add this to both pspp and psppire,
but it shouldn't hurt.

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 2183e4e8af619cb69eeaeaf4749f0efab242adc9..1549da4760dbf2b7c5950a321f16359f661d7f8d 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -61,7 +61,8 @@ src_ui_gui_psppire_LDADD = \
        src/libpspp-core.la \
        $(GTK_LIBS) \
        $(GLADE_LIBS) \
-       @LIBINTL@
+       @LIBINTL@ \
+       $(LIB_CLOSE)
 
 src_ui_gui_psppiredir = $(pkgdatadir)
 

diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk
index 5ab098577a57f015040543faf7387960ab46a8cd..cd47b62e7863af1859a725b206225526fa4363e8 100644 (file)
--- a/src/ui/terminal/automake.mk
+++ b/src/ui/terminal/automake.mk
@@ -27,7 +27,8 @@ src_ui_terminal_pspp_LDADD = \
        src/libpspp-core.la \
        $(NCURSES_LIBS) \
        $(LIBICONV) \
-       @LIBINTL@ @LIBREADLINE@
+       @LIBINTL@ @LIBREADLINE@ \
+       $(LIB_CLOSE)
 
 
 src_ui_terminal_pspp_LDFLAGS = $(PSPP_LDFLAGS) $(PG_LDFLAGS)