summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-08-20 02:14:53 -0700
committerStefano Karapetsas <[email protected]>2012-08-20 02:14:53 -0700
commit25807110e3f2ba838e2105664922e39a68fc6e30 (patch)
tree8356d559d56d89fc5dd1132be04fa00e649a4fc6
parente4216b1ba5815112de48eb6f9a4bcdafd76d30aa (diff)
parent2ba4ecfb8113e2d22c47d401eef2a231cb1c7648 (diff)
downloadatril-25807110e3f2ba838e2105664922e39a68fc6e30.tar.bz2
atril-25807110e3f2ba838e2105664922e39a68fc6e30.tar.xz
Merge pull request #7 from steev/master
Build fixes for glib 2.32
-rw-r--r--configure.ac2
-rw-r--r--libdocument/Makefile.am1
2 files changed, 3 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 64dd3ad8..ab808986 100644
--- a/configure.ac
+++ b/configure.ac
@@ -163,11 +163,13 @@ dnl Check dependencies
# SHELL_CFLAGS for shell implementation.
# SHELL_LIBS
+AC_SEARCH_LIBS([hypot],[m])
PKG_CHECK_MODULES(LIBDOCUMENT, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED)
PKG_CHECK_MODULES(LIBVIEW, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gail$GAIL_API_VERSION >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
PKG_CHECK_MODULES(BACKEND, cairo >= $CAIRO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED)
PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
+PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
SHELL_PLATFORM_PKGS=
case "$with_platform" in
diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am
index cf8c555e..b53fce16 100644
--- a/libdocument/Makefile.am
+++ b/libdocument/Makefile.am
@@ -114,6 +114,7 @@ libatrildocument_la_LDFLAGS = \
libatrildocument_la_LIBADD = \
$(LIBDOCUMENT_LIBS) \
+ $(GMODULE_LIBS) \
$(top_builddir)/cut-n-paste/synctex/libsynctex.la