Package: gnome-vfs / 1:2.24.4-6

31_link_tests_and_programs_against_required_libs.patch Patch series | download
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
From 04cdfe8095fd76ec48586030c83bcef9db1dfb1a Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Wed, 16 Mar 2011 12:16:51 +0100
Subject: [PATCH] Link test/ and programs/ against all required libs

Required by GCC 4.5.
---
 configure.in         |    6 +++++-
 programs/Makefile.am |    4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index c997af8..9e1cc4b 100644
--- a/configure.in
+++ b/configure.in
@@ -111,10 +111,14 @@ PKG_CHECK_MODULES(MODULES_XML_GCONF, glib-2.0 >= $GLIB_REQUIRED gmodule-no-expor
 AC_SUBST(MODULES_XML_GCONF_CFLAGS)
 AC_SUBST(MODULES_XML_GCONF_LIBS)
 
-PKG_CHECK_MODULES(TEST, gconf-2.0 >= $GCONF_REQUIRED gthread-2.0 >= $GLIB_REQUIRED)
+PKG_CHECK_MODULES(TEST, gconf-2.0 >= $GCONF_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED)
 AC_SUBST(TEST_LIBS)
 AC_SUBST(TEST_CFLAGS)
 
+PKG_CHECK_MODULES(PROGRAMS, gobject-2.0 >= $GLIB_REQUIRED)
+AC_SUBST(PROGRAMS_LIBS)
+AC_SUBST(PROGRAMS_CFLAGS)
+
 cflags_set=yes
 GNOME_COMPILE_WARNINGS
 VFS_CFLAGS="$warnCFLAGS $complCFLAGS"
diff --git a/programs/Makefile.am b/programs/Makefile.am
index ee4d2f8..27ee15b 100644
--- a/programs/Makefile.am
+++ b/programs/Makefile.am
@@ -3,13 +3,13 @@ NULL =
 INCLUDES =					\
 	-I$(top_srcdir)				\
 	-I$(top_builddir)			\
-	$(TEST_CFLAGS)				\
+	$(PROGRAMS_CFLAGS)			\
 	$(VFS_CFLAGS)				\
 	-DG_DISABLE_DEPRECATED
 
 libraries =						\
 	$(top_builddir)/libgnomevfs/libgnomevfs-2.la	\
-	$(TEST_LIBS)					\
+	$(PROGRAMS_LIBS)				\
 	$(LIBEFS_LIBS)
 
 bin_PROGRAMS =						\
-- 
1.7.4.1