Remove duplicated build checks.

Most of these #defines are not even checked anyway, though they could
have the side-effect of failing configure before the build started.
However, these checks are redundant due to other checks for the same
thing:

* concept_check.hpp was added to Boost in 1.19.0, released in 2000. I
  sincerely doubt anyone is using that version right now, but I added a
  minimum version to the find_package() call. In any case, no code
  actually checked the #define, so it wouldn't have built without it
  anyway.
* FindBoehmGC puts gc.h on the compiler search path, so there's no need
  to try gc/gc.h also.
* libintl.h is found by FindIntl.
* unordered_set is part of the C++11 standard.
* zlib.h is found by find_package(ZLIB).

6 files changed, 1 insertions, 34 deletions

diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake
index 8d35071f3..dd90eab65 100644
--- a/CMakeScripts/ConfigChecks.cmake
+++ b/CMakeScripts/ConfigChecks.cmake
@@ -13,18 +13,14 @@ include(CheckStructHasMember)
 set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${INKSCAPE_LIBS})
 set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${INKSCAPE_INCS_SYS})
 
-CHECK_INCLUDE_FILE_CXX(boost/concept_check.hpp HAVE_BOOST_CONCEPT_CHECK_HPP)
 CHECK_INCLUDE_FILES(cairo-pdf.h HAVE_CAIRO_PDF)
 CHECK_FUNCTION_EXISTS(floor HAVE_FLOOR)
 CHECK_FUNCTION_EXISTS(fpsetmask HAVE_FPSETMASK)
-CHECK_INCLUDE_FILES(gc/gc.h HAVE_GC_GC_H)
-CHECK_INCLUDE_FILES(gc.h HAVE_GC_H)
 CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY)
 CHECK_INCLUDE_FILES(ieeefp.h HAVE_IEEEFP_H)
 CHECK_INCLUDE_FILES(inttypes.h HAVE_INTTYPES_H)
 CHECK_INCLUDE_FILES(locale.h HAVE_LC_MESSAGES)
 CHECK_INCLUDE_FILES(locale.h HAVE_LOCALE_H)
-CHECK_INCLUDE_FILES(libintl.h HAVE_LIBINTL_H)
 CHECK_INCLUDE_FILES(fcntl.h HAVE_FCNTL_H)
 CHECK_FUNCTION_EXISTS(mallinfo HAVE_MALLINFO)
 CHECK_INCLUDE_FILES(malloc.h HAVE_MALLOC_H)
@@ -53,9 +49,6 @@ CHECK_INCLUDE_FILES(sys/stat.h HAVE_SYS_STAT_H)
 CHECK_INCLUDE_FILES(sys/time.h HAVE_SYS_TIME_H)
 CHECK_INCLUDE_FILES(sys/types.h HAVE_SYS_TYPES_H)
 CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H)
-CHECK_INCLUDE_FILES(zlib.h HAVE_ZLIB_H)
-
-CHECK_INCLUDE_FILE_CXX(unordered_set HAVE_NATIVE_UNORDERED_SET)
 
 # Enable pango defines, necessary for compilation on Win32, how about Linux?
 # yes but needs to be done a better way
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 8cc0f0cd9..cfa5792aa 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -303,7 +303,7 @@ find_package(Freetype REQUIRED)
 list(APPEND INKSCAPE_INCS_SYS ${FREETYPE_INCLUDE_DIRS})
 list(APPEND INKSCAPE_LIBS ${FREETYPE_LIBRARIES})
 
-find_package(Boost REQUIRED)
+find_package(Boost 1.19.0 REQUIRED)
 list(APPEND INKSCAPE_INCS_SYS ${Boost_INCLUDE_DIRS})
 # list(APPEND INKSCAPE_LIBS ${Boost_LIBRARIES})
 
diff --git a/config.h.cmake b/config.h.cmake
index e73553bba..5d5d27c93 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -33,9 +33,6 @@
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #cmakedefine HAVE_BIND_TEXTDOMAIN_CODESET 1
 
-/* Define to 1 if you have the <concept_check.hpp> header file. */
-#cmakedefine HAVE_BOOST_CONCEPT_CHECK_HPP 1
-
 /* Whether the Cairo PDF backend is available */
 #cmakedefine HAVE_CAIRO_PDF 1
 #cmakedefine PANGO_ENABLE_ENGINE 1
@@ -59,12 +56,6 @@
 /* Define to 1 if you have the `fpsetmask' function. */
 #cmakedefine HAVE_FPSETMASK 1
 
-/* Define to 1 if you have the <gc/gc.h> header file. */
-#cmakedefine HAVE_GC_GC_H 1
-
-/* Define to 1 if you have the <gc.h> header file. */
-#cmakedefine HAVE_GC_H 1
-
 #cmakedefine HAVE_GETOPT_H 1
 
 /* Define if the GNU gettext() function is already present or preinstalled. */
@@ -94,9 +85,6 @@
 /* Define if your <locale.h> file defines LC_MESSAGES. */
 #cmakedefine HAVE_LC_MESSAGES 1
 
-/* Define to 1 if you have the <libintl.h> header file. */
-#cmakedefine HAVE_LIBINTL_H 1
-
 /* Define to 1 if you have the `m' library (-lm). */
 #cmakedefine HAVE_LIBM 1
 
@@ -212,12 +200,6 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #cmakedefine HAVE_UNISTD_H 1
 
-/* Define to 1 if you have the <unordered_set> header file. */
-#cmakedefine HAVE_NATIVE_UNORDERED_SET 1
-
-/* Define to 1 if you have the <zlib.h> header file. */
-#cmakedefine HAVE_ZLIB_H 1
-
 /* Base data directory -- only path-prefix.h should use it! */
 #define INKSCAPE_DATADIR "${INKSCAPE_DATADIR}"
 
diff --git a/src/inkgc/gc-core.h b/src/inkgc/gc-core.h
index a27510f50..407c857fb 100644
--- a/src/inkgc/gc-core.h
+++ b/src/inkgc/gc-core.h
@@ -19,11 +19,7 @@
 #include <new>
 #include <cstdlib>
 
-#ifdef HAVE_GC_GC_H
-# include <gc/gc.h>
-#else
 # include <gc.h>
-#endif
 
 namespace Inkscape {
 namespace GC {
diff --git a/src/util/ege-tags.cpp b/src/util/ege-tags.cpp
index 8a2ce0529..dcc28f370 100644
--- a/src/util/ege-tags.cpp
+++ b/src/util/ege-tags.cpp
@@ -38,9 +38,7 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
-#if HAVE_LIBINTL_H
 #include <libintl.h>
-#endif // HAVE_LIBINTL_H
 
 #if !defined(_)
 #define _(s) gettext(s)
diff --git a/src/widgets/ege-paint-def.cpp b/src/widgets/ege-paint-def.cpp
index 1a8ad041a..8e0ec9352 100644
--- a/src/widgets/ege-paint-def.cpp
+++ b/src/widgets/ege-paint-def.cpp
@@ -36,9 +36,7 @@
 
 #include "config.h"
 
-#ifdef HAVE_LIBINTL_H
 #include <libintl.h>
-#endif
 
 #include <stdint.h>
 #include <string>