Tune the compilation using flags instead of a config file.

25 files changed, 72 insertions, 85 deletions

diff --git a/plugins/arm/core.c b/plugins/arm/core.c
index c270c85..1c1c6bc 100644
--- a/plugins/arm/core.c
+++ b/plugins/arm/core.c
@@ -24,17 +24,16 @@
 #include "core.h"
 
 
-#include <config.h>
 #include <plugins/self.h>
 
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   include "python/module.h"
 #endif
 #include "v7/core.h"
 
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   define PG_REQ RL("PyChrysalide")
 #else
 #   define PG_REQ NO_REQ
@@ -66,7 +65,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin)
 
     result = init_armv7_core();
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
     if (result)
         result = add_arch_arm_module_to_python_module();
 #endif
diff --git a/plugins/bhash/core.c b/plugins/bhash/core.c
index 91a0bf2..eb05893 100644
--- a/plugins/bhash/core.c
+++ b/plugins/bhash/core.c
@@ -24,16 +24,15 @@
 #include "core.h"
 
 
-#include <config.h>
 #include <plugins/self.h>
 
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   include "python/module.h"
 #endif
 
 
-#ifdef HAVE_PYTHON3_BINDINGS_
+#ifdef INCLUDE_PYTHON3_BINDINGS_
 #   define PG_REQ RL("PyChrysalide")
 #else
 #   define PG_REQ NO_REQ
@@ -63,7 +62,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin)
 {
     bool result;                            /* Bilan à retourner           */
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
     result = add_bhash_module_to_python_module();
 #else
     result = true;
diff --git a/plugins/bootimg/core.c b/plugins/bootimg/core.c
index 9c4bc45..25b21db 100644
--- a/plugins/bootimg/core.c
+++ b/plugins/bootimg/core.c
@@ -24,18 +24,17 @@
 #include "core.h"
 
 
-#include <config.h>
 #include <core/global.h>
 #include <plugins/self.h>
 
 
 #include "format.h"
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   include "python/module.h"
 #endif
 
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   define PG_REQ RL("PyChrysalide")
 #else
 #   define PG_REQ NO_REQ
@@ -65,7 +64,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin)
 {
     bool result;                            /* Bilan à retourner           */
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
     result = add_format_bootimg_module_to_python_module();
 #else
     result = true;
diff --git a/plugins/dalvik/core.c b/plugins/dalvik/core.c
index 2294ed4..8344825 100644
--- a/plugins/dalvik/core.c
+++ b/plugins/dalvik/core.c
@@ -24,7 +24,6 @@
 #include "core.h"
 
 
-#include <config.h>
 #include <plugins/self.h>
 
 
@@ -32,13 +31,13 @@
 #include "operands/args.h"
 #include "operands/pool.h"
 #include "operands/register.h"
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   include "python/module.h"
 #endif
 #include "v35/core.h"
 
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   define PG_REQ RL("PyChrysalide")
 #else
 #   define PG_REQ NO_REQ
@@ -100,7 +99,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin)
 
     result = init_dalvik35_core();
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
     if (result)
         result = add_arch_dalvik_module_to_python_module();
 #endif
diff --git a/plugins/dex/core.c b/plugins/dex/core.c
index 22ebfff..1101a89 100644
--- a/plugins/dex/core.c
+++ b/plugins/dex/core.c
@@ -24,18 +24,17 @@
 #include "core.h"
 
 
-#include <config.h>
 #include <core/global.h>
 #include <plugins/self.h>
 
 
 #include "format.h"
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   include "python/module.h"
 #endif
 
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   define PG_REQ RL("PyChrysalide")
 #else
 #   define PG_REQ NO_REQ
@@ -65,7 +64,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin)
 {
     bool result;                            /* Bilan à retourner           */
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
     result = add_format_dex_module_to_python_module();
 #else
     result = true;
diff --git a/plugins/dexbnf/core.c b/plugins/dexbnf/core.c
index 37e5a15..07e7545 100644
--- a/plugins/dexbnf/core.c
+++ b/plugins/dexbnf/core.c
@@ -24,18 +24,17 @@
 #include "core.h"
 
 
-#include <config.h>
 #include <core/demanglers.h>
 #include <plugins/self.h>
 
 
 #include "demangler.h"
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   include "python/module.h"
 #endif
 
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   define PG_REQ RL("PyChrysalide")
 #else
 #   define PG_REQ NO_REQ
@@ -67,7 +66,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin)
 
     result = register_demangler_type(G_TYPE_DEX_DEMANGLER);
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
     if (result)
         result = add_mangling_dexbnf_module_to_python_module();
 #endif
diff --git a/plugins/dwarf/core.c b/plugins/dwarf/core.c
index bf1e812..7b62fb9 100644
--- a/plugins/dwarf/core.c
+++ b/plugins/dwarf/core.c
@@ -24,14 +24,13 @@
 #include "core.h"
 
 
-#include <config.h>
 #include <plugins/self.h>
 
 
 #include "format.h"
 
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   define PG_REQ RL("PyChrysalide")
 #else
 #   define PG_REQ NO_REQ
diff --git a/plugins/elf/core.c b/plugins/elf/core.c
index 1e98aba..bd829af 100644
--- a/plugins/elf/core.c
+++ b/plugins/elf/core.c
@@ -24,18 +24,17 @@
 #include "core.h"
 
 
-#include <config.h>
 #include <core/global.h>
 #include <plugins/self.h>
 
 
 #include "format.h"
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   include "python/module.h"
 #endif
 
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   define PG_REQ RL("PyChrysalide")
 #else
 #   define PG_REQ NO_REQ
@@ -65,7 +64,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin)
 {
     bool result;                            /* Bilan à retourner           */
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
     result = add_format_elf_module_to_python_module();
 #else
     result = true;
diff --git a/plugins/itanium/core.c b/plugins/itanium/core.c
index dd74f53..3f3feb0 100644
--- a/plugins/itanium/core.c
+++ b/plugins/itanium/core.c
@@ -24,18 +24,17 @@
 #include "core.h"
 
 
-#include <config.h>
 #include <core/demanglers.h>
 #include <plugins/self.h>
 
 
 #include "demangler.h"
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   include "python/module.h"
 #endif
 
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   define PG_REQ RL("PyChrysalide")
 #else
 #   define PG_REQ NO_REQ
@@ -67,7 +66,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin)
 
     result = register_demangler_type(G_TYPE_ITANIUM_DEMANGLER);
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
     if (result)
         result = add_mangling_itanium_module_to_python_module();
 #endif
diff --git a/plugins/javadesc/core.c b/plugins/javadesc/core.c
index e7b4773..420d9f5 100644
--- a/plugins/javadesc/core.c
+++ b/plugins/javadesc/core.c
@@ -24,18 +24,17 @@
 #include "core.h"
 
 
-#include <config.h>
 #include <core/demanglers.h>
 #include <plugins/self.h>
 
 
 #include "demangler.h"
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   include "python/module.h"
 #endif
 
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   define PG_REQ RL("PyChrysalide")
 #else
 #   define PG_REQ NO_REQ
@@ -67,7 +66,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin)
 
     result = register_demangler_type(G_TYPE_JAVA_DEMANGLER);
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
     if (result)
         result = add_mangling_javadesc_module_to_python_module();
 #endif
diff --git a/plugins/kaitai/core.c b/plugins/kaitai/core.c
index c795492..7483fbc 100644
--- a/plugins/kaitai/core.c
+++ b/plugins/kaitai/core.c
@@ -27,12 +27,12 @@
 #include <plugins/self.h>
 
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   include "python/module.h"
 #endif
 
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   define PG_REQ RL("PyChrysalide")
 #else
 #   define PG_REQ NO_REQ
@@ -64,7 +64,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin)
 
     result = true;
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 
     if (result)
         result = add_kaitai_module_to_python_module();
diff --git a/plugins/pe/core.c b/plugins/pe/core.c
index aa51c18..ddbacf5 100644
--- a/plugins/pe/core.c
+++ b/plugins/pe/core.c
@@ -24,18 +24,17 @@
 #include "core.h"
 
 
-#include <config.h>
 #include <core/global.h>
 #include <plugins/self.h>
 
 
 #include "format.h"
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   include "python/module.h"
 #endif
 
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   define PG_REQ RL("PyChrysalide")
 #else
 #   define PG_REQ NO_REQ
@@ -65,7 +64,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin)
 {
     bool result;                            /* Bilan à retourner           */
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
     result = add_format_pe_module_to_python_module();
 #else
     result = true;
diff --git a/plugins/pychrysalide/analysis/loaded.c b/plugins/pychrysalide/analysis/loaded.c
index 6e30ad2..a2bf13f 100644
--- a/plugins/pychrysalide/analysis/loaded.c
+++ b/plugins/pychrysalide/analysis/loaded.c
@@ -66,7 +66,7 @@ static bool py_loaded_content_analyze_wrapper(GLoadedContent *, bool, bool, wgro
 /* Fournit le désignation associée à l'élément chargé. */
 static char *py_loaded_content_describe_wrapper(const GLoadedContent *, bool);
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 /* Détermine le nombre de vues disponibles pour un contenu. */
 static unsigned int py_loaded_content_count_views_wrapper(const GLoadedContent *);
@@ -102,7 +102,7 @@ static PyObject *py_loaded_content_describe(PyObject *, PyObject *);
 /* Etablit une liste d'obscurcissements présents. */
 static PyObject *py_loaded_content_detect_obfuscators(PyObject *, PyObject *);
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 /* Détermine le nombre de vues disponibles pour un contenu. */
 static PyObject *py_loaded_content_count_views(PyObject *, PyObject *);
@@ -242,7 +242,7 @@ static void py_loaded_content_init_gclass(GLoadedContentClass *class, gpointer u
 
     class->describe = py_loaded_content_describe_wrapper;
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
     class->count_views = py_loaded_content_count_views_wrapper;
     class->get_view_name = py_loaded_content_get_view_name_wrapper;
     class->build_def_view = py_loaded_content_build_default_view_wrapper;
@@ -548,7 +548,7 @@ static char *py_loaded_content_describe_wrapper(const GLoadedContent *content, b
 }
 
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 
 /******************************************************************************
@@ -1123,7 +1123,7 @@ static PyObject *py_loaded_content_detect_obfuscators(PyObject *self, PyObject *
 }
 
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 
 /******************************************************************************
@@ -1509,7 +1509,7 @@ PyTypeObject *get_python_loaded_content_type(void)
         LOADED_CONTENT_GET_CONTENT_CLASS_WRAPPER,
         LOADED_CONTENT_ANALYZE_WRAPPER,
         LOADED_CONTENT_DESCRIBE_WRAPPER,
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
         LOADED_CONTENT_COUNT_VIEWS_WRAPPER,
         LOADED_CONTENT_GET_VIEW_NAME_WRAPPER,
         LOADED_CONTENT_BUILD_DEFAULT_VIEW_WRAPPER,
@@ -1520,7 +1520,7 @@ PyTypeObject *get_python_loaded_content_type(void)
         LOADED_CONTENT_ANALYZE_AND_WAIT_METHOD,
         LOADED_CONTENT_DESCRIBE_METHOD,
         LOADED_CONTENT_DETECT_OBFUSCATORS_METHOD,
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
         LOADED_CONTENT_COUNT_VIEWS_METHOD,
         LOADED_CONTENT_GET_VIEW_NAME_METHOD,
         LOADED_CONTENT_BUILD_DEFAULT_VIEW_METHOD,
@@ -1586,7 +1586,7 @@ bool ensure_python_loaded_content_is_registered(void)
 
         dict = PyModule_GetDict(module);
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
         if (!ensure_python_named_widget_is_registered())
             return false;
 #endif
diff --git a/plugins/pychrysalide/arch/operand.c b/plugins/pychrysalide/arch/operand.c
index abd1f06..0aee4f7 100644
--- a/plugins/pychrysalide/arch/operand.c
+++ b/plugins/pychrysalide/arch/operand.c
@@ -60,7 +60,7 @@ static GArchOperand *py_arch_operand_get_inner_operand_from_path_wrapper(const G
 /* Traduit un opérande en version humainement lisible. */
 static void py_arch_operand_print_wrapper(const GArchOperand *, GBufferLine *);
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 /* Construit un petit résumé concis de l'opérande. */
 static char *py_arch_operand_build_tooltip_wrapper(const GArchOperand *, const GLoadedBinary *);
@@ -190,7 +190,7 @@ static void py_arch_operand_init_gclass(GArchOperandClass *class, gpointer unuse
     class->get_inner = py_arch_operand_get_inner_operand_from_path_wrapper;
 
     class->print = py_arch_operand_print_wrapper;
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
     class->build_tooltip = py_arch_operand_build_tooltip_wrapper;
 #endif
 
@@ -462,7 +462,7 @@ static void py_arch_operand_print_wrapper(const GArchOperand *operand, GBufferLi
 }
 
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 
 /******************************************************************************
@@ -721,7 +721,7 @@ PyTypeObject *get_python_arch_operand_type(void)
         ARCH_OPERAND_FIND_INNER_OPERAND_PATH_WRAPPER,
         ARCH_OPERAND_GET_INNER_OPERAND_FROM_PATH_WRAPPER,
         ARCH_OPERAND_PRINT_WRAPPER,
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
         ARCH_OPERAND_BUILD_TOOLTIP_WRAPPER,
 #endif
         ARCH_OPERAND_FIND_INNER_OPERAND_PATH_METHOD,
diff --git a/plugins/pychrysalide/core.c b/plugins/pychrysalide/core.c
index acd8ad6..771d129 100644
--- a/plugins/pychrysalide/core.c
+++ b/plugins/pychrysalide/core.c
@@ -40,7 +40,6 @@
 #include <unistd.h>
 
 
-#include <config.h>
 #include <i18n.h>
 #include <gleak.h>
 #include <common/cpp.h>
@@ -611,7 +610,7 @@ PyMODINIT_FUNC PyInit_pychrysalide(void)
     if (status) status = add_debug_module(result);
     if (status) status = add_format_module(result);
     if (status) status = add_glibext_module(result);
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
     if (status) status = add_gtkext_module(result);
     if (status) status = add_gui_module(result);
 #endif
@@ -628,7 +627,7 @@ PyMODINIT_FUNC PyInit_pychrysalide(void)
     if (status) status = populate_debug_module();
     if (status) status = populate_format_module();
     if (status) status = populate_glibext_module();
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
     if (status) status = populate_gtkext_module();
     if (status) status = populate_gui_module();
 #endif
diff --git a/plugins/pychrysalide/glibext/buffercache.c b/plugins/pychrysalide/glibext/buffercache.c
index 6afaffc..03301d6 100644
--- a/plugins/pychrysalide/glibext/buffercache.c
+++ b/plugins/pychrysalide/glibext/buffercache.c
@@ -88,7 +88,7 @@ static PyObject *py_buffer_cache_get_line_flags(PyObject *, PyObject *);
 /* Retire une propriété particulière attachée à une ligne. */
 static PyObject *py_buffer_cache_remove_line_flag(PyObject *, PyObject *);
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 /* Retrouve une ligne au sein d'un tampon avec un indice. */
 static PyObject *py_buffer_cache_find_line_by_index(PyObject *, PyObject *);
@@ -829,7 +829,7 @@ static PyObject *py_buffer_cache_remove_line_flag(PyObject *self, PyObject *args
 }
 
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 
 /******************************************************************************
@@ -1167,7 +1167,7 @@ PyTypeObject *get_python_buffer_cache_type(void)
         BUFFER_CACHE_ADD_LINE_FLAG_METHOD,
         BUFFER_CACHE_GET_LINE_FLAGS_METHOD,
         BUFFER_CACHE_REMOVE_LINE_FLAG_METHOD,
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
         BUFFER_CACHE_FIND_LINE_BY_INDEX_METHOD,
 #endif
         BUFFER_CACHE_LOOK_FOR_FLAG_METHOD,
diff --git a/plugins/pychrysalide/glibext/constants.c b/plugins/pychrysalide/glibext/constants.c
index 88e0fe9..169ffa2 100644
--- a/plugins/pychrysalide/glibext/constants.c
+++ b/plugins/pychrysalide/glibext/constants.c
@@ -31,7 +31,7 @@
 #include <glibext/configuration.h>
 #include <glibext/linesegment.h>
 #include <glibext/gbinportion.h>
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 #   include <glibext/gloadedpanel.h>
 #endif
 
@@ -516,7 +516,7 @@ int convert_to_rendering_tag_type(PyObject *arg, void *dst)
 }
 
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 
 /******************************************************************************
diff --git a/plugins/pychrysalide/glibext/constants.h b/plugins/pychrysalide/glibext/constants.h
index 7fa9321..4a4f6da 100644
--- a/plugins/pychrysalide/glibext/constants.h
+++ b/plugins/pychrysalide/glibext/constants.h
@@ -58,7 +58,7 @@ bool define_line_segment_constants(PyTypeObject *);
 /* Tente de convertir en constante RenderingTagType. */
 int convert_to_rendering_tag_type(PyObject *, void *);
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 /* Définit les constantes relatives aux panneaux de chargement. */
 bool define_loaded_panel_constants(PyTypeObject *);
diff --git a/plugins/pychrysalide/glibext/module.c b/plugins/pychrysalide/glibext/module.c
index 7fc2c0e..3e4307a 100644
--- a/plugins/pychrysalide/glibext/module.c
+++ b/plugins/pychrysalide/glibext/module.c
@@ -112,7 +112,7 @@ bool populate_glibext_module(void)
     if (result) result = ensure_python_binary_portion_is_registered();
     if (result) result = ensure_python_buffer_cache_is_registered();
     if (result) result = ensure_python_buffer_line_is_registered();
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
     if (result) result = ensure_python_buffer_view_is_registered();
 #endif
     if (result) result = ensure_python_comparable_item_is_registered();
@@ -121,7 +121,7 @@ bool populate_glibext_module(void)
     if (result) result = ensure_python_generic_config_is_registered();
     if (result) result = ensure_python_line_cursor_is_registered();
     if (result) result = ensure_python_line_generator_is_registered();
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
     if (result) result = ensure_python_loaded_panel_is_registered();
     if (result) result = ensure_python_named_widget_is_registered();
 #endif
diff --git a/plugins/pychrysalide/helpers.c b/plugins/pychrysalide/helpers.c
index cee7296..c2b1868 100644
--- a/plugins/pychrysalide/helpers.c
+++ b/plugins/pychrysalide/helpers.c
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 #   include <gtk/gtk.h>
 #endif
 
@@ -1247,7 +1247,7 @@ int convert_to_gobject(PyObject *arg, void *dst)
 }
 
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 
 /******************************************************************************
diff --git a/plugins/pychrysalide/helpers.h b/plugins/pychrysalide/helpers.h
index 962de74..57cf96d 100644
--- a/plugins/pychrysalide/helpers.h
+++ b/plugins/pychrysalide/helpers.h
@@ -29,7 +29,7 @@
 #include <assert.h>
 #include <glib-object.h>
 #include <stdbool.h>
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 #   include <gdk/gdk.h>
 #endif
 
@@ -242,7 +242,7 @@ int convert_to_gtype(PyObject *, void *);
 /* Tente de convertir en instance GObject. */
 int convert_to_gobject(PyObject *, void *);
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 /* Tente de convertir en instance de composant GTK. */
 int convert_to_gtk_widget(PyObject *, void *);
@@ -253,7 +253,7 @@ int convert_to_gtk_container(PyObject *, void *);
 #endif
 
 
-#if !defined(HAVE_GTK_SUPPORT) && !defined(HOMEMADE_RGBA)
+#if !defined(INCLUDE_GTK_SUPPORT) && !defined(HOMEMADE_RGBA)
 
 #   define HOMEMADE_RGBA
 
diff --git a/plugins/pychrysalide/plugins/plugin.c b/plugins/pychrysalide/plugins/plugin.c
index e4eb2c6..2488d21 100644
--- a/plugins/pychrysalide/plugins/plugin.c
+++ b/plugins/pychrysalide/plugins/plugin.c
@@ -74,7 +74,7 @@ static PyObject *py_plugin_module_get_modname_by_default(PyObject *, PyObject *)
 /* Fournit le nom brut associé au greffon. */
 static char *py_plugin_module_get_modname_wrapper(const GPluginModule *);
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 /* Complète une liste de resources pour thème. */
 static void py_plugin_module_include_theme_wrapper(const GPluginModule *, PluginAction, gboolean, char ***, size_t *);
@@ -158,7 +158,7 @@ static void py_plugin_module_init_gclass(GPluginModuleClass *class, gpointer unu
 
     class->get_modname = py_plugin_module_get_modname_wrapper;
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
     class->include_theme = py_plugin_module_include_theme_wrapper;
     class->notify_panel = py_plugin_module_notify_panel_creation_wrapper;
     class->notify_docking = py_plugin_module_notify_panel_docking_wrapper;
@@ -607,7 +607,7 @@ static char *py_plugin_module_get_modname_wrapper(const GPluginModule *plugin)
 }
 
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 
 /******************************************************************************
@@ -1670,7 +1670,7 @@ PyTypeObject *get_python_plugin_module_type(void)
         PLUGIN_MODULE_MANAGE_WRAPPER,
         PLUGIN_MODULE_NOTIFY_PLUGINS_LOADED_WRAPPER,
         PLUGIN_MODULE_GET_MODNAME_WRAPPER,
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
         PLUGIN_MODULE_INCLUDE_THEME_WRAPPER,
         PLUGIN_MODULE_ON_PANEL_CREATION_WRAPPER,
         PLUGIN_MODULE_ON_PANEL_DOCKING_WRAPPER,
diff --git a/plugins/ropgadgets/plugin.c b/plugins/ropgadgets/plugin.c
index 836717c..938a04c 100644
--- a/plugins/ropgadgets/plugin.c
+++ b/plugins/ropgadgets/plugin.c
@@ -24,7 +24,6 @@
 #include "plugin.h"
 
 
-#include <config.h>
 #include <i18n.h>
 
 
@@ -36,7 +35,7 @@
 #include "select.h"
 
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   define PG_REQ RL("PyChrysalide")
 #else
 #   define PG_REQ NO_REQ
diff --git a/plugins/winordinals/core.c b/plugins/winordinals/core.c
index a16c400..bae2d6d 100644
--- a/plugins/winordinals/core.c
+++ b/plugins/winordinals/core.c
@@ -31,12 +31,12 @@
 
 
 #include "assign.h"
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   include "python/module.h"
 #endif
 
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   define PG_REQ RL("PyChrysalide")
 #else
 #   define PG_REQ NO_REQ
@@ -67,7 +67,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin)
 
     result = true;
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 
     if (result)
         result = add_winordinals_module_to_python_module();
diff --git a/plugins/yaml/core.c b/plugins/yaml/core.c
index 7ac49e3..7dc0570 100644
--- a/plugins/yaml/core.c
+++ b/plugins/yaml/core.c
@@ -27,12 +27,12 @@
 #include <plugins/self.h>
 
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   include "python/module.h"
 #endif
 
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   define PG_REQ RL("PyChrysalide")
 #else
 #   define PG_REQ NO_REQ
@@ -63,7 +63,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin)
 
     result = true;
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 
     if (result)
         result = add_yaml_module_to_python_module();