build: fix helper includes and CMake library paths

This commit is contained in:
Mario Fetka
2026-04-21 06:05:45 +02:00
parent a36eb32d33
commit 4bd8223415
5 changed files with 8 additions and 11 deletions

View File

@@ -6,11 +6,6 @@
# Dependencies
##############
find_package(OpenSSL REQUIRED)
find_library(PAM_LIB pam REQUIRED)
find_library(DL_LIB dl REQUIRED)
#################################
# Generated files
##############
@@ -57,8 +52,8 @@ target_link_libraries(nwwebui
)
target_link_libraries(check_login
${PAM_LIB}
${DL_LIB}
${PAM_LIBRARY}
${DL_LIBRARY}
)
#################################

View File

@@ -23,6 +23,8 @@
#include <security/pam_appl.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
int my_conv(int num_msg, const struct pam_message **msg, struct pam_response **resp, void *appdata_ptr);

View File

@@ -2,7 +2,7 @@
#define NWWEBUI_CONFIG_H
#define DEFAULT_SMART_CONF "@MARS_NWE_INSTALL_FULL_CONFDIR@/smart.conf"
#define DEFAULT_SMART_PERL "@MARS_NWE_INSTALL_FULL_LIBEXEC@/smart"
#define DEFAULT_SMART_PERL "@MARS_NWE_INSTALL_FULL_LIBEXECDIR@/smart"
#define LOG_PATH_DEFAULT "@MARS_NWE_LOG_DIR@/nwwebui.log"

View File

@@ -35,7 +35,7 @@ open( STDERR, '>>' . $smart_log_path )
or die "Could not open $smart_log_path: $!";
$ENV{HOME} = '@MARS_NWE_INSTALL_FULL_CONFDIR@';
$smart_libexec_dir = '@MARS_NWE_INSTALL_FULL_LIBEXEC@';
$smart_libexec_dir = '@MARS_NWE_INSTALL_FULL_LIBEXECDIR@';
$smart_libexec_dir =~ s#/*$##;
$l = <STDIN>;

View File

@@ -12,10 +12,10 @@ $nonroot_user = 'nobody';
$smart_conf_path = '@MARS_NWE_INSTALL_FULL_CONFDIR@/smart.conf';
$smart_nwclient_path = '@MARS_NWE_INSTALL_FULL_CONFDIR@/.nwclient';
$smart_static_dir = '@MARS_NWE_INSTALL_FULL_LIBEXEC@/static';
$smart_static_dir = '@MARS_NWE_INSTALL_FULL_LIBEXECDIR@/static';
$smart_log_path = '@MARS_NWE_LOG_DIR@/smart.log';
$smart_check_login = '@MARS_NWE_INSTALL_FULL_LIBEXEC@/check_login';
$smart_check_login = '@MARS_NWE_INSTALL_FULL_LIBEXECDIR@/check_login';
$nw_bind_ip = '0.0.0.0';
$nw_tls_port = 9443;