summaryrefslogtreecommitdiff
blob: 7c1e1b0efb5029dacdca064f4d467f1d41e9897e (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
From 25fca0ba204a99bc4c1c8411067a8b88042d32e1 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Sun, 16 Dec 2012 00:34:18 -0500
Subject: [PATCH] build: Do not add unused gnome dependencies to libgdata.pc

https://bugzilla.gnome.org/show_bug.cgi?id=690281
---
 configure.ac | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 76d4898..b4698c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,17 +91,20 @@ AC_ARG_ENABLE(gnome, AS_HELP_STRING([--enable-gnome], [Whether to enable GNOME s
 AC_MSG_RESULT($enable_gnome)
 AM_CONDITIONAL([ENABLE_GNOME], [test "x$enable_gnome" = "xyes"])
 
-GNOME_PACKAGES_PUBLIC=""
-GNOME_PACKAGES_PRIVATE="libsoup-gnome-2.4 gcr-base-3 libxml-2.0 goa-1.0 >= $GOA_REQS"
-GNOME_PACKAGES="$GNOME_PACKAGES_PUBLIC $GNOME_PACKAGES_PRIVATE"
-AC_SUBST([GNOME_PACKAGES_PUBLIC])
-AC_SUBST([GNOME_PACKAGES_PRIVATE])
-AC_SUBST([GNOME_PACKAGES])
-
 if test "x$enable_gnome" = "xyes"; then
+	GNOME_PACKAGES_PUBLIC=""
+	GNOME_PACKAGES_PRIVATE="libsoup-gnome-2.4 gcr-base-3 libxml-2.0 goa-1.0 >= $GOA_REQS"
+	GNOME_PACKAGES="$GNOME_PACKAGES_PUBLIC $GNOME_PACKAGES_PRIVATE"
 	AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled])
 	PKG_CHECK_MODULES([GNOME], [$GNOME_PACKAGES])
+else
+	GNOME_PACKAGES_PUBLIC=""
+	GNOME_PACKAGES_PRIVATE=""
+	GNOME_PACKAGES=""
 fi
+AC_SUBST([GNOME_PACKAGES_PUBLIC])
+AC_SUBST([GNOME_PACKAGES_PRIVATE])
+AC_SUBST([GNOME_PACKAGES])
 
 # Various necessary functions and headers
 AC_CHECK_FUNCS([strchr])
-- 
1.8.0.2