blob: 6f6141919bb8878e52c4beb04008230a7e6f1a61 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
From d9020e1eb228e780fc0bbc316a6741ed5b6cb3c5 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Thu, 1 Sep 2011 00:23:04 +0300
Subject: [PATCH] Explicitly link against libm
gdk-pixbuf used to include libm in its pkgconfig libs line, but that was
recently changed.
---
configure.in | 3 +++
geyes/Makefile.am | 3 ++-
multiload/Makefile.am | 3 ++-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/configure.in b/configure.in
index 118e34b..a089ac8 100644
--- a/configure.in
+++ b/configure.in
@@ -51,6 +51,9 @@ AM_CHECK_PYTHON_HEADERS(HAVE_PYHDRS="yes", HAVE_PYHDRS="no")
X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
AC_SUBST(X_LIBS)
+AC_CHECK_LIBM
+AC_SUBST(LIBM)
+
GNOME_COMPILE_WARNINGS
dnl Check for non-portable headers
diff --git a/geyes/Makefile.am b/geyes/Makefile.am
index 935d932..46abd31 100644
--- a/geyes/Makefile.am
+++ b/geyes/Makefile.am
@@ -16,7 +16,8 @@ geyes_applet2_SOURCES = \
geyes.h
geyes_applet2_LDADD = \
- $(GNOME_APPLETS_LIBS)
+ $(GNOME_APPLETS_LIBS) \
+ $(LIBM)
appletdir = $(datadir)/gnome-panel/4.0/applets
applet_in_files = org.gnome.applets.GeyesApplet.panel-applet.in
diff --git a/multiload/Makefile.am b/multiload/Makefile.am
index a659f07..94da298 100644
--- a/multiload/Makefile.am
+++ b/multiload/Makefile.am
@@ -24,7 +24,8 @@ multiload_applet_2_SOURCES = \
multiload_applet_2_LDADD = \
$(GNOME_APPLETS_LIBS) \
$(GTOP_APPLETS_LIBS) \
- $(GIO_UNIX_LIBS)
+ $(GIO_UNIX_LIBS) \
+ $(LIBM)
schemasdir = @GCONF_SCHEMA_FILE_DIR@
schemas_in_files = multiload.schemas.in
--
1.7.6.1
|
