Get rid of HAVE_CONFIG_H

It's specific to Autotools.
2024-06-28 14:04:26 +00:00 · 2019-12-05 14:13:31 +01:00 · 2019-12-05 14:13:31 +01:00 · cf472fd724
commit cf472fd724
parent 83e3de9c71
30 changed files with 24 additions and 114 deletions
--- a/gedit/meson.build
+++ b/gedit/meson.build
@ -106,12 +106,8 @@ libgedit_sources = files(
  'gedit-window.c',
 )

-libgedit_c_args = [
-  '-DHAVE_CONFIG_H',
-]
-
-libgedit_link_args = [
-]
+libgedit_c_args = []
+libgedit_link_args = []

 libgedit_deps = [
  glib_dep,
@ -291,9 +287,7 @@ gedit_sources = [
  'gedit.c',
 ]

-gedit_c_args = [
-  '-DHAVE_CONFIG_H',
-]
+gedit_c_args = []

 if windowing_target == 'quartz'
  gedit_c_args += [
--- a/plugins/checkupdate/gedit-check-update-plugin.c
+++ b/plugins/checkupdate/gedit-check-update-plugin.c
@ -15,9 +15,7 @@
 * along with this program; if not, see <http://www.gnu.org/licenses/>.
 */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"

 #include "gedit-check-update-plugin.h"

--- a/plugins/checkupdate/meson.build
+++ b/plugins/checkupdate/meson.build
@ -7,16 +7,11 @@ libcheckupdate_deps = [
  libsoup_dep,
 ]

-libcheckupdate_c_args = [
-  '-DHAVE_CONFIG_H',
-]
-
 libcheckupdate_sha = shared_module(
  'checkupdate',
  sources: libcheckupdate_sources,
  include_directories: root_include_dir,
  dependencies: libcheckupdate_deps,
-  c_args: libcheckupdate_c_args,
  install: true,
  install_dir: join_paths(
    pkglibdir,
--- a/plugins/docinfo/gedit-docinfo-plugin.c
+++ b/plugins/docinfo/gedit-docinfo-plugin.c
@ -18,9 +18,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"

 #include "gedit-docinfo-plugin.h"

--- a/plugins/docinfo/meson.build
+++ b/plugins/docinfo/meson.build
@ -6,10 +6,6 @@ libdocinfo_deps = [
  libgedit_dep,
 ]

-libdocinfo_c_args = [
-  '-DHAVE_CONFIG_H',
-]
-
 subdir('resources')

 libdocinfo_sha = shared_module(
@ -17,7 +13,6 @@ libdocinfo_sha = shared_module(
  sources: libdocinfo_sources,
  include_directories: root_include_dir,
  dependencies: libdocinfo_deps,
-  c_args: libdocinfo_c_args,
  install: true,
  install_dir: join_paths(
    pkglibdir,
--- a/plugins/filebrowser/gedit-file-browser-plugin.c
+++ b/plugins/filebrowser/gedit-file-browser-plugin.c
@ -18,9 +18,7 @@
 * along with this program; if not, see <http://www.gnu.org/licenses/>.
 */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"

 #include <string.h>
 #include <glib/gi18n-lib.h>
--- a/plugins/filebrowser/gedit-file-browser-store.c
+++ b/plugins/filebrowser/gedit-file-browser-store.c
@ -18,9 +18,7 @@
 * along with this program; if not, see <http://www.gnu.org/licenses/>.
 */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"

 #include <string.h>
 #include <glib/gi18n-lib.h>
--- a/plugins/filebrowser/gedit-file-browser-utils.c
+++ b/plugins/filebrowser/gedit-file-browser-utils.c
@ -18,9 +18,7 @@
 * along with this program; if not, see <http://www.gnu.org/licenses/>.
 */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"

 #include <glib/gi18n-lib.h>
 #include <gedit/gedit-utils.h>
--- a/plugins/filebrowser/gedit-file-browser-widget.c
+++ b/plugins/filebrowser/gedit-file-browser-widget.c
@ -18,9 +18,7 @@
 * along with this program; if not, see <http://www.gnu.org/licenses/>.
 */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/plugins/filebrowser/meson.build
+++ b/plugins/filebrowser/meson.build
@ -23,10 +23,6 @@ libfilebrowser_deps = [
  libgedit_dep,
 ]

-libfilebrowser_c_args = [
-  '-DHAVE_CONFIG_H',
-]
-
 subdir('messages')

 libfilebrowser_register_enums = gnome.mkenums(
@ -69,7 +65,6 @@ libfilebrowser_sha = shared_module(
  sources: libfilebrowser_sources,
  include_directories: root_include_dir,
  dependencies: libfilebrowser_deps,
-  c_args: libfilebrowser_c_args,
  install: true,
  install_dir: join_paths(
    pkglibdir,
--- a/plugins/filebrowser/messages/gedit-file-browser-message-activation.c
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-activation.c
@ -21,9 +21,7 @@
 * Boston, MA  02110-1301  USA
 */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"

 #include "gedit-file-browser-message-activation.h"

--- a/plugins/filebrowser/messages/gedit-file-browser-message-add-filter.c
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-add-filter.c
@ -21,9 +21,7 @@
 * Boston, MA  02110-1301  USA
 */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"

 #include "gedit-file-browser-message-add-filter.h"

--- a/plugins/filebrowser/messages/gedit-file-browser-message-extend-context-menu.c
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-extend-context-menu.c
@ -22,9 +22,7 @@
 * Boston, MA  02110-1301  USA
 */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"

 #include "gedit-file-browser-message-extend-context-menu.h"
 #include <gedit/gedit-menu-extension.h>
--- a/plugins/filebrowser/messages/gedit-file-browser-message-get-root.c
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-get-root.c
@ -21,9 +21,7 @@
 * Boston, MA  02110-1301  USA
 */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"

 #include "gedit-file-browser-message-get-root.h"
 #include "gio/gio.h"
--- a/plugins/filebrowser/messages/gedit-file-browser-message-get-view.c
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-get-view.c
@ -21,9 +21,7 @@
 * Boston, MA  02110-1301  USA
 */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"

 #include "gedit-file-browser-message-get-view.h"
 #include "plugins/filebrowser/gedit-file-browser-view.h"
--- a/plugins/filebrowser/messages/gedit-file-browser-message-id-location.c
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-id-location.c
@ -22,9 +22,7 @@
 * Boston, MA  02110-1301  USA
 */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"

 #include "gedit-file-browser-message-id-location.h"
 #include "gio/gio.h"
--- a/plugins/filebrowser/messages/gedit-file-browser-message-id.c
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-id.c
@ -21,9 +21,7 @@
 * Boston, MA  02110-1301  USA
 */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"

 #include "gedit-file-browser-message-id.h"

--- a/plugins/filebrowser/messages/gedit-file-browser-message-set-emblem.c
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-set-emblem.c
@ -21,9 +21,7 @@
 * Boston, MA  02110-1301  USA
 */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"

 #include "gedit-file-browser-message-set-emblem.h"

--- a/plugins/filebrowser/messages/gedit-file-browser-message-set-markup.c
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-set-markup.c
@ -22,9 +22,7 @@
 * Boston, MA  02110-1301  USA
 */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"

 #include "gedit-file-browser-message-set-markup.h"

--- a/plugins/filebrowser/messages/gedit-file-browser-message-set-root.c
+++ b/plugins/filebrowser/messages/gedit-file-browser-message-set-root.c
@ -21,9 +21,7 @@
 * Boston, MA  02110-1301  USA
 */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"

 #include "gedit-file-browser-message-set-root.h"
 #include "gio/gio.h"
--- a/plugins/modelines/gedit-modeline-plugin.c
+++ b/plugins/modelines/gedit-modeline-plugin.c
@ -18,9 +18,7 @@
 * along with this program; if not, see <http://www.gnu.org/licenses/>.
 */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"

 #include <glib/gi18n-lib.h>
 #include <gmodule.h>
--- a/plugins/modelines/meson.build
+++ b/plugins/modelines/meson.build
@ -7,16 +7,11 @@ libmodelines_deps = [
  libgedit_dep,
 ]

-libmodelines_c_args = [
-  '-DHAVE_CONFIG_H',
-]
-
 libmodelines_sha = shared_module(
  'modelines',
  sources: libmodelines_sources,
  include_directories: root_include_dir,
  dependencies: libmodelines_deps,
-  c_args: libmodelines_c_args,
  install: true,
  install_dir: join_paths(
    pkglibdir,
--- a/plugins/quickhighlight/gedit-quick-highlight-plugin.c
+++ b/plugins/quickhighlight/gedit-quick-highlight-plugin.c
@ -18,9 +18,7 @@
 *
 */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"

 #include <glib/gi18n.h>

--- a/plugins/quickhighlight/meson.build
+++ b/plugins/quickhighlight/meson.build
@ -6,16 +6,11 @@ libquickhighlight_deps = [
  libgedit_dep,
 ]

-libquickhighlight_c_args = [
-  '-DHAVE_CONFIG_H',
-]
-
 libquickhighlight_sha = shared_module(
  'quickhighlight',
  sources: libquickhighlight_sources,
  include_directories: root_include_dir,
  dependencies: libquickhighlight_deps,
-  c_args: libquickhighlight_c_args,
  install: true,
  install_dir: join_paths(
    pkglibdir,
--- a/plugins/sort/gedit-sort-plugin.c
+++ b/plugins/sort/gedit-sort-plugin.c
@ -18,9 +18,7 @@
 * along with this program; if not, see <http://www.gnu.org/licenses/>.
 */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"

 #include "gedit-sort-plugin.h"

--- a/plugins/sort/meson.build
+++ b/plugins/sort/meson.build
@ -6,10 +6,6 @@ libsort_deps = [
  libgedit_dep,
 ]

-libsort_c_args = [
-  '-DHAVE_CONFIG_H',
-]
-
 subdir('resources')

 libsort_sha = shared_module(
@ -17,7 +13,6 @@ libsort_sha = shared_module(
  sources: libsort_sources,
  include_directories: root_include_dir,
  dependencies: libsort_deps,
-  c_args: libsort_c_args,
  install: true,
  install_dir: join_paths(
    pkglibdir,
--- a/plugins/spell/meson.build
+++ b/plugins/spell/meson.build
@ -8,10 +8,6 @@ libspell_deps = [
  gspell_dep,
 ]

-libspell_c_args = [
-  '-DHAVE_CONFIG_H',
-]
-
 subdir('resources')

 libspell_sha = shared_module(
@ -19,7 +15,6 @@ libspell_sha = shared_module(
  sources: libspell_sources,
  include_directories: root_include_dir,
  dependencies: libspell_deps,
-  c_args: libspell_c_args,
  install: true,
  install_dir: join_paths(
    pkglibdir,
--- a/plugins/time/gedit-time-plugin.c
+++ b/plugins/time/gedit-time-plugin.c
@ -17,9 +17,7 @@
 * along with this program; if not, see <http://www.gnu.org/licenses/>.
 */

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"

 #include <string.h>
 #include <glib/gi18n-lib.h>
--- a/plugins/time/meson.build
+++ b/plugins/time/meson.build
@ -6,10 +6,6 @@ libtime_deps = [
  libgedit_dep,
 ]

-libtime_c_args = [
-  '-DHAVE_CONFIG_H',
-]
-
 gnome.mkenums(
  'org.gnome.gedit.plugins.time.enums.xml',
  sources: libtime_sources,
@ -33,7 +29,6 @@ libtime_sha = shared_module(
  sources: libtime_sources,
  include_directories: root_include_dir,
  dependencies: libtime_deps,
-  c_args: libtime_c_args,
  install: true,
  install_dir: join_paths(
    pkglibdir,
--- a/tools/generate-message.py
+++ b/tools/generate-message.py
@ -585,11 +585,7 @@ class Message:
        elif options.lgpl:
            self._write_lgpl(options, fname)

-        self._write("#ifdef HAVE_CONFIG_H")
-        self._write("#include <config.h>")
-        self._write("#endif")
-        self._write()
-
+        self._write('#include "config.h"')
        self._write('#include "%s.h"', self.filename)

        for inc in self.includes: