I386_ONLY is defined in opensslconf.h, so we need to include it.

[openssl.git] / Configure

diff --git a/Configure b/Configure
index 2cc831a8772fb84fc332bc47e7d0bbf3404cc688..60b1167897ed1b5d2e9b63124a1626506fa588cc 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -97,6 +97,7 @@ my %table=(
 "debug-ben-debug",     "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe:(unknown):::::",
 "debug-ben-strict",    "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe:(unknown):::::",
 "debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall:(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
+"debug-bodo",  "gcc:-DL_ENDIAN -O3 -g -m486 -Wall:-D_REENTRANT::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
 "dist",                "cc:-O:(unknown):::::",
 
 # Basic configs that should work on any box
@@ -134,8 +135,8 @@ my %table=(
 "irix-mips3-gcc","gcc:-mips3 -O2 -DTERMIOS -DB_ENDIAN:(unknown)::MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR SIXTY_FOUR_BIT:::",
 "irix-mips3-cc", "cc:-n32 -mips3 -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN:(unknown)::DES_PTR DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT:::",
 "debug-irix-cc", "cc:-w2 -g -DCRYPTO_MDEBUG -DTERMIOS -DB_ENDIAN:(unknown):::::",
-# This is the n64 mode build. (Untested!)
-"irix64-mips4-cc", "cc:-64 -mips4 -O2 -use_readonly_const -DTERMIOS:(unknown)::DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT:::",
+# This is the n64 mode build.
+"irix64-mips4-cc", "cc:-64 -mips4 -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN:(unknown)::DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG:::",
 
 # HPUX 9.X config.
 # Don't use the bundled cc.  It is broken.  Use HP ANSI C if possible, or gcc.
@@ -221,7 +222,10 @@ my %table=(
 # SCO cc.
 "sco5-cc",  "cc::(unknown):-lsocket:$x86_gcc_des ${x86_gcc_opts}:::", # des options?
 
-# Sinix RM400
+# Sinix/ReliantUNIX RM400
+# NOTE: The CDS++ Compiler up to V2.0Bsomething has the IRIX_CC_BUG optimizer problem. Better use -g  */
+"ReliantUNIX","cc:-KPIC -g -DSNI -DTERMIOS -DB_ENDIAN:-Kthread:-lsocket -lnsl -lc -L/usr/ucblib -lucb:BN_LLONG DES_PTR DES_RISC2 DES_UNROLL BF_PTR:::",
+"SINIX","cc:-O -DSNI:(unknown):-lsocket -lnsl -lc -L/usr/ucblib -lucb:RC4_INDEX RC4_CHAR:::",
 "SINIX-N","/usr/ucb/cc:-O2 -misaligned:(unknown):-lucb:RC4_INDEX RC4_CHAR:::",
 
 # Windows NT, Microsoft Visual C++ 4.0
@@ -452,7 +456,7 @@ while (<IN>)
        }
 close(IN);
 
-if ($version =~ /(^[0-9]*)\.([\0-9\.]*)/)
+if ($version =~ /(^[0-9]*)\.([0-9\.]*)/)
        {
        $major=$1;
        $minor=$2;
@@ -646,6 +650,12 @@ if($IsWindows) {
        # Run "make depend" manually if you want to be able to delete
        # the source code files of ciphers you left out.
        &dofile("tools/c_rehash",$openssldir,'^DIR=',   'DIR=%s',);
+       if ( $perl =~ m@^/@) {
+           &dofile("apps/der_chop",$perl,'^#!/', '#!%s');
+       } else {
+           # No path for Perl known ...
+           &dofile("apps/der_chop",'/usr/local/bin/perl','^#!/', '#!%s');
+       }           
 }
 
 my $pwd;