From df7a8c8c406740d335dddcff1e6f4b58447df5e5 Mon Sep 17 00:00:00 2001 From: Ruben Gonzalez Date: Tue, 11 Jun 2024 17:46:11 +0200 Subject: [PATCH] meson: use nls option to ENABLE_NLS Part-of: --- subprojects/gst-plugins-bad/meson.build | 2 +- subprojects/gst-plugins-base/meson.build | 2 +- subprojects/gst-plugins-good/meson.build | 2 +- subprojects/gst-plugins-ugly/meson.build | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/subprojects/gst-plugins-bad/meson.build b/subprojects/gst-plugins-bad/meson.build index 3d29788476..715b70ea3d 100644 --- a/subprojects/gst-plugins-bad/meson.build +++ b/subprojects/gst-plugins-bad/meson.build @@ -53,7 +53,6 @@ else endif cdata = configuration_data() -cdata.set('ENABLE_NLS', 1) if cc.get_id() == 'msvc' msvc_args = [ @@ -617,6 +616,7 @@ endif # xgettext is optional (on Windows for instance) if find_program('xgettext', required : get_option('nls')).found() + cdata.set('ENABLE_NLS', 1) subdir('po') endif diff --git a/subprojects/gst-plugins-base/meson.build b/subprojects/gst-plugins-base/meson.build index 52a910b6b3..5c993414e4 100644 --- a/subprojects/gst-plugins-base/meson.build +++ b/subprojects/gst-plugins-base/meson.build @@ -101,7 +101,6 @@ if cc.has_link_argument('-Wl,-z,nodelete') endif core_conf = configuration_data() -core_conf.set('ENABLE_NLS', 1) # Symbol visibility if cc.has_argument('-fvisibility=hidden') @@ -506,6 +505,7 @@ subdir('tests') # xgettext is optional (on Windows for instance) if find_program('xgettext', required : get_option('nls')).found() + core_conf.set('ENABLE_NLS', 1) subdir('po') endif subdir('docs') diff --git a/subprojects/gst-plugins-good/meson.build b/subprojects/gst-plugins-good/meson.build index 9fcbae887e..efc04bcd25 100644 --- a/subprojects/gst-plugins-good/meson.build +++ b/subprojects/gst-plugins-good/meson.build @@ -151,7 +151,6 @@ if not get_option('glib_checks') endif cdata = configuration_data() -cdata.set('ENABLE_NLS', 1) check_headers = [ ['HAVE_DLFCN_H', 'dlfcn.h'], @@ -556,6 +555,7 @@ endif # xgettext is optional (on Windows for instance) if find_program('xgettext', required : get_option('nls')).found() + cdata.set('ENABLE_NLS', 1) subdir('po') endif diff --git a/subprojects/gst-plugins-ugly/meson.build b/subprojects/gst-plugins-ugly/meson.build index 98e47f71c7..3bb749d0d3 100644 --- a/subprojects/gst-plugins-ugly/meson.build +++ b/subprojects/gst-plugins-ugly/meson.build @@ -98,7 +98,6 @@ if have_cxx and cxx.has_link_argument('-Wl,-z,nodelete') endif cdata = configuration_data() -cdata.set('ENABLE_NLS', 1) check_headers = [ ['HAVE_DLFCN_H', 'dlfcn.h'], @@ -336,6 +335,7 @@ subdir('tests') # xgettext is optional (on Windows for instance) if find_program('xgettext', required : get_option('nls')).found() + cdata.set('ENABLE_NLS', 1) subdir('po') endif subdir('docs')