[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - Makefile.am

[Henry Castro]

 Makefile.am |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 6f93ec31f318788001cbb12b26e81a3c7ea8efb3
Author: Henry Castro <hcastro at collabora.com>
Date:   Sun Jun 18 14:19:10 2017 -0400

    fix compilation errors with --disable-ssl option
    
    Change-Id: I777f0ebf054db0a5fd2c64e6d56a222826b40045
    (cherry picked from commit c24585741d19a9512cf81a6629e8c410ea35de13)
    Reviewed-on: https://gerrit.libreoffice.org/44715
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    Tested-by: Aron Budea <aron.budea at collabora.com>

diff --git a/Makefile.am b/Makefile.am
index ec73f8f9..7ac3368f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,6 +40,10 @@ AM_LDFLAGS = -pthread -Wl,-E,-rpath,/snap/loolwsd/current/usr/lib $(ZLIB_LIBS)
 
 if ENABLE_SSL
 AM_LDFLAGS += -lssl -lcrypto
+else
+loolwsd_fuzzer_LDADD = -lssl -lcrypto
+loolwsd_LDADD = -lssl -lcrypto
+loolconfig_LDADD = -lssl -lcrypto
 endif
 
 loolwsd_fuzzer_CPPFLAGS = -DKIT_IN_PROCESS=1 -DFUZZER=1 -DTDOC=\"$(abs_top_srcdir)/test/data\" $(AM_CPPFLAGS)