From f7bb362c39fd7d9fcc829e92af2ce31394f8d717 Mon Sep 17 00:00:00 2001
From: Eduard Braun <eduard.braun2@gmx.de>
Date: Mon, 17 Jul 2017 22:10:20 +0200
Subject: Cleanup: eliminate require-config.h

It's widely unused and seems harly necessary.
---
 src/CMakeLists.txt            | 1 -
 src/libnrtype/font-instance.h | 1 -
 src/path-prefix.h             | 4 +++-
 src/require-config.h          | 3 ---
 4 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100644 src/require-config.h

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 66c8b3af6..d1fbc0f78 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -365,7 +365,6 @@ set(inkscape_SRC
   rdf.h
   remove-last.h
   removeoverlap.h
-  require-config.h
   resource-manager.h
   rubberband.h
   satisfied-guide-cns.h
diff --git a/src/libnrtype/font-instance.h b/src/libnrtype/font-instance.h
index 52c921403..ee23ff62d 100644
--- a/src/libnrtype/font-instance.h
+++ b/src/libnrtype/font-instance.h
@@ -4,7 +4,6 @@
 #include <map>
 #include <pango/pango-types.h>
 #include <pango/pango-font.h>
-#include <require-config.h>
 #include "FontFactory.h"
 
 #include <libnrtype/font-style.h>
diff --git a/src/path-prefix.h b/src/path-prefix.h
index 77fd90da5..1c17ce2d8 100644
--- a/src/path-prefix.h
+++ b/src/path-prefix.h
@@ -13,7 +13,9 @@
 #ifndef SEEN_PATH_PREFIX_H
 #define SEEN_PATH_PREFIX_H
 
-#include "require-config.h"  // INKSCAPE_DATADIR
+#ifndef INKSCAPE_DATADIR
+# error "INKSCAPE_DATADIR undefined. Must #include config.h before anything else."
+#endif
 #include "prefix.h"
 
 //#ifdef __cplusplus
diff --git a/src/require-config.h b/src/require-config.h
deleted file mode 100644
index 7c7ef0552..000000000
--- a/src/require-config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef PACKAGE_TARNAME   /* random symbol defined by config.h */
-# error "Must #include config.h (ifdef HAVE_CONFIG_H) before anything else."
-#endif
-- 
cgit v1.2.3