VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

re-enabled clumsy include of libws2_32

Browse Source 
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
This commit is contained in:
frankmorgner
2012-04-10 01:51:50 +00:00
parent 931f51e2f1
commit e62b2d619c
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
npa/Makefile.am
View File

@@ -37,8 +37,6 @@ $(opensc_root)/lib/libopensc.la:
./configure --disable-doc && \ ./configure --disable-doc && \
EXTRA_OPENSC_CONFIG="`$(do_export)`" \ EXTRA_OPENSC_CONFIG="`$(do_export)`" \
ZLIB_VERSION="1.2.6" \ 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_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" \ OPENSSL_URL="http://www2.informatik.hu-berlin.de/~morgner/openssl-1.0.1_with_openpace-0.7.tar.gz" \
EXTRA_OPENSSL_CONFIG="experimental-pace" \ EXTRA_OPENSSL_CONFIG="experimental-pace" \
@@ -52,6 +50,7 @@ $(opensc_root)/lib/libnpa.la: $(opensc_root)/lib/libopensc.la
--host=i586-mingw32msvc \ --host=i586-mingw32msvc \
--build=$(shell gcc -dumpmachine) \ --build=$(shell gcc -dumpmachine) \
--program-prefix='' \ --program-prefix='' \
LIBS="-lws2_32" \
PKG_CONFIG_PATH="$(opensc_root)/lib/pkgconfig" \ PKG_CONFIG_PATH="$(opensc_root)/lib/pkgconfig" \
PKG_CONFIG_SYSROOT_DIR="$(opensc_root)" \ PKG_CONFIG_SYSROOT_DIR="$(opensc_root)" \
OPENSC_LIBS="-L$(opensc_root)/lib -lopensc" || ($(restore_la) && false) OPENSC_LIBS="-L$(opensc_root)/lib -lopensc" || ($(restore_la) && false)

3
npa/src/Makefile.am
View File

@@ -18,9 +18,6 @@ libnpa_la_SOURCES = sm.c scutil.c npa.c sslutil.c
libnpa_la_LIBADD = $(OPENSSL_LIBS) $(OPENSC_LIBS) libnpa_la_LIBADD = $(OPENSSL_LIBS) $(OPENSC_LIBS)
libnpa_la_CFLAGS = $(OPENSSL_CFLAGS) libnpa_la_CFLAGS = $(OPENSSL_CFLAGS)
libnpa_la_LDFLAGS = -no-undefined libnpa_la_LDFLAGS = -no-undefined
#if WIN32
#libnpa_la_LIBADD += -lws2_32
#endif
npa_tool_SOURCES = npa-tool.c $(BUILT_SOURCES) npa_tool_SOURCES = npa-tool.c $(BUILT_SOURCES)
npa_tool_LDADD = $(OPENSSL_LIBS) $(OPENSC_LIBS) libnpa.la npa_tool_LDADD = $(OPENSSL_LIBS) $(OPENSC_LIBS) libnpa.la