From: Thomas Weißschuh <thomas@t-8ch.de>
Date: Wed, 30 Nov 2022 04:30:31 +0000 (+0100)
Subject: meson: logindefs.c: handle libeconf dependency
X-Git-Tag: v2.39-rc1~396^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0333c40b299ee57be5875c2e2cf830e9689bf67f;p=thirdparty%2Futil-linux.git

meson: logindefs.c: handle libeconf dependency
---

diff --git a/lib/meson.build b/lib/meson.build
index 313210d372..6d08dfe4ab 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -52,7 +52,11 @@ pty_session_c = files('pty-session.c')
 ismounted_c = files('ismounted.c')
 exec_shell_c = files('exec_shell.c')
 fileeq_c = files('fileeq.c')
-logindefs_c = files('logindefs.c')
+logindefs_c = static_library('logindefs',
+  sources : ['logindefs.c'],
+  include_directories : dir_include,
+  dependencies : lib_econf,
+)
 
 if LINUX
   lib_common_sources += '''
diff --git a/login-utils/meson.build b/login-utils/meson.build
index d563217134..647f568cd3 100644
--- a/login-utils/meson.build
+++ b/login-utils/meson.build
@@ -40,8 +40,7 @@ endif
 
 chfn_sources = files(
   'chfn.c',
-) + \
-  logindefs_c
+)
 
 test_islocal_sources = files(
   'islocal.c',
@@ -58,8 +57,7 @@ last_sources = files(
 
 login_sources = files(
   'login.c',
-) + \
-  logindefs_c
+)
 
 sulogin_sources = files(
   'sulogin.c',
diff --git a/meson.build b/meson.build
index 91a01392b6..50405e2b4c 100644
--- a/meson.build
+++ b/meson.build
@@ -847,7 +847,7 @@ exe = executable(
   chfn_sources,
   chfn_chsh_sources,
   include_directories : includes,
-  link_with : lib_common,
+  link_with : [lib_common, logindefs_c],
   dependencies : chfn_chsh_deps,
   install_dir : usrbin_exec_dir,
   install : opt,
@@ -943,7 +943,7 @@ exe = executable(
   pty_session_c,
   monotonic_c,
   include_directories : includes,
-  link_with : lib_common,
+  link_with : [lib_common, logindefs_c],
   dependencies : [lib_pam,
                   lib_pam_misc,
                   lib_util,
@@ -977,7 +977,8 @@ exe = executable(
   'lib/logindefs.c',
   include_directories : includes,
   link_with : [lib_common,
-               lib_smartcols],
+               lib_smartcols,
+               logindefs_c],
   dependencies : [lib_selinux,
                   lib_systemd],
   install_dir : usrbin_exec_dir,
@@ -1018,7 +1019,7 @@ exe = executable(
   pty_session_c,
   monotonic_c,
   include_directories : includes,
-  link_with : lib_common,
+  link_with : [lib_common, logindefs_c],
   dependencies : [lib_pam,
                   lib_pam_misc,
                   lib_util,
@@ -2274,7 +2275,7 @@ exe = executable(
   'agetty',
   agetty_sources,
   include_directories : includes,
-  link_with : [lib_common],
+  link_with : [lib_common, logindefs_c],
   dependencies : BSD ? lib_util : [],
   install_dir : sbindir,
   install : opt,
@@ -2355,7 +2356,7 @@ exe = executable(
   'login',
   login_sources,
   include_directories : includes,
-  link_with : [lib_common],
+  link_with : [lib_common, logindefs_c],
   dependencies : [lib_pam,
                   lib_audit,
                   lib_selinux],
@@ -2982,7 +2983,7 @@ exe = executable(
   'lib/logindefs.c',
   c_args : ['-DTEST_PROGRAM'],
   include_directories : dir_include,
-  link_with : lib_common)
+  link_with : [lib_common, logindefs_c])
 exes += exe
 
 
diff --git a/term-utils/meson.build b/term-utils/meson.build
index 2bf23225d4..f93ee94325 100644
--- a/term-utils/meson.build
+++ b/term-utils/meson.build
@@ -20,8 +20,7 @@ scriptreplay_sources = files(
 
 agetty_sources = files(
   'agetty.c',
-) + \
-  logindefs_c
+)
 
 setterm_sources = files(
   'setterm.c',