test/.gitignore | 1 +
test/Makefile.am | 10 +++++++---
2 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 054a9cdb045a84c0d779ad47cbec0b11f28a4f06
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Fri May 24 12:08:54 2019 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Fri May 24 12:08:54 2019 +0300
Fix build issue with --enable-ssl after my previous commit
Don't include the net/Ssl.cpp in the same WsdSources.cpp as the
others, as our CRYPTO_dynlock_value definition is different from
Poco's.
Change-Id: I0fffcec09bcda387e8d7c3ba973a1681b11309fd
diff --git a/test/.gitignore b/test/.gitignore
index 6f63beed2..07be0a923 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -10,3 +10,4 @@ fakesockettest
test
run_unit.sh
WsdSources.cpp
+Ssl.cpp
diff --git a/test/Makefile.am b/test/Makefile.am
index abd331a13..825365f00 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -55,21 +55,25 @@ wsd_sources = \
../common/Unit.cpp \
../net/Socket.cpp
-if ENABLE_SSL
-wsd_sources += ../net/Ssl.cpp
-endif
WsdSources.cpp :
for F in $(wsd_sources); do \
echo '#include "'$$F'"'; \
done >WsdSources.cpp
+Ssl.cpp :
+ echo '#include "../net/Ssl.cpp"' >Ssl.cpp
+
test_base_source = \
TileQueueTests.cpp \
WhiteBoxTests.cpp \
DeltaTests.cpp \
WsdSources.cpp
+if ENABLE_SSL
+test_base_source += Ssl.cpp
+endif
+
test_all_source = \
$(test_base_source) \
TileCacheTests.cpp \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
