diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-06-03 11:15:26 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-06-25 10:54:10 +0200 |
| commit | 05e391ae4056e122fd78b694607ccd2e5a943dab (patch) | |
| tree | 2253a3a96e14bc4e7770a2df9ef7695df4050b7a /configure | |
| parent | ba7ed407e67589167ef582ac1f17a38f09fbd327 (diff) | |
configure, meson: convert pam detection to meson
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 38 |
1 files changed, 4 insertions, 34 deletions
@@ -407,7 +407,7 @@ tls_priority="NORMAL" gnutls="auto" nettle="auto" gcrypt="auto" -auth_pam="$default_feature" +auth_pam="auto" vte="$default_feature" virglrenderer="$default_feature" tpm="$default_feature" @@ -1383,9 +1383,9 @@ for opt do ;; --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" ;; @@ -2800,33 +2800,6 @@ EOF 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 if test "$vte" != "no"; then @@ -5540,9 +5513,6 @@ if test "$gdbus_codegen" != "" ; then echo "GDBUS_CODEGEN=$gdbus_codegen" >> $config_host_mak fi 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 echo "HAVE_BROKEN_SIZE_MAX=y" >> $config_host_mak fi @@ -6251,7 +6221,7 @@ if test "$skip_meson" = no; then -Dcurl=$curl -Dglusterfs=$glusterfs -Dbzip2=$bzip2 -Dlibiscsi=$libiscsi \ -Dlibnfs=$libnfs -Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\ -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 \ -Dattr=$attr -Ddefault_devices=$default_devices \ -Ddocs=$docs -Dsphinx_build=$sphinx_build -Dinstall_blobs=$blobs \ |