Make OPENSSL_NO_COMP work under Win32.
authorDr. Stephen Henson <steve@openssl.org>
Sun, 2 Oct 2005 12:28:40 +0000 (12:28 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Sun, 2 Oct 2005 12:28:40 +0000 (12:28 +0000)
ssl/ssltest.c
util/mk1mf.pl

index 4f7ec37..5f74c51 100644 (file)
@@ -678,7 +678,6 @@ bad:
                        ERR_print_errors_fp(stderr);
                        }
                }
-#endif
        ssl_comp_methods = SSL_COMP_get_compression_methods();
        fprintf(stderr, "Available compression methods:\n");
        {
@@ -692,6 +691,7 @@ bad:
                        fprintf(stderr, "  %d: %s\n", c->id, c->name);
                        }
        }
+#endif
 
 #if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
        if (ssl2)
index ea61cb6..ff66837 100755 (executable)
@@ -954,6 +954,7 @@ sub read_options
                                }
                        }
                }
+       elsif (/^no-comp$/) { $xcflags = "-DOPENSSL_NO_COMP $xcflags"; }
        elsif (/^enable-zlib$/) { $xcflags = "-DZLIB $xcflags"; }
        elsif (/^enable-zlib-dynamic$/)
                {