Merge pull request #2652 from nicolasnoble/tests-depend-on-openssl

The code evolved enough so that we now have tests that directly depend on OpenSSL

1 files changed, 6 insertions, 2 deletions

diff --git a/templates/Makefile.template b/templates/Makefile.template
index 1e46db11dc..6530ea5eb2 100644
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@@ -1468,10 +1468,14 @@ endif
     mingw_libs = mingw_libs + ' -l' + dep + '-imp'
     mingw_lib_deps = mingw_lib_deps + ' $(LIBDIR)/$(CONFIG)/' + dep + '.$(SHARED_EXT)'
 
-  if lib.get('secure', 'check') == 'yes':
+  security = lib.get('secure', 'check')
+  if security == 'yes':
     common = common + ' $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE)'
+
+  if security in ['yes', 'check']:
     for src in lib.src:
-      sources_that_need_openssl.add(src)
+      if not proto_re.match(src):
+        sources_that_need_openssl.add(src)
   else:
     for src in lib.src:
       sources_that_don_t_need_openssl.add(src)