|
|
@@ -1,4 +1,4 @@
|
|
|
-From 1c38d570b33f2b036d4fa47e929bb2b3264e38bd Mon Sep 17 00:00:00 2001
|
|
|
+From 4e0ce3f22d45033a108cbacca3e5ec6728bd44f3 Mon Sep 17 00:00:00 2001
|
|
|
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
|
|
Date: Tue, 11 Aug 2015 16:25:38 +0300
|
|
|
Subject: [PATCH] configure: add option to enable/disable use of GTK+
|
|
|
@@ -10,19 +10,16 @@ for forcibly controlling whether GTK+ will be used or not.
|
|
|
Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=712693]
|
|
|
|
|
|
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
|
|
-
|
|
|
-Forward-ported to 2.40.10
|
|
|
-
|
|
|
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
|
|
---
|
|
|
configure.ac | 17 +++++++++++------
|
|
|
1 file changed, 11 insertions(+), 6 deletions(-)
|
|
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
|
-index bf77f3a..ca77de8 100644
|
|
|
+index e61a952..c3aae84 100644
|
|
|
--- a/configure.ac
|
|
|
+++ b/configure.ac
|
|
|
-@@ -128,17 +128,22 @@ AC_CHECK_FUNCS(strtok_r)
|
|
|
+@@ -130,17 +130,22 @@ AC_CHECK_FUNCS(strtok_r)
|
|
|
# GTK
|
|
|
# ===========================================================================
|
|
|
|
|
|
@@ -50,13 +47,13 @@ index bf77f3a..ca77de8 100644
|
|
|
|
|
|
dnl ===========================================================================
|
|
|
dnl GDK-Pixbuf SVG loader
|
|
|
-@@ -289,6 +294,6 @@ librsvg-$VERSION
|
|
|
+@@ -298,6 +303,6 @@ librsvg-$VERSION
|
|
|
Build introspectable bindings: ${found_introspection}
|
|
|
Build Vala bindings: ${enable_vala}
|
|
|
Build GdkPixbuf loader: ${enable_pixbuf_loader}
|
|
|
- GTK+ $GTK3_REQUIRED or later: ${have_gtk_3}
|
|
|
+ GTK+ $GTK3_REQUIRED or later: ${with_gtk_3}
|
|
|
- Build miscellaenous tools: ${build_misc_tools}
|
|
|
+ Build miscellaneous tools: ${build_misc_tools}
|
|
|
"
|
|
|
--
|
|
|
2.1.4
|
Jussi Kukkonen