configure, meson: convert pam detection to meson

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2021-06-03 11:15:26 +02:00
parent ba7ed407e6
commit 05e391ae40
5 changed files with 34 additions and 41 deletions

View File

@ -6,4 +6,4 @@ authz_ss.add(files(
'simple.c', 'simple.c',
)) ))
authz_ss.add(when: ['CONFIG_AUTH_PAM', pam], if_true: files('pamacct.c')) authz_ss.add(when: pam, if_true: files('pamacct.c'))

38
configure vendored
View File

@ -407,7 +407,7 @@ tls_priority="NORMAL"
gnutls="auto" gnutls="auto"
nettle="auto" nettle="auto"
gcrypt="auto" gcrypt="auto"
auth_pam="$default_feature" auth_pam="auto"
vte="$default_feature" vte="$default_feature"
virglrenderer="$default_feature" virglrenderer="$default_feature"
tpm="$default_feature" tpm="$default_feature"
@ -1383,9 +1383,9 @@ for opt do
;; ;;
--enable-gcrypt) gcrypt="enabled" --enable-gcrypt) gcrypt="enabled"
;; ;;
--disable-auth-pam) auth_pam="no" --disable-auth-pam) auth_pam="disabled"
;; ;;
--enable-auth-pam) auth_pam="yes" --enable-auth-pam) auth_pam="enabled"
;; ;;
--enable-rdma) rdma="yes" --enable-rdma) rdma="yes"
;; ;;
@ -2799,33 +2799,6 @@ EOF
fi fi
fi fi
##########################################
# PAM probe
if test "$auth_pam" != "no"; then
cat > $TMPC <<EOF
#include <security/pam_appl.h>
#include <stdio.h>
int main(void) {
const char *service_name = "qemu";
const char *user = "frank";
const struct pam_conv pam_conv = { 0 };
pam_handle_t *pamh = NULL;
pam_start(service_name, user, &pam_conv, &pamh);
return 0;
}
EOF
if compile_prog "" "-lpam" ; then
auth_pam=yes
else
if test "$auth_pam" = "yes"; then
feature_not_found "PAM" "Install PAM development package"
else
auth_pam=no
fi
fi
fi
########################################## ##########################################
# VTE probe # VTE probe
@ -5540,9 +5513,6 @@ if test "$gdbus_codegen" != "" ; then
echo "GDBUS_CODEGEN=$gdbus_codegen" >> $config_host_mak echo "GDBUS_CODEGEN=$gdbus_codegen" >> $config_host_mak
fi fi
echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $config_host_mak echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $config_host_mak
if test "$auth_pam" = "yes" ; then
echo "CONFIG_AUTH_PAM=y" >> $config_host_mak
fi
if test "$have_broken_size_max" = "yes" ; then if test "$have_broken_size_max" = "yes" ; then
echo "HAVE_BROKEN_SIZE_MAX=y" >> $config_host_mak echo "HAVE_BROKEN_SIZE_MAX=y" >> $config_host_mak
fi fi
@ -6251,7 +6221,7 @@ if test "$skip_meson" = no; then
-Dcurl=$curl -Dglusterfs=$glusterfs -Dbzip2=$bzip2 -Dlibiscsi=$libiscsi \ -Dcurl=$curl -Dglusterfs=$glusterfs -Dbzip2=$bzip2 -Dlibiscsi=$libiscsi \
-Dlibnfs=$libnfs -Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\ -Dlibnfs=$libnfs -Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\
-Drbd=$rbd -Dlzo=$lzo -Dsnappy=$snappy -Dlzfse=$lzfse \ -Drbd=$rbd -Dlzo=$lzo -Dsnappy=$snappy -Dlzfse=$lzfse \
-Dgnutls=$gnutls -Dnettle=$nettle -Dgcrypt=$gcrypt \ -Dgnutls=$gnutls -Dnettle=$nettle -Dgcrypt=$gcrypt -Dauth_pam=$auth_pam \
-Dzstd=$zstd -Dseccomp=$seccomp -Dvirtfs=$virtfs -Dcap_ng=$cap_ng \ -Dzstd=$zstd -Dseccomp=$seccomp -Dvirtfs=$virtfs -Dcap_ng=$cap_ng \
-Dattr=$attr -Ddefault_devices=$default_devices \ -Dattr=$attr -Ddefault_devices=$default_devices \
-Ddocs=$docs -Dsphinx_build=$sphinx_build -Dinstall_blobs=$blobs \ -Ddocs=$docs -Dsphinx_build=$sphinx_build -Dinstall_blobs=$blobs \

View File

@ -325,10 +325,6 @@ if have_system or have_tools
pixman = dependency('pixman-1', required: have_system, version:'>=0.21.8', pixman = dependency('pixman-1', required: have_system, version:'>=0.21.8',
method: 'pkg-config', kwargs: static_kwargs) method: 'pkg-config', kwargs: static_kwargs)
endif endif
pam = not_found
if 'CONFIG_AUTH_PAM' in config_host
pam = cc.find_library('pam')
endif
libaio = cc.find_library('aio', required: false) libaio = cc.find_library('aio', required: false)
zlib = dependency('zlib', required: true, kwargs: static_kwargs) zlib = dependency('zlib', required: true, kwargs: static_kwargs)
linux_io_uring = not_found linux_io_uring = not_found
@ -907,6 +903,31 @@ if get_option('vnc').enabled()
endif endif
endif endif
pam = not_found
if not get_option('auth_pam').auto() or have_system
pam = cc.find_library('pam', has_headers: ['security/pam_appl.h'],
required: get_option('auth_pam'),
kwargs: static_kwargs)
endif
if pam.found() and not cc.links('''
#include <stddef.h>
#include <security/pam_appl.h>
int main(void) {
const char *service_name = "qemu";
const char *user = "frank";
const struct pam_conv pam_conv = { 0 };
pam_handle_t *pamh = NULL;
pam_start(service_name, user, &pam_conv, &pamh);
return 0;
}''', dependencies: pam)
pam = not_found
if get_option('auth_pam').enabled()
error('could not link libpam')
else
warning('could not link libpam, disabling')
endif
endif
snappy = not_found snappy = not_found
if not get_option('snappy').auto() or have_system if not get_option('snappy').auto() or have_system
snappy = cc.find_library('snappy', has_headers: ['snappy-c.h'], snappy = cc.find_library('snappy', has_headers: ['snappy-c.h'],
@ -2729,7 +2750,7 @@ summary_info += {'VTE support': config_host.has_key('CONFIG_VTE')}
# TODO: add back version # TODO: add back version
summary_info += {'slirp support': slirp_opt == 'disabled' ? false : slirp_opt} summary_info += {'slirp support': slirp_opt == 'disabled' ? false : slirp_opt}
summary_info += {'libtasn1': tasn1.found()} summary_info += {'libtasn1': tasn1.found()}
summary_info += {'PAM': config_host.has_key('CONFIG_AUTH_PAM')} summary_info += {'PAM': pam.found()}
summary_info += {'iconv support': iconv.found()} summary_info += {'iconv support': iconv.found()}
summary_info += {'curses support': curses.found()} summary_info += {'curses support': curses.found()}
# TODO: add back version # TODO: add back version

View File

@ -52,6 +52,8 @@ option('multiprocess', type: 'feature', value: 'auto',
option('attr', type : 'feature', value : 'auto', option('attr', type : 'feature', value : 'auto',
description: 'attr/xattr support') description: 'attr/xattr support')
option('auth_pam', type : 'feature', value : 'auto',
description: 'PAM access control')
option('brlapi', type : 'feature', value : 'auto', option('brlapi', type : 'feature', value : 'auto',
description: 'brlapi character device driver') description: 'brlapi character device driver')
option('bzip2', type : 'feature', value : 'auto', option('bzip2', type : 'feature', value : 'auto',

View File

@ -94,7 +94,7 @@ if have_block
'test-io-channel-tls': ['io-channel-helpers.c', 'crypto-tls-x509-helpers.c', 'pkix_asn1_tab.c', 'test-io-channel-tls': ['io-channel-helpers.c', 'crypto-tls-x509-helpers.c', 'pkix_asn1_tab.c',
tasn1, io, crypto, gnutls]} tasn1, io, crypto, gnutls]}
endif endif
if 'CONFIG_AUTH_PAM' in config_host if pam.found()
tests += {'test-authz-pam': [authz]} tests += {'test-authz-pam': [authz]}
endif endif
if xts == 'private' if xts == 'private'