Gentoo Archives: gentoo-commits

From: "Pacho Ramos (pacho)" <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/gthumb/files: gthumb-3.2.0-configure-option.patch
Date: Fri, 29 Mar 2013 10:03:05
Message-Id: 20130329100301.94E642171E@flycatcher.gentoo.org
1 pacho 13/03/29 10:03:01
2
3 Added: gthumb-3.2.0-configure-option.patch
4 Log:
5 Version bump for Gnome 3.8
6
7 (Portage version: 2.1.11.58/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
8
9 Revision Changes Path
10 1.1 media-gfx/gthumb/files/gthumb-3.2.0-configure-option.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gthumb/files/gthumb-3.2.0-configure-option.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gthumb/files/gthumb-3.2.0-configure-option.patch?rev=1.1&content-type=text/plain
14
15 Index: gthumb-3.2.0-configure-option.patch
16 ===================================================================
17 From 3a1128457bd229abf51d48a660abc4b4458b518b Mon Sep 17 00:00:00 2001
18 From: Paolo Bacchilega <paobac@×××××××××.org>
19 Date: Thu, 28 Mar 2013 17:55:21 +0000
20 Subject: configure: fixed unrecognized option --disable-libjson-glib
21
22 [bug #696783]
23 ---
24 diff --git a/configure.ac b/configure.ac
25 index b3e6845..d496b3b 100644
26 --- a/configure.ac
27 +++ b/configure.ac
28 @@ -518,16 +518,16 @@ AC_SUBST(LIBSOUP_LIBS)
29
30 dnl ===========================================================================
31
32 -AC_ARG_ENABLE([json_glib],
33 +AC_ARG_ENABLE([libjson_glib],
34 [AS_HELP_STRING([--disable-libjson-glib],[do not compile code that uses the libjson-glib library])],,
35 - [enable_json_glib=yes])
36 + [enable_libjson_glib=yes])
37
38 -if test x$enable_json_glib = xyes ; then
39 +if test x$enable_libjson_glib = xyes ; then
40 PKG_CHECK_MODULES(JSON_GLIB,
41 [json-glib-1.0 >= $JSON_GLIB_REQUIRED],
42 [AC_DEFINE(HAVE_JSON_GLIB, 1, [Have libjson-glib])
43 - enable_json_glib=yes],
44 - [enable_json_glib=no])
45 + enable_libjson_glib=yes],
46 + [enable_libjson_glib=no])
47 fi
48 AC_SUBST(JSON_GLIB_CFLAGS)
49 AC_SUBST(JSON_GLIB_LIBS)
50 @@ -548,7 +548,7 @@ fi
51 AC_SUBST(WEBKIT2_CFLAGS)
52 AC_SUBST(WEBKIT2_LIBS)
53
54 -if [ test "x$enable_libsoup" = xyes && test "x$enable_json_glib" = xyes && test "x$enable_webkit2" = xyes ] ; then
55 +if [ test "x$enable_libsoup" = xyes && test "x$enable_libjson_glib" = xyes && test "x$enable_webkit2" = xyes ] ; then
56 enable_web_services=yes
57 else
58 enable_web_services=no
59 --
60 cgit v0.9.1