[network-manager-applet] wireless-security: build pkcs11 cert password support only with libnm

[Beniamino Galvani <bgalvani src gnome org>]

commit b713a297d11d5fc8b28b6b9b69af2aa26cf930d8
Author: Beniamino Galvani <bgalvani redhat com>
Date:   Thu Mar 30 17:05:20 2017 +0200

    wireless-security: build pkcs11 cert password support only with libnm
    
    Compile pkcs11 certificate password support only when building with
    libnm.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=780708

 src/wireless-security/eap-method-tls.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/wireless-security/eap-method-tls.c b/src/wireless-security/eap-method-tls.c
index 3c889f0..210780b 100644
--- a/src/wireless-security/eap-method-tls.c
+++ b/src/wireless-security/eap-method-tls.c
@@ -36,7 +36,7 @@
 struct _EAPMethodTLS {
        EAPMethod parent;
 
-#ifdef NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD
+#if LIBNM_BUILD
 /* libnm-glib doesn't support these. */
        const char *ca_cert_password_flags_name;
        const char *client_cert_password_flags_name;
@@ -146,7 +146,7 @@ fill_connection (EAPMethod *parent, NMConnection *connection)
                }
        }
 
-#ifdef NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD
+#if LIBNM_BUILD
 /* libnm-glib doesn't support these. */
        /* Save CA certificate PIN password flags to the connection */
        secret_flags = nma_cert_chooser_get_cert_password_flags (NMA_CERT_CHOOSER (method->ca_cert_chooser));
@@ -375,7 +375,7 @@ setup_cert_chooser (NMACertChooser *cert_chooser,
                case NM_SETTING_802_1X_CK_SCHEME_PATH:
                        value = cert_path_func (s_8021x);
                        break;
-#ifdef NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PKCS11
+#if LIBNM_BUILD
 /* Not available in libnm-glib */
                case NM_SETTING_802_1X_CK_SCHEME_PKCS11:
                        value = cert_uri_func (s_8021x);
@@ -399,7 +399,7 @@ setup_cert_chooser (NMACertChooser *cert_chooser,
                case NM_SETTING_802_1X_CK_SCHEME_PATH:
                        value = key_path_func (s_8021x);
                        break;
-#ifdef NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PKCS11
+#if LIBNM_BUILD
 /* Not available in libnm-glib */
                case NM_SETTING_802_1X_CK_SCHEME_PKCS11:
                        value = key_uri_func (s_8021x);
@@ -419,7 +419,7 @@ setup_cert_chooser (NMACertChooser *cert_chooser,
                nma_cert_chooser_set_key_password (cert_chooser, key_password_func (s_8021x));
 }
 
-#ifndef NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PKCS11
+#if !LIBNM_BUILD
 /* Not available in libnm-glib */
 #define nm_setting_802_1x_get_ca_cert_password             NULL
 #define nm_setting_802_1x_get_ca_cert_uri                  NULL
@@ -476,7 +476,7 @@ eap_method_tls_new (WirelessSecurity *ws_parent,
                return NULL;
 
        method = (EAPMethodTLS *) parent;
-#ifdef NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD
+#if LIBNM_BUILD
 /* libnm-glib doesn't support these. */
        method->ca_cert_password_flags_name = phase2
                                              ? NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD
@@ -587,7 +587,7 @@ eap_method_tls_new (WirelessSecurity *ws_parent,
        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), ca_not_required);
 
        /* Create password-storage popup menus for password entries under their secondary icon */
-#ifdef NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD
+#if LIBNM_BUILD
 /* libnm-glib doesn't support these. */
        nma_cert_chooser_setup_cert_password_storage (NMA_CERT_CHOOSER (method->ca_cert_chooser),
                                                      0, (NMSetting *) s_8021x, 
method->ca_cert_password_flags_name,