From f0fb69a1720dc6cfdd1157ddf742e327c8601947 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Mon, 11 Jan 2016 14:17:25 +0000
Subject: Bump libgc dependency to 7.2 (see bug #1530286)

(bzr r14570)
---
 configure.ac     | 14 +-------------
 src/inkgc/gc.cpp |  6 ------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/configure.ac b/configure.ac
index 30aed6224..f0caea49f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -709,7 +709,7 @@ PKG_CHECK_MODULES(INKSCAPE_CXX_DEPS,
 		  )
 
 PKG_CHECK_MODULES(INKSCAPE,
-		  bdw-gc      >= 7.1
+		  bdw-gc      >= 7.2
 		  cairo       >= 1.10
 		  glib-2.0    >= 2.28
 		  gsl
@@ -721,18 +721,6 @@ PKG_CHECK_MODULES(INKSCAPE,
 		  pangoft2    >= 1.24
 		  )
 
-dnl See if we are able to use new libgc API. This test should be removed and
-dnl the version number in the INKSCAPE test above should be bumped to >= 7.2
-dnl once all supported platforms have the required library version.
-dnl See bug #1530286.
-PKG_CHECK_MODULES(GC_7_2, bdw-gc >= 7.2, with_gc_7_2=yes, with_gc_7_2=no)
-
-if test "x$with_gc_7_2" = "xyes"; then
-	AC_DEFINE(WITH_GC_7_2, 1, [Build with GC 7.2 or higher])
-else
-	AC_MSG_WARN([Using an old version of libgc. Please consider upgrading to version 7.2 or newer.])
-fi
-
 dnl *********************************
 dnl   Allow experimental GTK+3 build
 dnl *********************************
diff --git a/src/inkgc/gc.cpp b/src/inkgc/gc.cpp
index 9372ac693..ffa94ea2a 100644
--- a/src/inkgc/gc.cpp
+++ b/src/inkgc/gc.cpp
@@ -28,15 +28,9 @@ void display_warning(char *msg, GC_word arg) {
 }
 
 void do_init() {
-#if WITH_GC_7_2
     GC_set_no_dls(1);
     GC_set_all_interior_pointers(1);
     GC_set_finalize_on_demand(0);
-#else
-    GC_no_dls = 1;
-    GC_all_interior_pointers = 1;
-    GC_finalize_on_demand = 0;
-#endif
 
     GC_INIT();
 
-- 
cgit v1.2.3