summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-09-05 02:08:21 -0700
committerStefano Karapetsas <[email protected]>2013-09-05 02:08:21 -0700
commit64c72e1aba8fc32b8ecfda563e83f5a41a7d27c4 (patch)
tree986645110346f40ecd429e59565bb7f709930e1d
parent05dcc3342e422a06cabe469ddde878e726c483a3 (diff)
parenta8b9cc1a18765d7ebca5c963410edf0e2eff5399 (diff)
downloadatril-64c72e1aba8fc32b8ecfda563e83f5a41a7d27c4.tar.bz2
atril-64c72e1aba8fc32b8ecfda563e83f5a41a7d27c4.tar.xz
Merge pull request #32 from infirit/master
Add check for zlib and add to linker
-rw-r--r--configure.ac14
-rw-r--r--libdocument/Makefile.am3
2 files changed, 16 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 7250149a..0e7ae4f0 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 = \