[gtksourceview/wip/chergert/gsv-gtk4: 87/192] build: drop use of HAVE_CONFIG_H




commit 3b78b30f93bf15477297360e72a4e75799e73d0a
Author: Christian Hergert <chergert redhat com>
Date:   Wed Jan 15 13:55:19 2020 -0800

    build: drop use of HAVE_CONFIG_H
    
    We removed this previously, so now we can drop it from our build flags.

 gtksourceview/completion-providers/words/meson.build | 1 -
 gtksourceview/meson.build                            | 7 +++----
 2 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/gtksourceview/completion-providers/words/meson.build 
b/gtksourceview/completion-providers/words/meson.build
index f67506498..29b4d4495 100644
--- a/gtksourceview/completion-providers/words/meson.build
+++ b/gtksourceview/completion-providers/words/meson.build
@@ -1,5 +1,4 @@
 completionwords_c_args = [
-  '-DHAVE_CONFIG_H',
   '-DGTK_SOURCE_COMPILATION',
   '-DG_LOG_DOMAIN="GtkSourceView"',
 ]
diff --git a/gtksourceview/meson.build b/gtksourceview/meson.build
index 2ead915e7..3ed3d3c51 100644
--- a/gtksourceview/meson.build
+++ b/gtksourceview/meson.build
@@ -104,7 +104,6 @@ core_private_c = files([
 ])
 
 core_c_args = [
-  '-DHAVE_CONFIG_H',
   '-DGTK_SOURCE_COMPILATION',
   '-DG_LOG_DOMAIN="GtkSourceView"',
 ]
@@ -137,15 +136,15 @@ gtksourceview_include_dirs = [rootdir, gtksourceview_extra_include_dirs]
 
 core_enums_header = '''
 
-#if defined (GTK_SOURCE_COMPILATION) && defined (HAVE_CONFIG_H)
-# include <config.h>
+#if defined (GTK_SOURCE_COMPILATION)
+# include "config.h"
 #endif
 
 #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION)
 # error "Only <gtksourceview/gtksource.h> can be included directly."
 #endif
 
-#include "gtksourceversion.h"
+#include <gtksourceview/gtksourceversion.h>
 '''
 
 core_enums = gnome.mkenums_simple('gtksource-enumtypes',


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]