[Spice-commits] meson.build po/meson.build

[GitLab Mirror]

 meson.build    |   38 +++++++++++++++++++-------------------
 po/meson.build |    1 +
 2 files changed, 20 insertions(+), 19 deletions(-)

New commits:
commit 5d765f1bbc986db9385608ed7e6a5e3f6a40f777
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Mon Feb 18 18:21:15 2019 +0000

    meson: Pass --msgid-bugs-address to PO generation
    
    As autoconf provide e-mail address in the .po files.
    The change in main meson.build is just a move to allow the
    other meson.buuild to see the setting.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Marc-André Lureau <marcandre.lureau at gmail.com>

diff --git a/meson.build b/meson.build
index c015de7..1863c52 100644
--- a/meson.build
+++ b/meson.build
@@ -340,6 +340,25 @@ add_project_arguments(compiler.get_supported_arguments(spice_gtk_global_cflags),
                       language : 'c')
 
 #
+# write config.h
+#
+proj_version = meson.project_version()
+proj_name = meson.project_name()
+config_data = {'VERSION' : proj_version,
+               'PACKAGE_VERSION' : proj_version,
+               'GETTEXT_PACKAGE' : proj_name,
+               'LOCALE_DIR' : spice_gtk_localedir,
+               'PACKAGE_STRING' : '@0@ @1@'.format(proj_name, proj_version),
+               'PACKAGE_BUGREPORT' : 'spice-devel at lists.freedesktop.org'}
+foreach key, value : config_data
+  spice_gtk_config_data.set_quoted(key, value)
+endforeach
+
+configure_file(output : 'config.h',
+               install : false,
+               configuration : spice_gtk_config_data)
+
+#
 # Subdirectories
 #
 subdir('src')
@@ -360,25 +379,6 @@ subdir('po')
 subdir('vapi')
 
 #
-# write config.h
-#
-proj_version = meson.project_version()
-proj_name = meson.project_name()
-config_data = {'VERSION' : proj_version,
-               'PACKAGE_VERSION' : proj_version,
-               'GETTEXT_PACKAGE' : proj_name,
-               'LOCALE_DIR' : spice_gtk_localedir,
-               'PACKAGE_STRING' : '@0@ @1@'.format(proj_name, proj_version),
-               'PACKAGE_BUGREPORT' : 'spice-devel at lists.freedesktop.org'}
-foreach key, value : config_data
-  spice_gtk_config_data.set_quoted(key, value)
-endforeach
-
-configure_file(output : 'config.h',
-               install : false,
-               configuration : spice_gtk_config_data)
-
-#
 # write spice-client-glib.pc
 #
 pkgconfig = import('pkgconfig')
diff --git a/po/meson.build b/po/meson.build
index fb3c395..da459f2 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1,3 +1,4 @@
 i18n = import('i18n')
 i18n.gettext(meson.project_name(),
+             args : '--msgid-bugs-address=' + config_data['PACKAGE_BUGREPORT'],
              preset : 'glib')