From 72d8e897c6b67e46b2a613c4743ef9c13de25059 Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Thu, 6 Jun 2013 06:44:11 -0700
Subject: Added configure/ifdef guards to only bring in the needed #include if
 glibmm has it.

(bzr r12353)
---
 src/extension/internal/grid.cpp             | 2 ++
 src/extension/internal/pdf-input-cairo.h    | 2 ++
 src/extension/internal/pdfinput/pdf-input.h | 2 ++
 3 files changed, 6 insertions(+)

(limited to 'src/extension/internal')

diff --git a/src/extension/internal/grid.cpp b/src/extension/internal/grid.cpp
index 474f8b08d..812c383b4 100644
--- a/src/extension/internal/grid.cpp
+++ b/src/extension/internal/grid.cpp
@@ -11,7 +11,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
+#endif
 
 #include <gtkmm/box.h>
 #include <gtkmm/adjustment.h>
diff --git a/src/extension/internal/pdf-input-cairo.h b/src/extension/internal/pdf-input-cairo.h
index ee2dc4cee..b65d22f48 100644
--- a/src/extension/internal/pdf-input-cairo.h
+++ b/src/extension/internal/pdf-input-cairo.h
@@ -16,7 +16,9 @@
 # include <config.h>
 #endif
 
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
+#endif
 
 #include <gtkmm/dialog.h>
 #include <gtkmm/button.h>
diff --git a/src/extension/internal/pdfinput/pdf-input.h b/src/extension/internal/pdfinput/pdf-input.h
index 24924adb9..f22a783ff 100644
--- a/src/extension/internal/pdfinput/pdf-input.h
+++ b/src/extension/internal/pdfinput/pdf-input.h
@@ -16,7 +16,9 @@
 
 #ifdef HAVE_POPPLER
 
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
+#endif
 
 #include <gtkmm/dialog.h>
 
-- 
cgit v1.2.3