Make sure crypto/krb5/krb5_asn.h becomes part of libeay.num.

[openssl.git] / util / mkdef.pl

diff --git a/util/mkdef.pl b/util/mkdef.pl
index ea2ae499f9778c307043197d7bfc9711362ba50e..32e0ee0bf9eb77b88a4edadd6b8a76bb82b1e3d6 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -60,7 +60,7 @@ my $crypto_num= "util/libeay.num";
 my $ssl_num=    "util/ssleay.num";
 
 my $do_update = 0;
-my $do_rewrite = 0;
+my $do_rewrite = 1;
 my $do_crypto = 0;
 my $do_ssl = 0;
 my $do_ctest = 0;
@@ -243,6 +243,8 @@ $crypto.=" crypto/x509v3/x509v3.h";
 $crypto.=" crypto/rand/rand.h";
 $crypto.=" crypto/comp/comp.h" ; # unless $no_comp;
 $crypto.=" crypto/ocsp/ocsp.h";
+$crypto.=" crypto/ui/ui.h crypto/ui/ui_compat.h";
+$crypto.=" crypto/krb5/krb5_asn.h";
 $crypto.=" crypto/tmdiff.h";
 
 my $symhacks="crypto/symhacks.h";
@@ -258,7 +260,6 @@ if ($do_ssl == 1) {
        if ($do_rewrite == 1) {
                open(OUT, ">$ssl_num");
                &rewrite_numbers(*OUT,"SSLEAY",*ssl_list,@ssl_symbols);
-               close OUT;
        } else {
                open(OUT, ">>$ssl_num");
        }
@@ -993,7 +994,7 @@ sub is_valid
                        # EXPORT_VAR_AS_FUNCTION means that global variables
                        # will be represented as functions.  This currently
                        # only happens on VMS-VAX.
-                       if ($keyword eq "EXPORT_VAR_AS_FUNCTION" && $VMSVAX) {
+                       if ($keyword eq "EXPORT_VAR_AS_FUNCTION" && ($VMSVAX || $W32 || $W16)) {
                                return 1;
                        }
                        return 0;
@@ -1015,8 +1016,17 @@ sub is_valid
                        if ($keyword eq "RSA" && $no_rsa) { return 0; }
                        if ($keyword eq "DSA" && $no_dsa) { return 0; }
                        if ($keyword eq "DH" && $no_dh) { return 0; }
+                       if ($keyword eq "EC" && $no_ec) { return 0; }
                        if ($keyword eq "HMAC" && $no_hmac) { return 0; }
                        if ($keyword eq "AES" && $no_aes) { return 0; }
+                       if ($keyword eq "EVP" && $no_evp) { return 0; }
+                       if ($keyword eq "LHASH" && $no_lhash) { return 0; }
+                       if ($keyword eq "STACK" && $no_stack) { return 0; }
+                       if ($keyword eq "ERR" && $no_err) { return 0; }
+                       if ($keyword eq "BUFFER" && $no_buffer) { return 0; }
+                       if ($keyword eq "BIO" && $no_bio) { return 0; }
+                       if ($keyword eq "COMP" && $no_comp) { return 0; }
+                       if ($keyword eq "DSO" && $no_dso) { return 0; }
                        if ($keyword eq "KRB5" && $no_krb5) { return 0; }
                        if ($keyword eq "FP_API" && $no_fp_api) { return 0; }