Skip to content

Commit

Permalink
Problem: libnss not linked against
Browse files Browse the repository at this point in the history 
Solution: regenerate from zproject with new dependency
  • Loading branch information
@bluca
bluca committed Sep 21, 2019
1 parent f0673af commit d955400
Show file tree
Hide file tree
Showing 74 changed files with 380 additions and 2 deletions.
18 changes: 18 additions & 0 deletions CMakeLists.txt
View file
Expand Up @@ -206,6 +206,24 @@ IF (CZMQ_WITH_LIBCURL AND LIBCURL_FOUND)
list(APPEND OPTIONAL_LIBRARIES ${LIBCURL_LIBRARIES})
ENDIF (CZMQ_WITH_LIBCURL AND LIBCURL_FOUND)

########################################################################
# NSS dependency
########################################################################
find_package(nss)
option(CZMQ_WITH_NSS "Build czmq with nss" ${NSS_FOUND})
IF (CZMQ_WITH_NSS AND NSS_FOUND)
include_directories(${NSS_INCLUDE_DIRS})
list(APPEND MORE_LIBRARIES ${NSS_LIBRARIES})
IF (PC_NSS_FOUND)
set(pkg_config_names_private "${pkg_config_names_private} nss")
list(APPEND OPTIONAL_LIBRARIES_STATIC ${PC_NSS_STATIC_LDFLAGS})
ELSE (PC_NSS_FOUND)
set(pkg_config_libs_private "${pkg_config_libs_private} -lnss")
ENDIF (PC_NSS_FOUND)
add_definitions(-DHAVE_NSS)
list(APPEND OPTIONAL_LIBRARIES ${NSS_LIBRARIES})
ENDIF (CZMQ_WITH_NSS AND NSS_FOUND)

########################################################################
# LIBMICROHTTPD dependency
########################################################################
Expand Down
46 changes: 46 additions & 0 deletions Findnss.cmake
View file
@@ -0,0 +1,46 @@
################################################################################
# THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY #
# Read the zproject/README.md for information about making permanent changes. #
################################################################################

if (NOT MSVC)
include(FindPkgConfig)
pkg_check_modules(PC_NSS "nss")
if (PC_NSS_FOUND)
# add CFLAGS from pkg-config file, e.g. draft api.
add_definitions(${PC_NSS_CFLAGS} ${PC_NSS_CFLAGS_OTHER})
# some libraries install the headers is a subdirectory of the include dir
# returned by pkg-config, so use a wildcard match to improve chances of finding
# headers and SOs.
set(PC_NSS_INCLUDE_HINTS ${PC_NSS_INCLUDE_DIRS} ${PC_NSS_INCLUDE_DIRS}/*)
set(PC_NSS_LIBRARY_HINTS ${PC_NSS_LIBRARY_DIRS} ${PC_NSS_LIBRARY_DIRS}/*)
endif(PC_NSS_FOUND)
endif (NOT MSVC)

find_path (
NSS_INCLUDE_DIRS
NAMES sechash.h
HINTS ${PC_NSS_INCLUDE_HINTS}
)

find_library (
NSS_LIBRARIES
NAMES nss
HINTS ${PC_NSS_LIBRARY_HINTS}
)

include(FindPackageHandleStandardArgs)

find_package_handle_standard_args(
NSS
REQUIRED_VARS NSS_LIBRARIES NSS_INCLUDE_DIRS
)
mark_as_advanced(
NSS_FOUND
NSS_LIBRARIES NSS_INCLUDE_DIRS
)

################################################################################
# THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY #
# Read the zproject/README.md for information about making permanent changes. #
################################################################################
4 changes: 3 additions & 1 deletion Makefile.am
View file
Expand Up @@ -12,10 +12,11 @@ AM_CPPFLAGS = \
${systemd_CFLAGS} \
${lz4_CFLAGS} \
${libcurl_CFLAGS} \
${nss_CFLAGS} \
${libmicrohttpd_CFLAGS} \
-I$(srcdir)/include

project_libs = ${libzmq_LIBS} ${uuid_LIBS} ${systemd_LIBS} ${lz4_LIBS} ${libcurl_LIBS} ${libmicrohttpd_LIBS}
project_libs = ${libzmq_LIBS} ${uuid_LIBS} ${systemd_LIBS} ${lz4_LIBS} ${libcurl_LIBS} ${nss_LIBS} ${libmicrohttpd_LIBS}

SUBDIRS = doc
SUBDIRS += include
Expand All @@ -41,6 +42,7 @@ EXTRA_DIST += \
Findsystemd.cmake \
Findlz4.cmake \
Findlibcurl.cmake \
Findnss.cmake \
Findlibmicrohttpd.cmake \
src/CMakeLists-local.txt \
builds/cmake/Modules/ClangFormat.cmake \
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/build.gradle
View file
Expand Up @@ -94,6 +94,7 @@ task copyLibs(type: Copy) {
"/usr/lib/libsystemd.so", "/usr/local/lib/libsystemd.so", "/tmp/lib/libsystemd.so",
"/usr/lib/liblz4.so", "/usr/local/lib/liblz4.so", "/tmp/lib/liblz4.so",
"/usr/lib/libcurl.so", "/usr/local/lib/libcurl.so", "/tmp/lib/libcurl.so",
"/usr/lib/nss.so", "/usr/local/lib/nss.so", "/tmp/lib/nss.so",
"/usr/lib/libmicrohttpd.so", "/usr/local/lib/libmicrohttpd.so", "/tmp/lib/libmicrohttpd.so"
into "."
}
Expand Down
7 changes: 7 additions & 0 deletions bindings/jni/msvc/configure.bat
View file
Expand Up @@ -69,6 +69,13 @@ IF EXIST "..\..\..\libcurl" (
ECHO Building without libcurl
ECHO #undef HAVE_LIBCURL>> platform.h
)
IF EXIST "..\..\..\nss" (
ECHO Building with nss
ECHO #define HAVE_NSS 1>> platform.h
) ELSE (
ECHO Building without nss
ECHO #undef HAVE_NSS>> platform.h
)
IF EXIST "..\..\..\libmicrohttpd" (
ECHO Building with libmicrohttpd
ECHO #define HAVE_LIBMICROHTTPD 1>> platform.h
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/Zarmour.java
View file
Expand Up @@ -15,6 +15,7 @@ public class Zarmour implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/Zcert.java
View file
Expand Up @@ -15,6 +15,7 @@ public class Zcert implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/Zcertstore.java
View file
Expand Up @@ -15,6 +15,7 @@ public class Zcertstore implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/Zchunk.java
View file
Expand Up @@ -15,6 +15,7 @@ public class Zchunk implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/Zclock.java
View file
Expand Up @@ -15,6 +15,7 @@ public class Zclock {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/Zconfig.java
View file
Expand Up @@ -15,6 +15,7 @@ public class Zconfig implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/Zdigest.java
View file
Expand Up @@ -15,6 +15,7 @@ public class Zdigest implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/Zdir.java
View file
Expand Up @@ -15,6 +15,7 @@ public class Zdir implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/ZdirPatch.java
View file
Expand Up @@ -15,6 +15,7 @@ public class ZdirPatch implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/Zfile.java
View file
Expand Up @@ -15,6 +15,7 @@ public class Zfile implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/Zframe.java
View file
Expand Up @@ -15,6 +15,7 @@ public class Zframe implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/Zhash.java
View file
Expand Up @@ -15,6 +15,7 @@ public class Zhash implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/Zhashx.java
View file
Expand Up @@ -15,6 +15,7 @@ public class Zhashx implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/ZhttpClient.java
View file
Expand Up @@ -15,6 +15,7 @@ public class ZhttpClient implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/ZhttpRequest.java
View file
Expand Up @@ -15,6 +15,7 @@ public class ZhttpRequest implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/ZhttpResponse.java
View file
Expand Up @@ -15,6 +15,7 @@ public class ZhttpResponse implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/ZhttpServer.java
View file
Expand Up @@ -15,6 +15,7 @@ public class ZhttpServer implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/ZhttpServerOptions.java
View file
Expand Up @@ -15,6 +15,7 @@ public class ZhttpServerOptions implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/Ziflist.java
View file
Expand Up @@ -15,6 +15,7 @@ public class Ziflist implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/Zlist.java
View file
Expand Up @@ -15,6 +15,7 @@ public class Zlist implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/Zlistx.java
View file
Expand Up @@ -15,6 +15,7 @@ public class Zlistx implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/Zloop.java
View file
Expand Up @@ -15,6 +15,7 @@ public class Zloop implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/Zmsg.java
View file
Expand Up @@ -15,6 +15,7 @@ public class Zmsg implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/Zpoller.java
View file
Expand Up @@ -15,6 +15,7 @@ public class Zpoller implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/Zproc.java
View file
Expand Up @@ -15,6 +15,7 @@ public class Zproc implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/Zsock.java
View file
Expand Up @@ -15,6 +15,7 @@ public class Zsock implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/Zstr.java
View file
Expand Up @@ -15,6 +15,7 @@ public class Zstr {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/Zsys.java
View file
Expand Up @@ -15,6 +15,7 @@ public class Zsys {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/Ztimerset.java
View file
Expand Up @@ -15,6 +15,7 @@ public class Ztimerset implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/Ztrie.java
View file
Expand Up @@ -15,6 +15,7 @@ public class Ztrie implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/jni/src/main/java/org/zeromq/czmq/Zuuid.java
View file
Expand Up @@ -15,6 +15,7 @@ public class Zuuid implements AutoCloseable {
ZmqNativeLoader.loadLibrary("libsystemd", true);
ZmqNativeLoader.loadLibrary("lz4", true);
ZmqNativeLoader.loadLibrary("curl", true);
ZmqNativeLoader.loadLibrary("nss", true);
ZmqNativeLoader.loadLibrary("microhttpd", true);
ZmqNativeLoader.loadLibrary("czmq", true);
ZmqNativeLoader.loadLibrary("czmqjni", false);
Expand Down
1 change: 1 addition & 0 deletions bindings/python_cffi/czmq_cffi/build.py
View file
Expand Up @@ -89,6 +89,7 @@ def kwargs (libname):
"libsystemd",
"liblz4",
"libcurl",
"nss",
"libmicrohttpd",
"libczmq"
])
Expand Down
7 changes: 7 additions & 0 deletions builds/msvc/configure.bat
View file
Expand Up @@ -69,6 +69,13 @@ IF EXIST "..\..\..\libcurl" (
ECHO Building without libcurl
ECHO #undef HAVE_LIBCURL>> platform.h
)
IF EXIST "..\..\..\nss" (
ECHO Building with nss
ECHO #define HAVE_NSS 1>> platform.h
) ELSE (
ECHO Building without nss
ECHO #undef HAVE_NSS>> platform.h
)
IF EXIST "..\..\..\libmicrohttpd" (
ECHO Building with libmicrohttpd
ECHO #define HAVE_LIBMICROHTTPD 1>> platform.h
Expand Down
8 changes: 8 additions & 0 deletions builds/msvc/vs2010/build.bat
View file
Expand Up @@ -64,6 +64,14 @@ IF EXIST "..\..\..\..\libcurl\builds/msvc/vs2010\libcurl.import.props" (
) ELSE (
ECHO Building without libcurl
)
IF EXIST "..\..\..\..\nss\builds/msvc/vs2010\nss.import.props" (
COPY /Y "..\..\..\..\nss\builds/msvc/vs2010\nss.import.props" . > %log%
IF errorlevel 1 GOTO error
SET packages=%packages% /p:HAVE_NSS=1
ECHO Building with nss
) ELSE (
ECHO Building without nss
)
IF EXIST "..\..\..\..\libmicrohttpd\builds/msvc/vs2010\libmicrohttpd.import.props" (
COPY /Y "..\..\..\..\libmicrohttpd\builds/msvc/vs2010\libmicrohttpd.import.props" . > %log%
IF errorlevel 1 GOTO error
Expand Down

0 comments on commit d955400

Please sign in to comment.