diff options
| author | infirit <[email protected]> | 2013-08-10 14:43:17 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-10-11 22:40:45 +0200 |
| commit | 920d4653e728837f01df68f8404cca06e39b0853 (patch) | |
| tree | f2812c72e1eb0a49bd4122b3d29f8a058424d3ce | |
| parent | fda33fbeedc0aab64d9479850047d0817d0b38be (diff) | |
| download | atril-920d4653e728837f01df68f8404cca06e39b0853.tar.bz2 atril-920d4653e728837f01df68f8404cca06e39b0853.tar.xz | |
Add check for zlib and add to linker
Should solve https://bugs.gentoo.org/show_bug.cgi?id=480464 and
https://github.com/Sabayon/mate-overlay/issues/46
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | libdocument/Makefile.am | 3 |
2 files changed, 16 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index d2a4b871..8334be53 100644 --- a/configure.ac +++ b/configure.ac @@ -196,6 +196,20 @@ esac PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS]) +dnl +dnl zlib support +dnl + +PKG_CHECK_MODULES([ZLIB], [zlib], [found_zlib=yes], [found_zlib=no]) +AS_IF([test "x$found_zlib" = "xno"], [ + AC_CHECK_LIB(z, inflate, [AC_CHECK_HEADER(zlib.h, found_zlib=yes)]) + if test "x$found_zlib" = "xno" ; then + AC_MSG_ERROR([*** Working zlib library and headers not found ***]) + fi + ZLIB_LIBS='-lz' + AC_SUBST(ZLIB_LIBS) +]) + # ********* # SM client # ********* diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am index b53fce16..b3ea2c5f 100644 --- a/libdocument/Makefile.am +++ b/libdocument/Makefile.am @@ -115,7 +115,8 @@ libatrildocument_la_LDFLAGS = \ libatrildocument_la_LIBADD = \ $(LIBDOCUMENT_LIBS) \ $(GMODULE_LIBS) \ - $(top_builddir)/cut-n-paste/synctex/libsynctex.la + $(top_builddir)/cut-n-paste/synctex/libsynctex.la \ + $(ZLIB_LIBS) BUILT_SOURCES = \ |