test/Makefile.am | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
New commits: commit 050820f45945bcceaffaa3098236b011fbd98772 Author: Michael Meeks <[email protected]> AuthorDate: Thu Apr 9 14:28:57 2020 +0100 Commit: Tamás Zolnai <[email protected]> CommitDate: Thu Apr 9 18:41:14 2020 +0200 Proof: link SSL libraries for --disable-ssl. Change-Id: I40fa22ba65bb7c838677c00155b51bb1122b6033 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91977 Tested-by: Tamás Zolnai <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Tamás Zolnai <[email protected]> diff --git a/test/Makefile.am b/test/Makefile.am index 0e63ab5ab..ece956950 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -89,18 +89,20 @@ unittest_SOURCES = \ ../wsd/TestStubs.cpp \ test.cpp +unittest_LDADD = $(CPPUNIT_LIBS) +unit_base_la_LIBADD = $(CPPUNIT_LIBS) if ENABLE_SSL unittest_SOURCES += ../net/Ssl.cpp +else +unittest_LDADD += -lssl -lcrypto +unit_base_la_LIBADD += -lssl -lcrypto endif -unittest_LDADD = $(CPPUNIT_LIBS) - fakesockettest_SOURCES = fakesockettest.cpp ../net/FakeSocket.cpp fakesockettest_LDADD = $(CPPUNIT_LIBS) # old-style unit tests - bootstrapped via UnitClient unit_base_la_SOURCES = UnitClient.cpp ${test_base_source} -unit_base_la_LIBADD = $(CPPUNIT_LIBS) unit_tiletest_la_SOURCES = UnitClient.cpp TileCacheTests.cpp unit_tiletest_la_LIBADD = $(CPPUNIT_LIBS) unit_integration_la_SOURCES = UnitClient.cpp integration-http-server.cpp _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
