diff options
| author | Tor Lillqvist <tml@collabora.com> | 2019-05-24 12:08:54 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2019-05-24 12:08:54 +0300 |
| commit | 054a9cdb045a84c0d779ad47cbec0b11f28a4f06 (patch) | |
| tree | 4f8573293dfc2c311d53e116f72c0bbb8daee9c0 /test | |
| parent | bd00d9fd0576b8f249d2145d8570bc395d137dc1 (diff) | |
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
Diffstat (limited to 'test')
| -rw-r--r-- | test/.gitignore | 1 | ||||
| -rw-r--r-- | test/Makefile.am | 10 |
2 files changed, 8 insertions, 3 deletions
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 \ |