Merge changes from CUPS 1.4svn-r8033.

[thirdparty/cups.git] / scheduler / conf.c

diff --git a/scheduler/conf.c b/scheduler/conf.c
index 0161762fe80dd298219044f7a28f21f65f1a1ab6..1f44e61af1fc675f4b27c591e53a701adadbd6b6 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -3247,6 +3247,7 @@ read_configuration(cups_file_t *fp)       /* I - File to read from */
                        "Missing value for SetEnv directive on line %d.",
                        linenum);
     }
+#ifdef HAVE_SSL
     else if (!strcasecmp(line, "SSLOptions"))
     {
      /*
@@ -3262,6 +3263,7 @@ read_configuration(cups_file_t *fp)       /* I - File to read from */
                        "Unknown value \"%s\" for SSLOptions directive on "
                        "line %d.", value, linenum);
     }
+#endif /* HAVE_SSL */
     else
     {
      /*