[evince] [build] Fix linking with pedantic linkers
- From: Jan-Joost Spanjers <jspanjers src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evince] [build] Fix linking with pedantic linkers
- Date: Mon, 15 Feb 2010 15:38:14 +0000 (UTC)
commit da04a0f2ee32c2559e34dcbd15524e9bb8811d81
Author: Hib Eris <hib hiberis nl>
Date: Mon Feb 15 13:26:17 2010 +0100
[build] Fix linking with pedantic linkers
- Explicitly link to x11 on gnome platform.
- Explicitly link evince (shell) with libm.
- Add explicit -lm flag for libevview and backends, so that we do not
depend on gtk+-2.0's .pc file to pull this flag in.
Fixes bgo#609895.
configure.ac | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5f62335..70fae5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -155,6 +155,8 @@ case "$with_platform" in
# the hicolor-icon-theme does not have a pkgconfig file, on gnome we
# require the gnome icon theme instead.
SHELL_PLATFORM_PKGS="gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED"
+ # The totem-screensaver and egg_smclient code use x11 directly.
+ SHELL_PLATFORM_PKGS="$SHELL_PLATFORM_PKGS x11"
;;
*)
# On all other platforms we issue a warning about the runtime
@@ -345,16 +347,17 @@ AC_SUBST(LIBDOCUMENT_CFLAGS)
AC_SUBST(LIBDOCUMENT_LIBS)
LIBVIEW_CFLAGS="$LIBVIEW_CFLAGS $GTKUNIXPRINT_CFLAGS $DEBUG_FLAGS"
-LIBVIEW_LIBS="$LIBVIEW_LIBS $GTKUNIXPRINT_LIBS"
+LIBVIEW_LIBS="$LIBVIEW_LIBS $GTKUNIXPRINT_LIBS -lm"
AC_SUBST(LIBVIEW_CFLAGS)
AC_SUBST(LIBVIEW_LIBS)
BACKEND_CFLAGS="$BACKEND_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE $DEBUG_FLAGS"
+BACKEND_LIBS="$BACKEND_LIBS -lm"
AC_SUBST(BACKEND_CFLAGS)
AC_SUBST(BACKEND_LIBS)
SHELL_CFLAGS="$SHELL_CORE_CFLAGS $DBUS_CFLAGS $KEYRING_CFLAGS $GCONF_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE $DEBUG_FLAGS"
-SHELL_LIBS="$SHELL_CORE_LIBS $DBUS_LIBS $KEYRING_LIBS $GCONF_LIBS -lz"
+SHELL_LIBS="$SHELL_CORE_LIBS $DBUS_LIBS $KEYRING_LIBS $GCONF_LIBS -lz -lm"
AC_SUBST(SHELL_CFLAGS)
AC_SUBST(SHELL_LIBS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]