From: | "Jory Pratt (anarchy)" <anarchy@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in net-libs/xulrunner/files: mozilla-2.0-gconf-config-update.patch |
Date: | Mon, 04 Apr 2011 02:13:01 |
Message-Id: | 20110404021232.15AC120057@flycatcher.gentoo.org |
1 | anarchy 11/04/04 02:12:32 |
2 | |
3 | Added: mozilla-2.0-gconf-config-update.patch |
4 | Log: |
5 | Fix gconf dep bug #360307 |
6 | |
7 | (Portage version: 2.1.9.45/cvs/Linux x86_64) |
8 | |
9 | Revision Changes Path |
10 | 1.1 net-libs/xulrunner/files/mozilla-2.0-gconf-config-update.patch |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/xulrunner/files/mozilla-2.0-gconf-config-update.patch?rev=1.1&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/xulrunner/files/mozilla-2.0-gconf-config-update.patch?rev=1.1&content-type=text/plain |
14 | |
15 | Index: mozilla-2.0-gconf-config-update.patch |
16 | =================================================================== |
17 | diff --git a/configure.in b/configure.in |
18 | --- a/configure.in |
19 | +++ b/configure.in |
20 | @@ -5701,16 +5701,21 @@ then |
21 | |
22 | AC_SUBST(MOZ_ENABLE_GIO) |
23 | AC_SUBST(MOZ_GIO_CFLAGS) |
24 | AC_SUBST(MOZ_GIO_LIBS) |
25 | |
26 | dnl ======================================================== |
27 | dnl = GConf support module |
28 | dnl ======================================================== |
29 | + MOZ_ARG_DISABLE_BOOL(gconf, |
30 | + [ --disable-gconf Disable Gconf support ], |
31 | + MOZ_ENABLE_GCONF=, |
32 | + MOZ_ENABLE_GCONF=force) |
33 | + |
34 | if test "$MOZ_ENABLE_GCONF" |
35 | then |
36 | PKG_CHECK_MODULES(MOZ_GCONF, gconf-2.0 >= $GCONF_VERSION gobject-2.0 ,[ |
37 | MOZ_GCONF_LIBS=`echo $MOZ_GCONF_LIBS | sed 's/-llinc\>//'` |
38 | MOZ_ENABLE_GCONF=1 |
39 | ],[ |
40 | if test "$MOZ_ENABLE_GCONF" = "force" |
41 | then |