Fixed builds when no SSL/TLS library is available, or when explicitly disabled

(STR #4531)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12311 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES-2.0.txt b/CHANGES-2.0.txt
index bd44c4e7718d043c5db163b301d6a77a47b095dc..6b02d792bf19e73f15b9d311cfb740b118e1f9bd 100644 (file)
--- a/CHANGES-2.0.txt
+++ b/CHANGES-2.0.txt
@@ -15,6 +15,8 @@ CHANGES IN CUPS V2.0.2
          (<rdar://problem/19129387>)
        - The cups-files.conf file contained the old ServerCertificate/Key
          directives instead of ServerKeychain.
+       - Fixed builds when no SSL/TLS library is available, or when explicitly
+         disabled (STR #4531)
 
 
 CHANGES IN CUPS V2.0.1

diff --git a/cups/usersys.c b/cups/usersys.c
index ab5849f40e9d75f4e0ab3b334a1af40cbe48a476..da603e294e42becd3146a5c6ee5b4a2bd8bdf0c9 100644 (file)
--- a/cups/usersys.c
+++ b/cups/usersys.c
@@ -955,6 +955,8 @@ cups_read_client_conf(
 #endif /* HAVE_GSSAPI */
 
 
+  (void)ssl_options; /* Silence compiler warning */
+
  /*
   * Read from the file...
   */
@@ -1009,6 +1011,7 @@ cups_read_client_conf(
       cups_gssservicename = gss_service_name;
     }
 #endif /* HAVE_GSSAPI */
+#ifdef HAVE_SSL
     else if (ssl_options && !_cups_strcasecmp(line, "SSLOptions") && value)
     {
      /*
@@ -1046,6 +1049,7 @@ cups_read_client_conf(
 
       _httpTLSSetOptions(options);
     }
+#endif /* HAVE_SSL */
   }
 
  /*