Kaydet (Commit) 1a142e8b authored tarafından Fridrich Štrba's avatar Fridrich Štrba

Make libvisio build pick the right zlib headers

Change-Id: I159cd926e5b373ca7bbecea87a4798b08b89b7ef
üst e06c6c4c
...@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,visio)) ...@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,visio))
$(eval $(call gb_UnpackedTarball_set_tarball,visio,$(VISIO_TARBALL))) $(eval $(call gb_UnpackedTarball_set_tarball,visio,$(VISIO_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,visio,1))
$(eval $(call gb_UnpackedTarball_add_patches,visio,\
libvisio/libvisio-0.0.20-zlib.patch \
))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
--- libvisio-0.0.20/configure
+++ libvisio-0.0.20/configure
@@ -17165,8 +17165,8 @@
fi
fi
-LIBVISIO_CXXFLAGS="${WPD_CFLAGS} ${WPG_CFLAGS} ${LIBXML_CFLAGS}"
-LIBVISIO_LIBS="${WPD_LIBS} ${WPG_LIBS} ${LIBXML_LIBS}"
+LIBVISIO_CXXFLAGS="${WPD_CFLAGS} ${WPG_CFLAGS} ${LIBXML_CFLAGS} ${ZLIB_CFLAGS}"
+LIBVISIO_LIBS="${WPD_LIBS} ${WPG_LIBS} ${LIBXML_LIBS} ${ZLIB_LIBS}"
--- libvisio-0.0.20/Makefile.in
+++ libvisio-0.0.20/Makefile.in
@@ -55,8 +55,8 @@
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/libvisio-0.0.pc.in $(srcdir)/libvisio-zip.in \
$(srcdir)/libvisio.spec.in $(top_srcdir)/configure AUTHORS \
- NEWS ar-lib config.guess config.sub install-sh ltmain.sh \
- missing
+ NEWS ar-lib config.guess config.sub depcomp install-sh \
+ ltmain.sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment