diff options
author | Vincent Richard <[email protected]> | 2011-03-27 11:26:55 +0000 |
---|---|---|
committer | Vincent Richard <[email protected]> | 2011-03-27 11:26:55 +0000 |
commit | 674716438a4e9ef64a6e81b30c572af8daaaa22c (patch) | |
tree | 2678b85f9b35a7b3c256aa4fb281053ae5b45e59 | |
parent | Fixed bug #3174903. Fixed word parsing when buffer does not end with NL. Fixe... (diff) | |
download | vmime-674716438a4e9ef64a6e81b30c572af8daaaa22c.tar.gz vmime-674716438a4e9ef64a6e81b30c572af8daaaa22c.zip |
Allow static linking in mingw-cross-env. Added 'iconv' and uses 'ws2_32' instead of 'winsock32' (#3213487).
-rw-r--r-- | SConstruct | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1089,7 +1089,7 @@ def generateAutotools(target, source, env): vmime_pc_in.write("Description: " + packageDescription + "\n") vmime_pc_in.write("Version: @VERSION@\n") vmime_pc_in.write("Requires: @GSASL_REQUIRED@\n") - vmime_pc_in.write("Libs: -L${libdir} -l@GENERIC_VERSIONED_LIBRARY_NAME@ @GSASL_LIBS@ @LIBGNUTLS_LIBS@ @VMIME_ADDITIONAL_PC_LIBS@\n") + vmime_pc_in.write("Libs: -L${libdir} -l@GENERIC_VERSIONED_LIBRARY_NAME@ @GSASL_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @PTHREAD_LIBS@ @VMIME_ADDITIONAL_PC_LIBS@\n") #vmime_pc_in.write("Cflags: -I${includedir}/@GENERIC_VERSIONED_LIBRARY_NAME@\n") vmime_pc_in.write("Cflags: -I${includedir}/ @LIBGNUTLS_CFLAGS@\n") vmime_pc_in.close() @@ -1709,7 +1709,7 @@ fi # -- Link with Winsock (Windows) if test "x$VMIME_DETECT_PLATFORM" = "xwindows"; then - VMIME_ADDITIONAL_PC_LIBS="$VMIME_ADDITIONAL_PC_LIBS -lwsock32" + VMIME_ADDITIONAL_PC_LIBS="$VMIME_ADDITIONAL_PC_LIBS -lws2_32" fi # -- getaddrinfo (POSIX) |