From fcdbbdb554120db3b6011683cadfcbe1ee7ada13 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Wed, 18 Jun 2025 20:46:45 -0300 Subject: [PATCH 1/3] Fixing intl detection. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index c88102bb..5cc63d78 100644 --- a/meson.build +++ b/meson.build @@ -206,7 +206,7 @@ if c.compiles('#include ', name : 'syslog.h') app_conf.set('HAVE_SYSLOG', 1) endif -if c.compiles('#include ', name : 'libintl.h') +if libintl.found() app_conf.set('HAVE_LIBINTL', 1) endif From 1347fc3902c475f1357a31156ef4953173caca3e Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Fri, 27 Jun 2025 09:13:42 -0300 Subject: [PATCH 2/3] Better dependency names. --- meson.build | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 5cc63d78..9f69c41b 100644 --- a/meson.build +++ b/meson.build @@ -531,7 +531,7 @@ if host_machine.system() == 'windows' install_dir: get_option('libdir') ) - static_library( + static = static_library( '3270', config_src + lib_src, pic: true, @@ -568,7 +568,7 @@ else include_directories: includes_dir ) - static_library( + static = static_library( '3270', config_src + lib_src, pic: true, @@ -578,15 +578,20 @@ else include_directories: includes_dir ) - endif -lib3270_dep = declare_dependency( +dynamic_library = declare_dependency( link_with : dynamic, include_directories : includes_dir, variables: pkg_variables, ) +static_library = declare_dependency( + link_with : static, + include_directories : includes_dir, + variables: pkg_variables, +) + executable( meson.project_name(), config_src + [ 'src/testprogram/testprogram.c' ], From 7648ce0a26e1d58ab3e1056869891595a7a5a923 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Fri, 27 Jun 2025 10:11:14 -0300 Subject: [PATCH 3/3] Better usage as submodule. --- meson.build | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/meson.build b/meson.build index 9f69c41b..b4503072 100644 --- a/meson.build +++ b/meson.build @@ -554,6 +554,16 @@ elif host_machine.system() == 'darwin' include_directories: includes_dir ) + static = static_library( + '3270', + config_src + lib_src, + pic: true, + c_args: [ '-DSTATIC_LIBRARY' ], + install: true, + dependencies: lib_deps, + include_directories: includes_dir + ) + else dynamic = shared_library(