fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

 meson.build |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f511346fe16f205f087a97faf32d3c7d07d5b3c8
Merge: fdfc344 d2cc51d
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Mar 24 04:25:45 2025 +0000

    Merge branch 'issues/454' into 'main'
    
    meson: do not require libintl if nls feature is disabled
    
    Closes #454
    
    See merge request fontconfig/fontconfig!370

commit d2cc51dadbce3eb6d6f9912f95449c89bed21119
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Mar 24 12:34:55 2025 +0900

    meson: do not require libintl if nls feature is disabled
    
    Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/454
    
    Changelog: fixed

diff --git a/meson.build b/meson.build
index 656ed95..6385da1 100644
--- a/meson.build
+++ b/meson.build
@@ -195,7 +195,7 @@ gettext_args = [ '--msgid-bugs-address=@0@'.format(conf.get('PACKAGE_BUGREPORT')
 
 # Check for libintl.h
 opt_nls = get_option('nls')
-libintl_dep = dependency('intl', required: false, fallback: ['libintl', 'libintl_dep'])
+libintl_dep = dependency('intl', required: opt_nls, fallback: ['libintl', 'libintl_dep'])
 if libintl_dep.found()
   conf.set('ENABLE_NLS', opt_nls.allowed().to_int())
   deps += [libintl_dep]