Tune the compilation using flags instead of a config file.

16 files changed, 41 insertions, 43 deletions

diff --git a/src/analysis/binary.c b/src/analysis/binary.c
index 0f0ff93..4309a4d 100644
--- a/src/analysis/binary.c
+++ b/src/analysis/binary.c
@@ -49,7 +49,7 @@
 #include "../core/processors.h"
 #include "../format/known.h"
 #include "../glibext/gbinarycursor.h"
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 #   include "../glibext/gloadedpanel.h"
 #   include "../gtkext/easygtk.h"
 #   include "../gtkext/gtkdisplaypanel.h"
@@ -169,7 +169,7 @@ static void on_binary_processor_changed(GArchProcessor *, GArchInstruction *, gb
 /* Fournit le désignation associée à l'élément chargé. */
 static char *g_loaded_binary_describe(const GLoadedBinary *, bool);
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 /* Détermine le nombre de vues disponibles pour un contenu. */
 static unsigned int g_loaded_binary_count_views(const GLoadedBinary *);
@@ -236,7 +236,7 @@ static void g_loaded_binary_class_init(GLoadedBinaryClass *klass)
 
     loaded->describe = (describe_loaded_fc)g_loaded_binary_describe;
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
     loaded->count_views = (count_loaded_views_fc)g_loaded_binary_count_views;
     loaded->get_view_name = (get_loaded_view_name_fc)g_loaded_binary_get_view_name;
@@ -1475,7 +1475,7 @@ static bool g_loaded_binary_analyze(GLoadedBinary *binary, bool connect, bool ca
     char *desc;                             /* Description humaine associée*/
     bool has_virt;                          /* Présence de virtuel ?       */
     GProcContext *context;                  /* Contexte de suivi dédié     */
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
     GWidthTracker *tracker;                 /* Gestionnaire de largeur     */
 #endif
 
@@ -1523,7 +1523,7 @@ static bool g_loaded_binary_analyze(GLoadedBinary *binary, bool connect, bool ca
     {
         output_disassembly(binary, context, status, &binary->disass_cache);
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
         tracker = g_buffer_cache_get_width_tracker(binary->disass_cache);
 
@@ -1676,7 +1676,7 @@ static char *g_loaded_binary_describe(const GLoadedBinary *binary, bool full)
 }
 
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 
 /******************************************************************************
diff --git a/src/analysis/block-int.h b/src/analysis/block-int.h
index 869042c..80fa6ea 100644
--- a/src/analysis/block-int.h
+++ b/src/analysis/block-int.h
@@ -44,7 +44,7 @@ typedef int (* block_compare_links_fc) (const block_link_t *, const block_link_t
 /* Fournit les détails des origines d'un bloc de code donné. */
 typedef block_link_t * (* block_get_links_fc) (const GCodeBlock *, const GBlockList *, size_t *);
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 /* Fournit la représentation graphique d'un bloc de code. */
 typedef GBufferView * (* block_build_view_fc) (const GCodeBlock *, segcnt_list *);
@@ -68,7 +68,7 @@ struct _GCodeBlock
     size_t index;                           /* Indice dans une liste       */
     size_t rank;                            /* Rang dans l'exécution       */
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
     GBufferView *view;                      /* Représentation construite   */
 #endif
 
@@ -83,7 +83,7 @@ struct _GCodeBlockClass
     block_compare_links_fc cmp_links;       /* Comparaison de liens        */
     block_get_links_fc get_src;             /* Obtention des origines      */
     block_get_links_fc get_dest;            /* Obtention des destinations  */
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
     block_build_view_fc build;              /* Construction d'une vue      */
     block_build_tooltip_fc build_tooltip;   /* Construction d'une bulle    */
 #endif
diff --git a/src/analysis/block.c b/src/analysis/block.c
index a60d7ed..f93a772 100644
--- a/src/analysis/block.c
+++ b/src/analysis/block.c
@@ -139,7 +139,7 @@ static void g_code_block_init(GCodeBlock *block)
     block->index = (size_t)-1;
     block->rank = (size_t)-1;
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
     block->view = NULL;
 #endif
 
@@ -160,7 +160,7 @@ static void g_code_block_init(GCodeBlock *block)
 
 static void g_code_block_dispose(GCodeBlock *block)
 {
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
     g_clear_object(&block->view);
 #endif
 
@@ -326,7 +326,7 @@ void g_code_block_set_rank(GCodeBlock *block, size_t rank)
 }
 
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 
 /******************************************************************************
diff --git a/src/analysis/block.h b/src/analysis/block.h
index 08cfeb4..401b520 100644
--- a/src/analysis/block.h
+++ b/src/analysis/block.h
@@ -33,7 +33,7 @@
 #include "../arch/instruction.h"
 #include "../arch/vmpa.h"
 #include "../common/bits.h"
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 #   include "../glibext/bufferview.h"
 #endif
 #include "../glibext/linesegment.h"
@@ -76,7 +76,7 @@ size_t g_code_block_get_rank(const GCodeBlock *);
 /* Définit le rang du bloc de code dans le flot d'exécution. */
 void g_code_block_set_rank(GCodeBlock *, size_t);
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 /* Fournit la représentation graphique d'un bloc de code. */
 GBufferView *g_code_block_get_view(GCodeBlock *, segcnt_list *);
diff --git a/src/analysis/db/cdb.c b/src/analysis/db/cdb.c
index b1e47bc..1e8bfbb 100644
--- a/src/analysis/db/cdb.c
+++ b/src/analysis/db/cdb.c
@@ -39,7 +39,6 @@
 
 
 #include <i18n.h>
-#include <config.h>
 
 
 #include "backend-int.h"
diff --git a/src/analysis/db/items/move.c b/src/analysis/db/items/move.c
index d009456..e4f503b 100644
--- a/src/analysis/db/items/move.c
+++ b/src/analysis/db/items/move.c
@@ -35,11 +35,11 @@
 
 #include "../collection-int.h"
 #include "../item-int.h"
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 #   include "../../../gui/core/global.h"
 #endif
 #include "../../../glibext/gbinarycursor.h"
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 #   include "../../../glibext/gloadedpanel.h"
 #endif
 
@@ -414,7 +414,7 @@ static char *g_db_move_build_label(GDbMove *move)
 
 static bool g_db_move_run(const GDbMove *move, GLineCursor *cursor)
 {
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
     GLoadedPanel *panel;                    /* Afficheur effectif de code  */
 
diff --git a/src/analysis/disass/block.c b/src/analysis/disass/block.c
index 973fd56..e15b4c1 100644
--- a/src/analysis/disass/block.c
+++ b/src/analysis/disass/block.c
@@ -88,7 +88,7 @@ static block_link_t *g_basic_block_get_sources(const GBasicBlock *, const GBlock
 /* Fournit les détails des destinations de bloc de code. */
 static block_link_t *g_basic_block_get_destinations(const GBasicBlock *, const GBlockList *, size_t *);
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 /* Fournit la représentation graphique d'un bloc de code. */
 static GBufferView *g_basic_block_build_view(const GBasicBlock *, segcnt_list *);
@@ -137,7 +137,7 @@ static void g_basic_block_class_init(GBasicBlockClass *class)
     block->cmp_links = (block_compare_links_fc)g_basic_block_compare_links;
     block->get_src = (block_get_links_fc)g_basic_block_get_sources;
     block->get_dest = (block_get_links_fc)g_basic_block_get_destinations;
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
     block->build = (block_build_view_fc)g_basic_block_build_view;
     block->build_tooltip = (block_build_tooltip_fc)g_basic_block_build_tooltip;
 #endif
@@ -472,7 +472,7 @@ static block_link_t *g_basic_block_get_destinations(const GBasicBlock *block, co
 }
 
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 
 /******************************************************************************
diff --git a/src/analysis/disass/disassembler.c b/src/analysis/disass/disassembler.c
index 7ea127d..4baa810 100644
--- a/src/analysis/disass/disassembler.c
+++ b/src/analysis/disass/disassembler.c
@@ -391,7 +391,7 @@ void output_disassembly(GLoadedBinary *binary, GProcContext *context, GtkStatusS
     GBinContent *content;                   /* Contenu bianire manipulé    */
     GCodingLanguage *lang;                  /* Langage de sortie préféré   */
     int offset;                             /* Décalage des étiquettes     */
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
     GWidthTracker *tracker;                 /* Gestionnaire de largeurs    */
 #endif
     char **text;                            /* Contenu brute à imprimer    */
@@ -411,7 +411,7 @@ void output_disassembly(GLoadedBinary *binary, GProcContext *context, GtkStatusS
 
     g_generic_config_get_value(get_main_configuration(), MPK_LABEL_OFFSET, &offset);
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
     tracker = g_buffer_cache_get_width_tracker(*cache);
     g_width_tracker_set_column_min_width(tracker, DLC_ASSEMBLY_LABEL, offset);
     g_object_unref(G_OBJECT(tracker));
diff --git a/src/analysis/loaded-int.h b/src/analysis/loaded-int.h
index f91e85d..245b5ef 100644
--- a/src/analysis/loaded-int.h
+++ b/src/analysis/loaded-int.h
@@ -48,7 +48,7 @@ typedef bool (* analyze_loaded_fc) (GLoadedContent *, bool, bool, wgroup_id_t, G
 /* Fournit le désignation associée à l'élément chargé. */
 typedef char * (* describe_loaded_fc) (const GLoadedContent *, bool);
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 /* Détermine le nombre de vues disponibles pour un contenu. */
 typedef unsigned int (* count_loaded_views_fc) (const GLoadedContent *);
@@ -95,7 +95,7 @@ struct _GLoadedContentClass
 
     describe_loaded_fc describe;            /* Description de contenu      */
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
     count_loaded_views_fc count_views;      /* Compteur de vues            */
     get_loaded_view_name_fc get_view_name;  /* Désignation d'une vue donnée*/
diff --git a/src/analysis/loaded.c b/src/analysis/loaded.c
index 02caeff..9a7b1fd 100644
--- a/src/analysis/loaded.c
+++ b/src/analysis/loaded.c
@@ -32,7 +32,7 @@
 #include "../core/global.h"
 #include "../core/queue.h"
 #include "../glibext/chrysamarshal.h"
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 #   include "../glibext/gloadedpanel.h"
 #   include "../glibext/named-int.h"
 #endif
@@ -62,7 +62,7 @@ static void g_loaded_content_class_init(GLoadedContentClass *);
 /* Initialise un contenu chargé. */
 static void g_loaded_content_init(GLoadedContent *);
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 /* Procède à l'initialisation de l'interface de composant nommé. */
 static void g_loaded_content_named_init(GNamedWidgetIface *);
@@ -95,7 +95,7 @@ static void on_loaded_content_analysis_completed(GSeqWork *, analysis_data_t *);
 
 
 /* Détermine le type d'une interface pour l'intégration de contenu chargé. */
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 G_DEFINE_TYPE_WITH_CODE(GLoadedContent, g_loaded_content, G_TYPE_OBJECT,
                         G_IMPLEMENT_INTERFACE(G_TYPE_NAMED_WIDGET, g_loaded_content_named_init));
 #else
@@ -153,7 +153,7 @@ static void g_loaded_content_init(GLoadedContent *content)
 }
 
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 
 /******************************************************************************
@@ -593,7 +593,7 @@ char **g_loaded_content_detect_obfuscators(const GLoadedContent *content, bool v
 /* ---------------------------------------------------------------------------------- */
 
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 
 /******************************************************************************
@@ -773,7 +773,7 @@ GDisplayOptions *g_loaded_content_get_display_options(const GLoadedContent *cont
 /* ---------------------------------------------------------------------------------- */
 
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 
 /******************************************************************************
diff --git a/src/analysis/loaded.h b/src/analysis/loaded.h
index 040dacb..0f627b1 100644
--- a/src/analysis/loaded.h
+++ b/src/analysis/loaded.h
@@ -27,7 +27,7 @@
 
 #include <glib-object.h>
 #include <stdbool.h>
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 #   include <gtk/gtk.h>
 #endif
 
@@ -35,7 +35,7 @@
 #include "content.h"
 #include "../common/xml.h"
 #include "../glibext/gdisplayoptions.h"
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 #   include "../gtkext/gtkdockstation.h"
 #endif
 
@@ -91,7 +91,7 @@ char **g_loaded_content_detect_obfuscators(const GLoadedContent *, bool, size_t
 /* --------------------------- GESTION DYNAMIQUE DES VUES --------------------------- */
 
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 /* Détermine le nombre de vues disponibles pour un contenu. */
 unsigned int g_loaded_content_count_views(const GLoadedContent *);
@@ -118,7 +118,7 @@ GDisplayOptions *g_loaded_content_get_display_options(const GLoadedContent *, un
 /* ----------------------- VUES ET BASCULEMENT ENTRE LES VUES ----------------------- */
 
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 /* Fournit la station d'accueil d'un panneau d'affichage. */
 GtkDockStation *get_dock_station_for_view_panel(GtkWidget *);
diff --git a/src/analysis/project.c b/src/analysis/project.c
index c966195..9a5e4e2 100644
--- a/src/analysis/project.c
+++ b/src/analysis/project.c
@@ -1365,7 +1365,7 @@ static void on_new_content_resolved(GContentResolver *resolver, wgroup_id_t wid,
 /* ---------------------------------------------------------------------------------- */
 
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 
 /******************************************************************************
diff --git a/src/analysis/project.h b/src/analysis/project.h
index c058444..a5b1a73 100644
--- a/src/analysis/project.h
+++ b/src/analysis/project.h
@@ -25,7 +25,7 @@
 #define _ANALYSIS_PROJECT_H
 
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 #   include <gtk/gtk.h>
 #endif
 
@@ -117,7 +117,7 @@ GLoadedContent **g_study_project_get_contents(GStudyProject *, size_t *);
 /* ------------------------- GESTION GLOBALISEE DES PROJETS ------------------------- */
 
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 /* Fournit le gestionnaire des projets connus. */
 GtkRecentManager *get_project_manager(void);
diff --git a/src/analysis/routine.c b/src/analysis/routine.c
index de066dc..2cb4ad3 100644
--- a/src/analysis/routine.c
+++ b/src/analysis/routine.c
@@ -1047,7 +1047,7 @@ void g_binary_routine_print_code(const GBinRoutine *routine, GLangOutput *lang,
 
 
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 
 /******************************************************************************
diff --git a/src/analysis/routine.h b/src/analysis/routine.h
index 2e5e22d..ac33fbd 100644
--- a/src/analysis/routine.h
+++ b/src/analysis/routine.h
@@ -133,7 +133,7 @@ char *g_binary_routine_to_string(const GBinRoutine *, bool);
 
 
 
-#ifdef HAVE_GTK_SUPPORT
+#ifdef INCLUDE_GTK_SUPPORT
 
 /* Construit un petit résumé concis de la routine. */
 char *g_binary_routine_build_tooltip(const GBinRoutine *, const GLoadedBinary *);
diff --git a/src/analysis/scan/core.c b/src/analysis/scan/core.c
index d102d58..3d4e529 100644
--- a/src/analysis/scan/core.c
+++ b/src/analysis/scan/core.c
@@ -24,7 +24,6 @@
 #include "core.h"
 
 
-#include <config.h>
 #include <malloc.h>
 #include <string.h>
 
@@ -33,7 +32,7 @@
 #include "items/datasize.h"
 #include "items/uint.h"
 #include "items/console/log.h"
-#ifdef HAVE_MAGIC_SUPPORT
+#ifdef INCLUDE_MAGIC_SUPPORT
 #   include "items/magic/type.h"
 #   include "items/magic/mime-encoding.h"
 #   include "items/magic/mime-type.h"
@@ -266,7 +265,7 @@ bool populate_main_scan_namespace(GScanNamespace *space)
 
     /* Magic */
 
-#ifdef HAVE_MAGIC_SUPPORT
+#ifdef INCLUDE_MAGIC_SUPPORT
     if (result)
     {
         ns = g_scan_namespace_new("magic");