[Libreoffice-commits] libvisio.git: configure.ac libvisio.pc.in README

David Tardon dtardon at redhat.com
Thu Feb 23 13:32:52 UTC 2017


 README         |    2 +-
 configure.ac   |   12 ------------
 libvisio.pc.in |    2 +-
 3 files changed, 2 insertions(+), 14 deletions(-)

New commits:
commit 8bfb5e3c19ab4e8aea09132881963facb76cfcda
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Feb 23 14:30:15 2017 +0100

    zlib is not needed since the move to librevenge
    
    Change-Id: Ib83663e9cc7a808db966cd8dfb3fbcd1ee195da6

diff --git a/README b/README
index 8ebdf89..e068d79 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 libvisio is a library and a set of tools for reading and converting MS
 Visio diagrams.
 
-libvisio requires boost, gperf, icu, librevenge, libxml2, perl and zlib
+libvisio requires boost, gperf, icu, librevenge, libxml2 and perl
 to build. Most up to date code is available from Git repository at
 libreoffice.org (https://gerrit.libreoffice.org/gitweb?p=libvisio.git)
 or the mirror at freedesktop.org
diff --git a/configure.ac b/configure.ac
index a11115b..2aa8ece 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,18 +76,6 @@ PKG_CHECK_MODULES([ICU],[icu-i18n],[
 AC_SUBST(ICU_CFLAGS)
 AC_SUBST(ICU_LIBS)
 
-# =========
-# Find zlib
-# =========
-PKG_CHECK_MODULES([ZLIB],[zlib],[],[
-    AC_CHECK_HEADER(zlib.h, [ZLIB_CFLAGS=],
-        [AC_MSG_ERROR(zlib.h not found. install zlib)], [])
-    AC_CHECK_LIB(z, inflate, [ ZLIB_LIBS=-lz ],
-        [AC_MSG_ERROR(zlib not found or functional)], [])
-])
-AC_SUBST(ZLIB_CFLAGS)
-AC_SUBST(ZLIB_LIBS)
-
 # ===========================
 # Find required boost headers
 # ===========================
diff --git a/libvisio.pc.in b/libvisio.pc.in
index ce68e6f..638930b 100644
--- a/libvisio.pc.in
+++ b/libvisio.pc.in
@@ -10,4 +10,4 @@ Requires: librevenge-0.0
 Libs: -L${libdir} -lvisio- at VSD_MAJOR_VERSION@. at VSD_MINOR_VERSION@
 Cflags: -I${includedir}/libvisio- at VSD_MAJOR_VERSION@. at VSD_MINOR_VERSION@
 
-Requires.private: icu-i18n libxml-2.0 zlib
+Requires.private: icu-i18n libxml-2.0


More information about the Libreoffice-commits mailing list