From e62b2d619c6e3d4557cc181911ea6731098de776 Mon Sep 17 00:00:00 2001
From: frankmorgner <frankmorgner@96b47cad-a561-4643-ad3b-153ac7d7599c>
Date: Tue, 10 Apr 2012 01:51:50 +0000
Subject: [PATCH] re-enabled clumsy include of libws2_32

When recognition of windows build at compile time is done, this should be disabled again.


git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@738 96b47cad-a561-4643-ad3b-153ac7d7599c
---
 npa/Makefile.am     | 3 +--
 npa/src/Makefile.am | 3 ---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/npa/Makefile.am b/npa/Makefile.am
index 5ba6630..3649489 100644
--- a/npa/Makefile.am
+++ b/npa/Makefile.am
@@ -37,8 +37,6 @@ $(opensc_root)/lib/libopensc.la:
 		./configure --disable-doc && \
 		EXTRA_OPENSC_CONFIG="`$(do_export)`" \
 		ZLIB_VERSION="1.2.6" \
-		OPENSC_VERSION="0.12.3-pre1" \
-		OPENSC_URL="http://www2.informatik.hu-berlin.de/~morgner/opensc-0.12.3-pre1.tar.gz" \
 		OPENSSL_VERSION="1.0.1_with_openpace-0.7" \
 		OPENSSL_URL="http://www2.informatik.hu-berlin.de/~morgner/openssl-1.0.1_with_openpace-0.7.tar.gz" \
 		EXTRA_OPENSSL_CONFIG="experimental-pace" \
@@ -52,6 +50,7 @@ $(opensc_root)/lib/libnpa.la: $(opensc_root)/lib/libopensc.la
 		--host=i586-mingw32msvc \
 		--build=$(shell gcc -dumpmachine) \
 		--program-prefix='' \
+		LIBS="-lws2_32" \
 		PKG_CONFIG_PATH="$(opensc_root)/lib/pkgconfig" \
 		PKG_CONFIG_SYSROOT_DIR="$(opensc_root)" \
 		OPENSC_LIBS="-L$(opensc_root)/lib -lopensc" || ($(restore_la) && false)
diff --git a/npa/src/Makefile.am b/npa/src/Makefile.am
index f141292..9dca685 100644
--- a/npa/src/Makefile.am
+++ b/npa/src/Makefile.am
@@ -18,9 +18,6 @@ libnpa_la_SOURCES = sm.c scutil.c npa.c sslutil.c
 libnpa_la_LIBADD = $(OPENSSL_LIBS) $(OPENSC_LIBS)
 libnpa_la_CFLAGS = $(OPENSSL_CFLAGS)
 libnpa_la_LDFLAGS = -no-undefined
-#if WIN32
-#libnpa_la_LIBADD += -lws2_32
-#endif
 
 npa_tool_SOURCES = npa-tool.c $(BUILT_SOURCES)
 npa_tool_LDADD = $(OPENSSL_LIBS) $(OPENSC_LIBS) libnpa.la