there's no such thing as Makefile.ssl anymore
[openssl.git] / util / mk1mf.pl
index ef0769289067296179e1189132b8b5e711c4de95..6582823452775fa9f52d232c615833c406d8c490 100755 (executable)
 #
 
 $INSTALLTOP="/usr/local/ssl";
+$OPTIONS="";
+$ssl_version="";
+$banner="\t\@echo Building OpenSSL";
+
+open(IN,"<Makefile") || die "unable to open Makefile!\n";
+while(<IN>) {
+    $ssl_version=$1 if (/^VERSION=(.*)$/);
+    $OPTIONS=$1 if (/^OPTIONS=(.*)$/);
+    $INSTALLTOP=$1 if (/^INSTALLTOP=(.*$)/);
+}
+close(IN);
+
+die "Makefile is not the toplevel Makefile!\n" if $ssl_version eq "";
 
 $infile="MINFO";
 
 %ops=(
-       "VC-WIN32",   "Microsoft Visual C++ 4.[01] - Windows NT [34].x",
+       "VC-WIN32",   "Microsoft Visual C++ [4-6] - Windows NT or 9X",
+       "VC-CE",   "Microsoft eMbedded Visual C++ 3.0 - Windows CE ONLY",
+       "VC-NT",   "Microsoft Visual C++ [4-6] - Windows NT ONLY",
        "VC-W31-16",  "Microsoft Visual C++ 1.52 - Windows 3.1 - 286",
        "VC-WIN16",   "Alias for VC-W31-32",
        "VC-W31-32",  "Microsoft Visual C++ 1.52 - Windows 3.1 - 386+",
        "VC-MSDOS","Microsoft Visual C++ 1.52 - MSDOS",
-       "BC-NT",   "Borland C++ 4.5 - Windows NT  - PROBABLY NOT WORKING",
+       "Mingw32", "GNU C++ - Windows NT or 9x",
+       "Mingw32-files", "Create files with DOS copy ...",
+       "BC-NT",   "Borland C++ 4.5 - Windows NT",
        "BC-W31",  "Borland C++ 4.5 - Windows 3.1 - PROBABLY NOT WORKING",
        "BC-MSDOS","Borland C++ 4.5 - MSDOS",
+       "linux-elf","Linux elf",
+       "ultrix-mips","DEC mips ultrix",
        "FreeBSD","FreeBSD distribution",
+       "OS2-EMX", "EMX GCC OS/2",
+       "netware-clib", "CodeWarrior for NetWare - CLib",
+       "netware-libc", "CodeWarrior for NetWare - LibC",
        "default","cc under unix",
        );
 
-$type="";
+$platform="";
+my $xcflags="";
 foreach (@ARGV)
        {
-       if    (/^no-rc2$/)      { $no_rc2=1; }
-       elsif (/^no-rc4$/)      { $no_rc4=1; }
-       elsif (/^no-idea$/)     { $no_idea=1; }
-       elsif (/^no-des$/)      { $no_des=1; }
-       elsif (/^no-bf$/)       { $no_bf=1; }
-       elsif (/^no-md2$/)      { $no_md2=1; }
-       elsif (/^no-md5$/)      { $no_md5=1; }
-       elsif (/^no-sha$/)      { $no_sha=1; }
-       elsif (/^no-sha1$/)     { $no_sha1=1; }
-       elsif (/^no-mdc2$/)     { $no_mdc2=1; }
-       elsif (/^no-patents$/)  { $no_rc2=$no_rc4=$no_idea=$no_sha1=$no_rsa=1; }
-       elsif (/^no-rsa$/)      { $no_rsa=1; }
-       elsif (/^no-dsa$/)      { $no_dsa=1; }
-       elsif (/^no-dh$/)       { $no_dh=1; }
-       elsif (/^no-asm$/)      { $no_asm=1; }
-       elsif (/^no-ssl2$/)     { $no_ssl2=1; }
-       elsif (/^no-ssl3$/)     { $no_ssl3=1; }
-       elsif (/^no-err$/)      { $no_err=1; }
-       elsif (/^no-sock$/)     { $no_sock=1; }
-
-       elsif (/^rsaref$/)      { $rsaref=1; }
-       elsif (/^gcc$/)         { $gcc=1; }
-       elsif (/^debug$/)       { $debug=1; }
-       elsif (/^shlib$/)       { $shlib=1; }
-       elsif (/^dll$/)         { $shlib=1; }
-       elsif (/^([^=]*)=(.*)$/){ $VARS{$1}=$2; }
-       elsif (/^-[lL].*$/)     { $l_flags.="$_ "; }
-       elsif ((!/^-help/) && (!/^-h/) && (!/^-\?/) && /^-.*$/)
-               { $c_flags.="$_ "; }
-       else
+       if (!&read_options && !defined($ops{$_}))
                {
-               if (!defined($ops{$_}))
-                       {
-                       print STDERR "unknown option - $_\n";
-                       print STDERR "usage: perl mk1mf.pl [system] [options]\n";
-                       print STDERR "\nwhere [system] can be one of the following\n";
-                       foreach $i (sort keys %ops)
-                               { printf STDERR "\t%-10s\t%s\n",$i,$ops{$i}; }
-                       print STDERR <<"EOF";
+               print STDERR "unknown option - $_\n";
+               print STDERR "usage: perl mk1mf.pl [options] [system]\n";
+               print STDERR "\nwhere [system] can be one of the following\n";
+               foreach $i (sort keys %ops)
+               { printf STDERR "\t%-10s\t%s\n",$i,$ops{$i}; }
+               print STDERR <<"EOF";
 and [options] can be one of
-       no-md2 no-md5 no-sha no-sha1 no-mdc2    - Skip this digest
-       no-rc2 no-rc4 no-idea no-des no-bf      - Skip this symetriccipher
+       no-md2 no-md4 no-md5 no-sha no-mdc2     - Skip this digest
+       no-ripemd
+       no-rc2 no-rc4 no-rc5 no-idea no-des     - Skip this symetric cipher
+       no-bf no-cast no-aes
        no-rsa no-dsa no-dh                     - Skip this public key cipher
        no-ssl2 no-ssl3                         - Skip this version of SSL
        just-ssl                                - remove all non-ssl keys/digest
        no-asm                                  - No x86 asm
+       no-krb5                                 - No KRB5
+       no-ec                                   - No EC
+       no-ecdsa                                - No ECDSA
+       no-ecdh                                 - No ECDH
+       no-engine                               - No engine
+       no-hw                                   - No hw
+       nasm                                    - Use NASM for x86 asm
+       nw-nasm                                 - Use NASM x86 asm for NetWare
+       nw-mwasm                                        - Use Metrowerks x86 asm for NetWare
+       gaswin                                  - Use GNU as with Mingw32
        no-socks                                - No socket code
        no-err                                  - No error strings
        dll/shlib                               - Build shared libraries (MS)
        debug                                   - Debug build
+        profile                                 - Profiling build
        gcc                                     - Use Gcc (unix)
-       rsaref                                  - Build to require RSAref
 
 Values that can be set
-TMP=tmpdir OUT=outdir SRC=srcdir BIN=binpath CC=C-compiler
+TMP=tmpdir OUT=outdir SRC=srcdir BIN=binpath INC=header-outdir CC=C-compiler
 
 -L<ex_lib_path> -l<ex_lib>                     - extra library flags (unix)
 -<ex_cc_flags>                                 - extra 'cc' flags,
                                                  added (MS), or replace (unix)
 EOF
-                       exit(1);
-                       }
-               $type=$_;
+               exit(1);
                }
+       $platform=$_;
+       }
+foreach (grep(!/^$/, split(/ /, $OPTIONS)))
+       {
+       print STDERR "unknown option - $_\n" if !&read_options;
        }
 
 $no_mdc2=1 if ($no_des);
 
-$no_ssl3=1 if ($no_md5 || $no_sha1);
+$no_ssl3=1 if ($no_md5 || $no_sha);
 $no_ssl3=1 if ($no_rsa && $no_dh);
 
-$no_ssl2=1 if ($no_md5 || $no_rsa);
+$no_ssl2=1 if ($no_md5);
 $no_ssl2=1 if ($no_rsa);
 
+$out_def="out";
+$inc_def="outinc";
+$tmp_def="tmp";
+
+$mkdir="-mkdir";
+
+($ssl,$crypto)=("ssl","crypto");
+$ranlib="echo ranlib";
+
 $cc=(defined($VARS{'CC'}))?$VARS{'CC'}:'cc';
 $src_dir=(defined($VARS{'SRC'}))?$VARS{'SRC'}:'.';
-$out_dir=(defined($VARS{'OUT'}))?$VARS{'OUT'}:'out';
-$tmp_dir=(defined($VARS{'TMP'}))?$VARS{'TMP'}:'tmp';
 $bin_dir=(defined($VARS{'BIN'}))?$VARS{'BIN'}:'';
 
-($ssl,$crypto)=("ssl","crypto");
-$RSAglue="RSAglue";
-$ranlib="echo ranlib";
+# $bin_dir.=$o causes a core dump on my sparc :-(
+
+
+$NT=0;
 
 push(@INC,"util/pl","pl");
-if ($type eq "VC-MSDOS")
+if ($platform eq "VC-MSDOS")
        {
        $asmbits=16;
        $msdos=1;
        require 'VC-16.pl';
        }
-elsif ($type eq "VC-W31-16")
+elsif ($platform eq "VC-W31-16")
        {
        $asmbits=16;
        $msdos=1; $win16=1;
        require 'VC-16.pl';
        }
-elsif (($type eq "VC-W31-32") || ($type eq "VC-WIN16"))
+elsif (($platform eq "VC-W31-32") || ($platform eq "VC-WIN16"))
        {
        $asmbits=32;
        $msdos=1; $win16=1;
        require 'VC-16.pl';
        }
-elsif (($type eq "VC-WIN32") || ($type eq "VC-NT"))
+elsif (($platform eq "VC-WIN32") || ($platform eq "VC-NT"))
        {
+       $NT = 1 if $platform eq "VC-NT";
        require 'VC-32.pl';
        }
-elsif ($type eq "BC-NT")
+elsif ($platform eq "VC-CE")
+       {
+       require 'VC-CE.pl';
+       }
+elsif ($platform eq "Mingw32")
+       {
+       require 'Mingw32.pl';
+       }
+elsif ($platform eq "Mingw32-files")
+       {
+       require 'Mingw32f.pl';
+       }
+elsif ($platform eq "BC-NT")
        {
        $bc=1;
        require 'BC-32.pl';
        }
-elsif ($type eq "BC-W31")
+elsif ($platform eq "BC-W31")
        {
        $bc=1;
        $msdos=1; $w16=1;
        require 'BC-16.pl';
        }
-elsif ($type eq "BC-Q16")
+elsif ($platform eq "BC-Q16")
        {
        $msdos=1; $w16=1; $shlib=0; $qw=1;
        require 'BC-16.pl';
        }
-elsif ($type eq "BC-MSDOS")
+elsif ($platform eq "BC-MSDOS")
        {
        $asmbits=16;
        $msdos=1;
        require 'BC-16.pl';
        }
-elsif ($type eq "FreeBSD")
+elsif ($platform eq "FreeBSD")
        {
        require 'unix.pl';
        $cflags='-DTERMIO -D_ANSI_SOURCE -O2 -fomit-frame-pointer';
        }
+elsif ($platform eq "linux-elf")
+       {
+       require "unix.pl";
+       require "linux.pl";
+       $unix=1;
+       }
+elsif ($platform eq "ultrix-mips")
+       {
+       require "unix.pl";
+       require "ultrix.pl";
+       $unix=1;
+       }
+elsif ($platform eq "OS2-EMX")
+       {
+       $wc=1;
+       require 'OS2-EMX.pl';
+       }
+elsif (($platform eq "netware-clib") || ($platform eq "netware-libc"))
+       {
+   $LIBC=1 if $platform eq "netware-libc";
+       require 'netware.pl';
+       }
 else
        {
        require "unix.pl";
@@ -167,42 +217,57 @@ else
        $cflags.=' -DTERMIO';
        }
 
-# $bin_dir.=$o causes a core dump on my sparc :-(
+$out_dir=(defined($VARS{'OUT'}))?$VARS{'OUT'}:$out_def.($debug?".dbg":"");
+$tmp_dir=(defined($VARS{'TMP'}))?$VARS{'TMP'}:$tmp_def.($debug?".dbg":"");
+$inc_dir=(defined($VARS{'INC'}))?$VARS{'INC'}:$inc_def;
+
 $bin_dir=$bin_dir.$o unless ((substr($bin_dir,-1,1) eq $o) || ($bin_dir eq ''));
 
-$cflags.=" -DNO_IDEA" if $no_idea;
-$cflags.=" -DNO_RC2"  if $no_rc2;
-$cflags.=" -DNO_RC4"  if $no_rc4;
-$cflags.=" -DNO_MD2"  if $no_md2;
-$cflags.=" -DNO_MD5"  if $no_md5;
-$cflags.=" -DNO_SHA"  if $no_sha;
-$cflags.=" -DNO_SHA1" if $no_sha1;
-$cflags.=" -DNO_MDC2" if $no_mdc2;
-$cflags.=" -DNO_BLOWFISH"  if $no_bf;
-$cflags.=" -DNO_DES"  if $no_des;
-$cflags.=" -DNO_RSA"  if $no_rsa;
-$cflags.=" -DNO_DSA"  if $no_dsa;
-$cflags.=" -DNO_DH"   if $no_dh;
-$cflags.=" -DNO_SOCK" if $no_sock;
-$cflags.=" -DNO_SSL2" if $no_ssl2;
-$cflags.=" -DNO_SSL3" if $no_ssl3;
-$cflags.=" -DNO_ERR"  if $no_err;
-$cflags.=" -DRSAref"  if $rsaref ne "";
-
-if ($unix)
-       { $cflags="$c_flags" if ($c_flags ne ""); }
-else   { $cflags="$c_flags$cflags" if ($c_flags ne ""); }
+$cflags= "$xcflags$cflags" if $xcflags ne "";
+
+$cflags.=" -DOPENSSL_NO_IDEA" if $no_idea;
+$cflags.=" -DOPENSSL_NO_AES"  if $no_aes;
+$cflags.=" -DOPENSSL_NO_RC2"  if $no_rc2;
+$cflags.=" -DOPENSSL_NO_RC4"  if $no_rc4;
+$cflags.=" -DOPENSSL_NO_RC5"  if $no_rc5;
+$cflags.=" -DOPENSSL_NO_MD2"  if $no_md2;
+$cflags.=" -DOPENSSL_NO_MD4"  if $no_md4;
+$cflags.=" -DOPENSSL_NO_MD5"  if $no_md5;
+$cflags.=" -DOPENSSL_NO_SHA"  if $no_sha;
+$cflags.=" -DOPENSSL_NO_SHA1" if $no_sha1;
+$cflags.=" -DOPENSSL_NO_RIPEMD" if $no_ripemd;
+$cflags.=" -DOPENSSL_NO_MDC2" if $no_mdc2;
+$cflags.=" -DOPENSSL_NO_BF"  if $no_bf;
+$cflags.=" -DOPENSSL_NO_CAST" if $no_cast;
+$cflags.=" -DOPENSSL_NO_DES"  if $no_des;
+$cflags.=" -DOPENSSL_NO_RSA"  if $no_rsa;
+$cflags.=" -DOPENSSL_NO_DSA"  if $no_dsa;
+$cflags.=" -DOPENSSL_NO_DH"   if $no_dh;
+$cflags.=" -DOPENSSL_NO_SOCK" if $no_sock;
+$cflags.=" -DOPENSSL_NO_SSL2" if $no_ssl2;
+$cflags.=" -DOPENSSL_NO_SSL3" if $no_ssl3;
+$cflags.=" -DOPENSSL_NO_ERR"  if $no_err;
+$cflags.=" -DOPENSSL_NO_KRB5" if $no_krb5;
+$cflags.=" -DOPENSSL_NO_EC"   if $no_ec;
+$cflags.=" -DOPENSSL_NO_ECDSA" if $no_ecdsa;
+$cflags.=" -DOPENSSL_NO_ECDH" if $no_ecdh;
+$cflags.=" -DOPENSSL_NO_ENGINE"   if $no_engine;
+$cflags.=" -DOPENSSL_NO_HW"   if $no_hw;
+#$cflags.=" -DRSAref"  if $rsaref ne "";
+
+## if ($unix)
+##     { $cflags="$c_flags" if ($c_flags ne ""); }
+##else
+       { $cflags="$c_flags$cflags" if ($c_flags ne ""); }
 
 $ex_libs="$l_flags$ex_libs" if ($l_flags ne "");
 
-if ($ranlib ne "")
-       {
-       $ranlib="\$(SRC_D)$o$ranlib";
-       }
+%shlib_ex_cflags=("SSL" => " -DOPENSSL_BUILD_SHLIBSSL",
+                 "CRYPTO" => " -DOPENSSL_BUILD_SHLIBCRYPTO");
 
 if ($msdos)
        {
-       $banner ="\t\@echo Make sure you have run 'perl Configure $type' in the\n";
+       $banner ="\t\@echo Make sure you have run 'perl Configure $platform' in the\n";
        $banner.="\t\@echo top level directory, if you don't have perl, you will\n";
        $banner.="\t\@echo need to probably edit crypto/bn/bn.h, check the\n";
        $banner.="\t\@echo documentation for details.\n";
@@ -213,9 +278,66 @@ $link="$bin_dir$link" if ($link !~ /^\$/);
 
 $INSTALLTOP =~ s|/|$o|g;
 
+#############################################
+# We parse in input file and 'store' info for later printing.
+open(IN,"<$infile") || die "unable to open $infile:$!\n";
+$_=<IN>;
+for (;;)
+       {
+       chop;
+
+       ($key,$val)=/^([^=]+)=(.*)/;
+       if ($key eq "RELATIVE_DIRECTORY")
+               {
+               if ($lib ne "")
+                       {
+                       $uc=$lib;
+                       $uc =~ s/^lib(.*)\.a/$1/;
+                       $uc =~ tr/a-z/A-Z/;
+                       $lib_nam{$uc}=$uc;
+                       $lib_obj{$uc}.=$libobj." ";
+                       }
+               last if ($val eq "FINISHED");
+               $lib="";
+               $libobj="";
+               $dir=$val;
+               }
+
+       if ($key eq "KRB5_INCLUDES")
+               { $cflags .= " $val";}
+
+       if ($key eq "LIBKRB5")
+               { $ex_libs .= " $val";}
+
+       if ($key eq "TEST")
+               { $test.=&var_add($dir,$val); }
+
+       if (($key eq "PROGS") || ($key eq "E_OBJ"))
+               { $e_exe.=&var_add($dir,$val); }
+
+       if ($key eq "LIB")
+               {
+               $lib=$val;
+               $lib =~ s/^.*\/([^\/]+)$/$1/;
+               }
+
+       if ($key eq "EXHEADER")
+               { $exheader.=&var_add($dir,$val); }
+
+       if ($key eq "HEADER")
+               { $header.=&var_add($dir,$val); }
+
+       if ($key eq "LIBOBJ")
+               { $libobj=&var_add($dir,$val); }
+
+       if (!($_=<IN>))
+               { $_="RELATIVE_DIRECTORY=FINISHED\n"; }
+       }
+close(IN);
+
 $defs= <<"EOF";
-# This makefile has been automatically generated from the SSLeay distribution.
-# This single makefile will build the complete SSLeay distribution and
+# This makefile has been automatically generated from the OpenSSL distribution.
+# This single makefile will build the complete OpenSSL distribution and
 # by default leave the 'intertesting' output files in .${o}out and the stuff
 # that needs deleting in .${o}tmp.
 # The file was generated by running 'make makefile.one', which
@@ -227,43 +349,74 @@ $defs= <<"EOF";
 # The one monster makefile better suits building in non-unix
 # environments.
 
+EOF
+
+$defs .= $preamble if defined $preamble;
+
+if ($platform eq "VC-CE")
+       {
+       $defs.= <<"EOF";
+!INCLUDE <\$(WCECOMPAT)/wcedefs.mak>
+
+EOF
+       }
+
+$defs.= <<"EOF";
 INSTALLTOP=$INSTALLTOP
 
 # Set your compiler options
+PLATFORM=$platform
 CC=$bin_dir${cc}
 CFLAG=$cflags
 APP_CFLAG=$app_cflag
 LIB_CFLAG=$lib_cflag
+SHLIB_CFLAG=$shl_cflag
 APP_EX_OBJ=$app_ex_obj
 SHLIB_EX_OBJ=$shlib_ex_obj
 # add extra libraries to this define, for solaris -lsocket -lnsl would
 # be added
 EX_LIBS=$ex_libs
 
-# The SSLeay directory
+# The OpenSSL directory
 SRC_D=$src_dir
 
 LINK=$link
 LFLAGS=$lflags
+RSC=$rsc
 
-BN_MULW_OBJ=$bn_mulw_obj
-BN_MULW_SRC=$bn_mulw_src
+BN_ASM_OBJ=$bn_asm_obj
+BN_ASM_SRC=$bn_asm_src
+BNCO_ASM_OBJ=$bnco_asm_obj
+BNCO_ASM_SRC=$bnco_asm_src
 DES_ENC_OBJ=$des_enc_obj
 DES_ENC_SRC=$des_enc_src
-DES_CRYPT_OBJ=$des_crypt_obj
-DES_CRYPT_SRC=$des_crypt_src
 BF_ENC_OBJ=$bf_enc_obj
 BF_ENC_SRC=$bf_enc_src
+CAST_ENC_OBJ=$cast_enc_obj
+CAST_ENC_SRC=$cast_enc_src
+RC4_ENC_OBJ=$rc4_enc_obj
+RC4_ENC_SRC=$rc4_enc_src
+RC5_ENC_OBJ=$rc5_enc_obj
+RC5_ENC_SRC=$rc5_enc_src
+MD5_ASM_OBJ=$md5_asm_obj
+MD5_ASM_SRC=$md5_asm_src
+SHA1_ASM_OBJ=$sha1_asm_obj
+SHA1_ASM_SRC=$sha1_asm_src
+RMD160_ASM_OBJ=$rmd160_asm_obj
+RMD160_ASM_SRC=$rmd160_asm_src
 
 # The output directory for everything intersting
 OUT_D=$out_dir
 # The output directory for all the temporary muck
 TMP_D=$tmp_dir
+# The output directory for the header files
+INC_D=$inc_dir
+INCO_D=$inc_dir${o}openssl
 
 CP=$cp
 RM=$rm
 RANLIB=$ranlib
-MKDIR=mkdir
+MKDIR=$mkdir
 MKLIB=$bin_dir$mklib
 MLFLAGS=$mlflags
 ASM=$bin_dir$asm
@@ -272,19 +425,19 @@ ASM=$bin_dir$asm
 # You should not need to touch anything below this point
 ######################################################
 
-E_EXE=ssleay
+E_EXE=openssl
 SSL=$ssl
 CRYPTO=$crypto
-RSAGLUE=$RSAglue
 
 # BIN_D  - Binary output directory
 # TEST_D - Binary test file output directory
 # LIB_D  - library output directory
-# INC_D  - include directory
+# Note: if you change these point to different directories then uncomment out
+# the lines around the 'NB' comment below.
+# 
 BIN_D=\$(OUT_D)
 TEST_D=\$(OUT_D)
 LIB_D=\$(OUT_D)
-INC_D=\$(OUT_D)
 
 # INCL_D - local library directory
 # OBJ_D  - temp object file directory
@@ -293,38 +446,52 @@ INCL_D=\$(TMP_D)
 
 O_SSL=     \$(LIB_D)$o$plib\$(SSL)$shlibp
 O_CRYPTO=  \$(LIB_D)$o$plib\$(CRYPTO)$shlibp
-O_RSAGLUE= \$(LIB_D)$o$plib\$(RSAGLUE)$libp
+SO_SSL=    $plib\$(SSL)$so_shlibp
+SO_CRYPTO= $plib\$(CRYPTO)$so_shlibp
 L_SSL=     \$(LIB_D)$o$plib\$(SSL)$libp
 L_CRYPTO=  \$(LIB_D)$o$plib\$(CRYPTO)$libp
 
 L_LIBS= \$(L_SSL) \$(L_CRYPTO)
-#L_LIBS= \$(O_SSL) \$(O_RSAGLUE) -lrsaref \$(O_CRYPTO)
 
 ######################################################
 # Don't touch anything below this point
 ######################################################
 
-INC=-DFLAT_INC -I\$(INC_D) -I\$(INCL_D)
+INC=-I\$(INC_D) -I\$(INCL_D)
 APP_CFLAGS=\$(INC) \$(CFLAG) \$(APP_CFLAG)
 LIB_CFLAGS=\$(INC) \$(CFLAG) \$(LIB_CFLAG)
-LIBS_DEP=\$(O_CRYPTO) \$(O_RSAGLUE) \$(O_SSL)
+SHLIB_CFLAGS=\$(INC) \$(CFLAG) \$(LIB_CFLAG) \$(SHLIB_CFLAG)
+LIBS_DEP=\$(O_CRYPTO) \$(O_SSL)
 
 #############################################
 EOF
 
 $rules=<<"EOF";
-all: banner \$(OUT_D) \$(TMP_D) headers lib exe
+all: banner \$(TMP_D) \$(BIN_D) \$(TEST_D) \$(LIB_D) \$(INCO_D) headers lib exe
 
 banner:
 $banner
 
-\$(OUT_D):
-       \$(MKDIR) \$(OUT_D)
-
 \$(TMP_D):
        \$(MKDIR) \$(TMP_D)
+# NB: uncomment out these lines if BIN_D, TEST_D and LIB_D are different
+#\$(BIN_D):
+#      \$(MKDIR) \$(BIN_D)
+#
+#\$(TEST_D):
+#      \$(MKDIR) \$(TEST_D)
+
+\$(LIB_D):
+       \$(MKDIR) \$(LIB_D)
+
+\$(INCO_D): \$(INC_D)
+       \$(MKDIR) \$(INCO_D)
+
+\$(INC_D):
+       \$(MKDIR) \$(INC_D)
 
 headers: \$(HEADER) \$(EXHEADER)
+       @
 
 lib: \$(LIBS_DEP)
 
@@ -334,11 +501,12 @@ install:
        \$(MKDIR) \$(INSTALLTOP)
        \$(MKDIR) \$(INSTALLTOP)${o}bin
        \$(MKDIR) \$(INSTALLTOP)${o}include
+       \$(MKDIR) \$(INSTALLTOP)${o}include${o}openssl
        \$(MKDIR) \$(INSTALLTOP)${o}lib
-       \$(CP) \$(INC_D)${o}*.h \$(INSTALLTOP)${o}include
+       \$(CP) \$(INCO_D)${o}*.\[ch\] \$(INSTALLTOP)${o}include${o}openssl
        \$(CP) \$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin
-       \$(CP) \$(LIB_D)$o\$(O_SSL) \$(INSTALLTOP)${o}lib
-       \$(CP) \$(LIB_D)$o\$(O_CRYPTO) \$(INSTALLTOP)${o}lib
+       \$(CP) \$(O_SSL) \$(INSTALLTOP)${o}lib
+       \$(CP) \$(O_CRYPTO) \$(INSTALLTOP)${o}lib
 
 clean:
        \$(RM) \$(TMP_D)$o*.*
@@ -348,57 +516,42 @@ vclean:
        \$(RM) \$(OUT_D)$o*.*
 
 EOF
-
-#############################################
-# We parse in input file and 'store' info for later printing.
-open(IN,"<$infile") || die "unable to open $infile:$!\n";
-$_=<IN>;
-for (;;)
+    
+my $platform_cpp_symbol = "MK1MF_PLATFORM_$platform";
+$platform_cpp_symbol =~ s/-/_/g;
+if (open(IN,"crypto/buildinf.h"))
        {
-       chop;
+       # Remove entry for this platform in existing file buildinf.h.
 
-       ($key,$val)=/^([^=]+)=(.*)/;
-       if ($key eq "RELATIVE_DIRECTORY")
+       my $old_buildinf_h = "";
+       while (<IN>)
                {
-               if ($lib ne "")
+               if (/^\#ifdef $platform_cpp_symbol$/)
                        {
-                       $uc=$lib;
-                       $uc =~ s/^lib(.*)\.a/$1/;
-                       $uc =~ tr/a-z/A-Z/;
-                       $lib_nam{$uc}=$uc;
-                       $lib_obj{$uc}.=$libobj." ";
+                       while (<IN>) { last if (/^\#endif/); }
+                       }
+               else
+                       {
+                       $old_buildinf_h .= $_;
                        }
-               last if ($val eq "FINISHED");
-               $lib="";
-               $libobj="";
-               $dir=$val;
-               }
-
-       if ($key eq "TEST")
-               { $test.=&var_add($dir,$val); }
-
-       if (($key eq "PROGS") || ($key eq "E_OBJ"))
-               { $e_exe.=&var_add($dir,$val); }
-
-       if ($key eq "LIB")
-               {
-               $lib=$val;
-               $lib =~ s/^.*\/([^\/]+)$/$1/;
                }
+       close(IN);
 
-       if ($key eq "EXHEADER")
-               { $exheader.=&var_add($dir,$val); }
-
-       if ($key eq "HEADER")
-               { $header.=&var_add($dir,$val); }
-
-       if ($key eq "LIBOBJ")
-               { $libobj=&var_add($dir,$val); }
-
-       if (!($_=<IN>))
-               { $_="RELATIVE_DIRECTORY=FINISHED\n"; }
+       open(OUT,">crypto/buildinf.h") || die "Can't open buildinf.h";
+       print OUT $old_buildinf_h;
+       close(OUT);
        }
-close(IN);
+
+open (OUT,">>crypto/buildinf.h") || die "Can't open buildinf.h";
+printf OUT <<EOF;
+#ifdef $platform_cpp_symbol
+  /* auto-generated/updated by util/mk1mf.pl for crypto/cversion.c */
+  #define CFLAGS "$cc $cflags"
+  #define PLATFORM "$platform"
+EOF
+printf OUT "  #define DATE \"%s\"\n", scalar gmtime();
+printf OUT "#endif\n";
+close(OUT);
 
 # Strip of trailing ' '
 foreach (keys %lib_obj) { $lib_obj{$_}=&clean_up_ws($lib_obj{$_}); }
@@ -415,8 +568,8 @@ chop($h); $header=$h;
 $defs.=&do_defs("HEADER",$header,"\$(INCL_D)",".h");
 $rules.=&do_copy_rule("\$(INCL_D)",$header,".h");
 
-$defs.=&do_defs("EXHEADER",$exheader,"\$(INC_D)",".h");
-$rules.=&do_copy_rule("\$(INC_D)",$exheader,".h");
+$defs.=&do_defs("EXHEADER",$exheader,"\$(INCO_D)",".h");
+$rules.=&do_copy_rule("\$(INCO_D)",$exheader,".h");
 
 $defs.=&do_defs("T_OBJ",$test,"\$(OBJ_D)",$obj);
 $rules.=&do_compile_rule("\$(OBJ_D)",$test,"\$(APP_CFLAGS)");
@@ -427,6 +580,7 @@ $rules.=&do_compile_rule("\$(OBJ_D)",$e_exe,'-DMONOLITH $(APP_CFLAGS)');
 foreach (values %lib_nam)
        {
        $lib_obj=$lib_obj{$_};
+       local($slib)=$shlib;
 
        if (($_ eq "SSL") && $no_ssl2 && $no_ssl3)
                {
@@ -434,32 +588,74 @@ foreach (values %lib_nam)
                next;
                }
 
-       if (($_ eq "RSAGLUE") && $no_rsa)
+       if (($bn_asm_obj ne "") && ($_ eq "CRYPTO"))
                {
-               $rules.="\$(O_RSAGLUE):\n\n"; 
-               next;
+               $lib_obj =~ s/\s\S*\/bn_asm\S*/ \$(BN_ASM_OBJ)/;
+               $rules.=&do_asm_rule($bn_asm_obj,$bn_asm_src);
                }
-
-       if (($bn_mulw_obj ne "") && ($_ eq "CRYPTO"))
+       if (($bnco_asm_obj ne "") && ($_ eq "CRYPTO"))
                {
-               $lib_obj =~ s/\S*bn_mulw\S*/\$(BN_MULW_OBJ)/;
-               $rules.=&do_asm_rule($bn_mulw_obj,$bn_mulw_src);
+               $lib_obj .= "\$(BNCO_ASM_OBJ)";
+               $rules.=&do_asm_rule($bnco_asm_obj,$bnco_asm_src);
                }
        if (($des_enc_obj ne "") && ($_ eq "CRYPTO"))
                {
-               $lib_obj =~ s/\S*des_enc\S*/\$(DES_ENC_OBJ)/;
-               $lib_obj =~ s/\S*fcrypt_b\S*\s*//;
+               $lib_obj =~ s/\s\S*des_enc\S*/ \$(DES_ENC_OBJ)/;
+               $lib_obj =~ s/\s\S*\/fcrypt_b\S*\s*/ /;
                $rules.=&do_asm_rule($des_enc_obj,$des_enc_src);
                }
        if (($bf_enc_obj ne "") && ($_ eq "CRYPTO"))
                {
-               $lib_obj =~ s/\S*bf_enc\S*/\$(BF_ENC_OBJ)/;
+               $lib_obj =~ s/\s\S*\/bf_enc\S*/ \$(BF_ENC_OBJ)/;
                $rules.=&do_asm_rule($bf_enc_obj,$bf_enc_src);
                }
+       if (($cast_enc_obj ne "") && ($_ eq "CRYPTO"))
+               {
+               $lib_obj =~ s/(\s\S*\/c_enc\S*)/ \$(CAST_ENC_OBJ)/;
+               $rules.=&do_asm_rule($cast_enc_obj,$cast_enc_src);
+               }
+       if (($rc4_enc_obj ne "") && ($_ eq "CRYPTO"))
+               {
+               $lib_obj =~ s/\s\S*\/rc4_enc\S*/ \$(RC4_ENC_OBJ)/;
+               $rules.=&do_asm_rule($rc4_enc_obj,$rc4_enc_src);
+               }
+       if (($rc5_enc_obj ne "") && ($_ eq "CRYPTO"))
+               {
+               $lib_obj =~ s/\s\S*\/rc5_enc\S*/ \$(RC5_ENC_OBJ)/;
+               $rules.=&do_asm_rule($rc5_enc_obj,$rc5_enc_src);
+               }
+       if (($md5_asm_obj ne "") && ($_ eq "CRYPTO"))
+               {
+               $lib_obj =~ s/\s(\S*\/md5_dgst\S*)/ $1 \$(MD5_ASM_OBJ)/;
+               $rules.=&do_asm_rule($md5_asm_obj,$md5_asm_src);
+               }
+       if (($sha1_asm_obj ne "") && ($_ eq "CRYPTO"))
+               {
+               $lib_obj =~ s/\s(\S*\/sha1dgst\S*)/ $1 \$(SHA1_ASM_OBJ)/;
+               $rules.=&do_asm_rule($sha1_asm_obj,$sha1_asm_src);
+               }
+       if (($rmd160_asm_obj ne "") && ($_ eq "CRYPTO"))
+               {
+               $lib_obj =~ s/\s(\S*\/rmd_dgst\S*)/ $1 \$(RMD160_ASM_OBJ)/;
+               $rules.=&do_asm_rule($rmd160_asm_obj,$rmd160_asm_src);
+               }
        $defs.=&do_defs(${_}."OBJ",$lib_obj,"\$(OBJ_D)",$obj);
-       $rules.=&do_compile_rule("\$(OBJ_D)",$lib_obj{$_},"\$(LIB_CFLAGS)");
+       $lib=($slib)?" \$(SHLIB_CFLAGS)".$shlib_ex_cflags{$_}:" \$(LIB_CFLAGS)";
+       $rules.=&do_compile_rule("\$(OBJ_D)",$lib_obj{$_},$lib);
        }
 
+# hack to add version info on MSVC
+if (($platform eq "VC-WIN32") || ($platform eq "VC-NT")) {
+    $rules.= <<"EOF";
+\$(OBJ_D)\\\$(CRYPTO).res: ms\\version32.rc
+       \$(RSC) /fo"\$(OBJ_D)\\\$(CRYPTO).res" /d CRYPTO ms\\version32.rc
+
+\$(OBJ_D)\\\$(SSL).res: ms\\version32.rc
+       \$(RSC) /fo"\$(OBJ_D)\\\$(SSL).res" /d SSL ms\\version32.rc
+
+EOF
+}
+
 $defs.=&do_defs("T_EXE",$test,"\$(TEST_D)",$exep);
 foreach (split(/\s+/,$test))
        {
@@ -468,14 +664,20 @@ foreach (split(/\s+/,$test))
        $rules.=&do_link_rule("\$(TEST_D)$o$t$exep",$tt,"\$(LIBS_DEP)","\$(L_LIBS) \$(EX_LIBS)");
        }
 
-$rules.= &do_lib_rule("\$(SSLOBJ)","\$(O_SSL)",$ssl,$shlib);
-$rules.= &do_lib_rule("\$(RSAGLUEOBJ)","\$(O_RSAGLUE)",$RSAglue,0)
-       unless $no_rsa;
-$rules.= &do_lib_rule("\$(CRYPTOOBJ)","\$(O_CRYPTO)",$crypto,$shlib);
+$rules.= &do_lib_rule("\$(SSLOBJ)","\$(O_SSL)",$ssl,$shlib,"\$(SO_SSL)");
+$rules.= &do_lib_rule("\$(CRYPTOOBJ)","\$(O_CRYPTO)",$crypto,$shlib,"\$(SO_CRYPTO)");
 
 $rules.=&do_link_rule("\$(BIN_D)$o\$(E_EXE)$exep","\$(E_OBJ)","\$(LIBS_DEP)","\$(L_LIBS) \$(EX_LIBS)");
 
 print $defs;
+
+if ($platform eq "linux-elf") {
+    print <<"EOF";
+# Generate perlasm output files
+%.cpp:
+       (cd \$(\@D)/..; PERL=perl make -f Makefile.ssl asm/\$(\@F))
+EOF
+}
 print "###################################################################\n";
 print $rules;
 
@@ -488,13 +690,18 @@ sub var_add
        local($dir,$val)=@_;
        local(@a,$_,$ret);
 
+       return("") if $no_engine && $dir =~ /\/engine/;
+       return("") if $no_hw   && $dir =~ /\/hw/;
        return("") if $no_idea && $dir =~ /\/idea/;
+       return("") if $no_aes  && $dir =~ /\/aes/;
        return("") if $no_rc2  && $dir =~ /\/rc2/;
        return("") if $no_rc4  && $dir =~ /\/rc4/;
+       return("") if $no_rc5  && $dir =~ /\/rc5/;
        return("") if $no_rsa  && $dir =~ /\/rsa/;
        return("") if $no_rsa  && $dir =~ /^rsaref/;
        return("") if $no_dsa  && $dir =~ /\/dsa/;
        return("") if $no_dh   && $dir =~ /\/dh/;
+       return("") if $no_ec   && $dir =~ /\/ec/;
        if ($no_des && $dir =~ /\/des/)
                {
                if ($val =~ /read_pwd/)
@@ -505,6 +712,7 @@ sub var_add
        return("") if $no_mdc2 && $dir =~ /\/mdc2/;
        return("") if $no_sock && $dir =~ /\/proxy/;
        return("") if $no_bf   && $dir =~ /\/bf/;
+       return("") if $no_cast && $dir =~ /\/cast/;
 
        $val =~ s/^\s*(.*)\s*$/$1/;
        @a=split(/\s+/,$val);
@@ -512,9 +720,12 @@ sub var_add
 
        @a=grep(!/^e_.*_3d$/,@a) if $no_des;
        @a=grep(!/^e_.*_d$/,@a) if $no_des;
-       @a=grep(!/^e_.*_i$/,@a) if $no_idea;
+       @a=grep(!/^e_.*_ae$/,@a) if $no_idea;
+       @a=grep(!/^e_.*_i$/,@a) if $no_aes;
        @a=grep(!/^e_.*_r2$/,@a) if $no_rc2;
+       @a=grep(!/^e_.*_r5$/,@a) if $no_rc5;
        @a=grep(!/^e_.*_bf$/,@a) if $no_bf;
+       @a=grep(!/^e_.*_c$/,@a) if $no_cast;
        @a=grep(!/^e_rc4$/,@a) if $no_rc4;
 
        @a=grep(!/(^s2_)|(^s23_)/,@a) if $no_ssl2;
@@ -523,7 +734,9 @@ sub var_add
        @a=grep(!/(_sock$)|(_acpt$)|(_conn$)|(^pxy_)/,@a) if $no_sock;
 
        @a=grep(!/(^md2)|(_md2$)/,@a) if $no_md2;
+       @a=grep(!/(^md4)|(_md4$)/,@a) if $no_md4;
        @a=grep(!/(^md5)|(_md5$)/,@a) if $no_md5;
+       @a=grep(!/(rmd)|(ripemd)/,@a) if $no_ripemd;
 
        @a=grep(!/(^d2i_r_)|(^i2d_r_)/,@a) if $no_rsa;
        @a=grep(!/(^p_open$)|(^p_seal$)/,@a) if $no_rsa;
@@ -540,7 +753,9 @@ sub var_add
        @a=grep(!/(^sha1)|(_sha1$)|(m_dss1$)/,@a) if $no_sha1;
        @a=grep(!/_mdc2$/,@a) if $no_mdc2;
 
-       @a=grep(!/(^rsa$)|(^genrsa$)|(^req$)|(^ca$)/,@a) if $no_rsa;
+       @a=grep(!/^engine$/,@a) if $no_engine;
+       @a=grep(!/^hw$/,@a) if $no_hw;
+       @a=grep(!/(^rsa$)|(^genrsa$)/,@a) if $no_rsa;
        @a=grep(!/(^dsa$)|(^gendsa$)|(^dsaparam$)/,@a) if $no_dsa;
        @a=grep(!/^gendsa$/,@a) if $no_sha1;
        @a=grep(!/(^dh$)|(^gendh$)/,@a) if $no_dh;
@@ -567,7 +782,7 @@ sub clean_up_ws
 sub do_defs
        {
        local($var,$files,$location,$postfix)=@_;
-       local($_,$ret);
+       local($_,$ret,$pf);
        local(*OUT,$tmp,$t);
 
        $files =~ s/\//$o/g if $o ne '/';
@@ -576,23 +791,39 @@ sub do_defs
        $Vars{$var}.="";
        foreach (split(/ /,$files))
                {
+               $orig=$_;
                $_=&bname($_) unless /^\$/;
                if ($n++ == 2)
                        {
                        $n=0;
                        $ret.="\\\n\t";
                        }
-               if ($_ =~ /BN_MULW/)
-                       { $t="$_ "; }
-               elsif ($_ =~ /DES_ENC/)
-                       { $t="$_ "; }
-               elsif ($_ =~ /BF_ENC/)
-                       { $t="$_ "; }
-               else    { $t="$location${o}$_$postfix "; }
+               if (($_ =~ /bss_file/) && ($postfix eq ".h"))
+                       { $pf=".c"; }
+               else    { $pf=$postfix; }
+               if ($_ =~ /BN_ASM/)     { $t="$_ "; }
+               elsif ($_ =~ /BNCO_ASM/){ $t="$_ "; }
+               elsif ($_ =~ /DES_ENC/) { $t="$_ "; }
+               elsif ($_ =~ /BF_ENC/)  { $t="$_ "; }
+               elsif ($_ =~ /CAST_ENC/){ $t="$_ "; }
+               elsif ($_ =~ /RC4_ENC/) { $t="$_ "; }
+               elsif ($_ =~ /RC5_ENC/) { $t="$_ "; }
+               elsif ($_ =~ /MD5_ASM/) { $t="$_ "; }
+               elsif ($_ =~ /SHA1_ASM/){ $t="$_ "; }
+               elsif ($_ =~ /RMD160_ASM/){ $t="$_ "; }
+               else    { $t="$location${o}$_$pf "; }
 
                $Vars{$var}.="$t ";
                $ret.=$t;
                }
+       # hack to add version info on MSVC
+       if ($shlib && ($platform eq "VC-WIN32") || ($platform eq "VC-NT"))
+               {
+               if ($var eq "CRYPTOOBJ")
+                       { $ret.="\$(OBJ_D)\\\$(CRYPTO).res "; }
+               elsif ($var eq "SSLOBJ")
+                       { $ret.="\$(OBJ_D)\\\$(SSL).res "; }
+               }
        chop($ret);
        $ret.="\n\n";
        return($ret);
@@ -606,20 +837,6 @@ sub bname
        return($ret);
        }
 
-# do a rule for each file that says 'copy' to new direcory on change
-sub do_copy_rule
-       {
-       local($to,$files,$p)=@_;
-       local($ret,$_,$n);
-       
-       $files =~ s/\//$o/g if $o ne '/';
-       foreach (split(/\s+/,$files))
-               {
-               $n=&bname($_);
-               $ret.="$to${o}$n$p: \$(SRC_D)$o$_$p\n\t\$(CP) \$(SRC_D)$o$_$p $to${o}$n$p\n\n";
-               }
-       return($ret);
-       }
 
 ##############################################################
 # do a rule for each file that says 'compile' to new direcory
@@ -645,8 +862,7 @@ sub cc_compile_target
        local($target,$source,$ex_flags)=@_;
        local($ret);
        
-       # EAY EAY
-       $ex_flags.=' -DCFLAGS="\"$(CC) $(CFLAG)\""' if ($source =~ /cversion/);
+       $ex_flags.=" -DMK1MF_BUILD -D$platform_cpp_symbol" if ($source =~ /cversion/);
        $target =~ s/\//$o/g if $o ne "/";
        $source =~ s/\//$o/g if $o ne "/";
        $ret ="$target: \$(SRC_D)$o$source\n\t";
@@ -690,3 +906,137 @@ sub do_shlib_rule
        return($ret);
        }
 
+# do a rule for each file that says 'copy' to new direcory on change
+sub do_copy_rule
+       {
+       local($to,$files,$p)=@_;
+       local($ret,$_,$n,$pp);
+       
+       $files =~ s/\//$o/g if $o ne '/';
+       foreach (split(/\s+/,$files))
+               {
+               $n=&bname($_);
+               if ($n =~ /bss_file/)
+                       { $pp=".c"; }
+               else    { $pp=$p; }
+               $ret.="$to${o}$n$pp: \$(SRC_D)$o$_$pp\n\t\$(CP) \$(SRC_D)$o$_$pp $to${o}$n$pp\n\n";
+               }
+       return($ret);
+       }
+
+sub read_options
+       {
+       # Many options are handled in a similar way. In particular
+       # no-xxx sets zero or more scalars to 1.
+       # Process these using a hash containing the option name and
+       # reference to the scalars to set.
+
+       my %valid_options = (
+               "no-rc2" => \$no_rc2,
+               "no-rc4" => \$no_rc4,
+               "no-rc5" => \$no_rc5,
+               "no-idea" => \$no_idea,
+               "no-aes" => \$no_aes,
+               "no-des" => \$no_des,
+               "no-bf" => \$no_bf,
+               "no-cast" => \$no_cast,
+               "no-md2" => \$no_md2,
+               "no-md4" => \$no_md4,
+               "no-md5" => \$no_md5,
+               "no-sha" => \$no_sha,
+               "no-sha1" => \$no_sha1,
+               "no-ripemd" => \$no_ripemd,
+               "no-mdc2" => \$no_mdc2,
+               "no-patents" => 
+                       [\$no_rc2, \$no_rc4, \$no_rc5, \$no_idea, \$no_rsa],
+               "no-rsa" => \$no_rsa,
+               "no-dsa" => \$no_dsa,
+               "no-dh" => \$no_dh,
+               "no-hmac" => \$no_hmac,
+               "no-aes" => \$no_aes,
+               "no-asm" => \$no_asm,
+               "nasm" => \$nasm,
+               "nw-nasm" => \$nw_nasm,
+               "nw-mwasm" => \$nw_mwasm,
+               "gaswin" => \$gaswin,
+               "no-ssl2" => \$no_ssl2,
+               "no-ssl3" => \$no_ssl3,
+               "no-err" => \$no_err,
+               "no-sock" => \$no_sock,
+               "no-krb5" => \$no_krb5,
+               "no-ec" => \$no_ec,
+               "no-ecdsa" => \$no_ecdsa,
+               "no-ecdh" => \$no_ecdh,
+               "no-engine" => \$no_engine,
+               "no-hw" => \$no_hw,
+               "just-ssl" =>
+                       [\$no_rc2, \$no_idea, \$no_des, \$no_bf, \$no_cast,
+                         \$no_md2, \$no_sha, \$no_mdc2, \$no_dsa, \$no_dh,
+                         \$no_ssl2, \$no_err, \$no_ripemd, \$no_rc5,
+                         \$no_aes],
+               "rsaref" => 0,
+               "gcc" => \$gcc,
+               "debug" => \$debug,
+               "profile" => \$profile,
+               "shlib" => \$shlib,
+               "dll" => \$shlib,
+               "shared" => 0,
+               "no-gmp" => 0,
+               "no-shared" => 0,
+               "no-zlib" => 0,
+               "no-zlib-dynamic" => 0,
+               );
+
+       if (exists $valid_options{$_})
+               {
+               my $r = $valid_options{$_};
+               if ( ref $r eq "SCALAR")
+                       { $$r = 1;}
+               elsif ( ref $r eq "ARRAY")
+                       {
+                       my $r2;
+                       foreach $r2 (@$r)
+                               {
+                               $$r2 = 1;
+                               }
+                       }
+               }
+       elsif (/^enable-zlib$/) { $xcflags = "-DZLIB $xcflags"; }
+       elsif (/^enable-zlib-dynamic$/)
+               {
+               $xcflags = "-DZLIB_SHARED -DZLIB $xcflags";
+               }
+       # There are also enable-xxx options which correspond to
+       # the no-xxx. Since the scalars are enabled by default
+       # these can be ignored.
+       elsif (/^enable-/)
+               {
+               my $t = $_;
+               $t =~ s/^enable/no/;
+               if (exists $valid_options{$t})
+                       {return 1;}
+               return 0;
+               }
+       elsif (/^--with-krb5-flavor=(.*)$/)
+               {
+               my $krb5_flavor = $1;
+               if ($krb5_flavor =~ /^force-[Hh]eimdal$/)
+                       {
+                       $xcflags="-DKRB5_HEIMDAL $xcflags";
+                       }
+               elsif ($krb5_flavor =~ /^MIT/i)
+                       {
+                       $xcflags="-DKRB5_MIT $xcflags";
+                       if ($krb5_flavor =~ /^MIT[._-]*1[._-]*[01]/i)
+                               {
+                               $xcflags="-DKRB5_MIT_OLD11 $xcflags"
+                               }
+                       }
+               }
+       elsif (/^([^=]*)=(.*)$/){ $VARS{$1}=$2; }
+       elsif (/^-[lL].*$/)     { $l_flags.="$_ "; }
+       elsif ((!/^-help/) && (!/^-h/) && (!/^-\?/) && /^-.*$/)
+               { $c_flags.="$_ "; }
+       else { return(0); }
+       return(1);
+       }