summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2017-03-30 12:08:47 +0100
committerMichael Meeks <michael.meeks@collabora.com>2017-03-30 12:09:12 +0100
commita4ac00d8546e059a76285d05ca040e9cb92a8fa9 (patch)
tree58cb8193e9579157dd7b06b2fd901d9db40224bf /Makefile.am
parenttdf#106579 - serving gzipped file content (diff)
downloadonline-a4ac00d8546e059a76285d05ca040e9cb92a8fa9.tar.gz
online-a4ac00d8546e059a76285d05ca040e9cb92a8fa9.zip
Add zlib cflags and libs to configuration.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 80aed7c688..a5536b3b9b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,13 +20,13 @@ loolwsdconfig_DATA = loolwsd.xml \
ACLOCAL_AMFLAGS = -I m4
# quick and easy for now.
-include_paths = -I${top_srcdir}/common -I${top_srcdir}/net -I${top_srcdir}/wsd -I${top_srcdir}/kit
+include_paths = -I${top_srcdir}/common -I${top_srcdir}/net -I${top_srcdir}/wsd -I${top_srcdir}/kit ${ZLIB_CFLAGS}
AM_CPPFLAGS = -pthread -DLOOLWSD_DATADIR='"@LOOLWSD_DATADIR@"' \
-DLOOLWSD_CONFIGDIR='"@LOOLWSD_CONFIGDIR@"' \
-DDEBUG_ABSSRCDIR='"@abs_srcdir@"' \
${include_paths}
-AM_LDFLAGS = -pthread -Wl,-E
+AM_LDFLAGS = -pthread -Wl,-E $(ZLIB_LIBS)
loolforkit_LDFLAGS = -pthread -Wl,-E,-rpath,/snap/loolwsd/current/usr/lib
loolforkit_nocaps_LDFLAGS = -pthread -Wl,-E,-rpath,/snap/loolwsd/current/usr/lib
loolmount_LDFLAGS = -pthread -Wl,-E,-rpath,/snap/loolwsd/current/usr/lib