Use nettle for libjuice only if using GnuTLS

CMakeLists.txt

@@ -7,6 +7,12 @@ project (libdatachannel
 option(USE_GNUTLS "Use GnuTLS instead of OpenSSL" OFF)
 option(USE_JUICE "Use libjuice instead of libnice" OFF)
 
+if(USE_GNUTLS)
+	option(USE_NETTLE "Use Nettle instead of OpenSSL in libjuice" ON)
+else()
+	option(USE_NETTLE "Use Nettle instead of OpenSSL in libjuice" OFF)
+endif()
+
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
 

Jamfile

@@ -59,7 +59,7 @@ actions make_libusrsctp
 make libjuice.a : : @make_libjuice ;
 actions make_libjuice
 {
-	(cd $(CWD)/deps/libjuice && make)
+	(cd $(CWD)/deps/libjuice && make USE_NETTLE=0)
     cp $(CWD)/deps/libjuice/libjuice.a $(<)
 }
 

Makefile

@@ -30,7 +30,9 @@ ifneq ($(USE_JUICE), 0)
         CPPFLAGS+=-DUSE_JUICE=1
         INCLUDES+=-I$(JUICE_DIR)/include
         LOCALLIBS+=libjuice.a
+ifneq ($(USE_GNUTLS), 0)
         LIBS+=nettle
+endif
 else
         CPPFLAGS+=-DUSE_JUICE=0
         LIBS+=glib-2.0 gobject-2.0 nice
@@ -48,7 +50,7 @@ src/%.o: src/%.cpp
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) -MMD -MP -o $@ -c $<
 
 test/%.o: test/%.cpp
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) -MMD -MP -o $@ -c $<
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) -Iinclude -Isrc -MMD -MP -o $@ -c $<
 
 -include $(subst .cpp,.d,$(SRCS))
 
@@ -70,11 +72,13 @@ dist-clean: clean
 	-$(RM) $(NAME).a
 	-$(RM) $(NAME).so
 	-$(RM) libusrsctp.a
+	-$(RM) libjuice.a
 	-$(RM) tests
 	-$(RM) include/*~
 	-$(RM) src/*~
 	-$(RM) test/*~
 	-cd $(USRSCTP_DIR) && make clean
+	-cd $(JUICE_DIR) && make clean
 
 libusrsctp.a:
 	cd $(USRSCTP_DIR) && \
@@ -84,6 +88,10 @@ libusrsctp.a:
 	cp $(USRSCTP_DIR)/usrsctplib/.libs/libusrsctp.a .
 
 libjuice.a:
-	cd $(JUICE_DIR) && make
+ifneq ($(USE_GNUTLS), 0)
+	cd $(JUICE_DIR) && make USE_NETTLE=1
+else
+	cd $(JUICE_DIR) && make USE_NETTLE=0
+endif
 	cp $(JUICE_DIR)/libjuice.a .
 

deps/libjuice

@@ -1 +1 @@
-Subproject commit a592b96eabc9c0e52515fc4a4e6d837e8f2b510b
+Subproject commit 6f55d72b7db9097b5547d484bd7b8494512a0acc