X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=Configure;h=d8dcf8f0a0b9daa14b90b2a42f52c9ba94ed7738;hp=80f0b7680a70d872d823f4e792cdde998008c3f3;hb=5c1d0b314aa2a9c801da935bdd3746757d5c6076;hpb=1656ef299750ea22779a4e6edd99bdd913dc22f0

diff --git a/Configure b/Configure
index 80f0b7680a..d8dcf8f0a0 100755
--- a/Configure
+++ b/Configure
@@ -98,6 +98,7 @@ my %table=(
 "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:-DBIO_PAIR_DEBUG -DL_ENDIAN -DREF_CHECK -DCRYPTO_MDEBUG_ALL -g -m486 -Wall::-D_REENTRANT::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
+"debug-ulf",	"gcc:-DL_ENDIAN -DREF_CHECK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -O2 -m486 -Wall  -pedantic -Wall -Wshadow -pipe::-D_REENTRANT::$x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
 "dist",		"cc:-O::(unknown):::::",
 
 # Basic configs that should work on any box
@@ -211,7 +212,7 @@ my %table=(
 "NetBSD-sparc",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
 "NetBSD-m68",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
 "NetBSD-x86",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:",
-#"FreeBSD",   "gcc:-DTERMIOS -DL_ENDIAN -D_ANSI_SOURCE -fomit-frame-pointer -O3 -m486 -Wall:(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
+"FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
 "FreeBSD",      "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
 "bsdi-gcc",     "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown)::RSA_LLONG $x86_gcc_des $x86_gcc_opts:$x86_bsdi_asm",
 "bsdi-elf-gcc",     "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
@@ -337,7 +338,7 @@ my $ranlib;
 my $perl;
 
 $ranlib=&which("ranlib") or $ranlib="true";
-$perl=&which("perl5") or $perl=&which("perl") or $perl="perl";
+$perl=$ENV{'PERL'} or &which("perl5") or $perl=&which("perl") or $perl="perl";
 
 &usage if ($#ARGV < 0);
 
@@ -364,6 +365,12 @@ foreach (@ARGV)
 		$algo =~ tr/[a-z]/[A-Z]/;
 		$flags .= "-DNO_$algo ";
 		$depflags .= "-DNO_$algo ";
+		if ($algo eq "DES")
+			{
+			$options .= " no-mdc2";
+			$flags .= "-DNO_MDC2 ";
+			$depflags .= "-DNO_MDC2 ";
+			}
 		}
 	elsif (/^386$/)
 		{ $processor=386; }
@@ -708,14 +715,17 @@ print "BF_PTR2 used\n" if $bf_ptr == 2;
 if($IsWindows) {
 	open (OUT,">crypto/buildinf.h") || die "Can't open buildinf.h";
 	printf OUT <<EOF;
-/* auto-generated by Configure for crypto/cversion.c */
-/* (Unix builds: auto-generated by crypto/Makefile.ssl) */
-#define CFLAGS "$cc $cflags"
-#define PLATFORM "$target"
+#ifndef MK1MF_BUILD
+  /* auto-generated by Configure for crypto/cversion.c:
+   * for Unix builds, crypto/Makefile.ssl generates functional definitions;
+   * Windows builds (and other mk1mf builds) compile cversion.c with
+   * -DMK1MF_BUILD and use definitions added to this file by util/mk1mf.pl. */
+  #error "Windows builds (PLATFORM=$target) use mk1mf.pl-created Makefiles"
+#endif
 EOF
-	printf OUT "#define DATE \"%s\"\n", scalar gmtime();
 	close(OUT);
-	system "perl crypto/objects/obj_dat.pl <crypto/objects/objects.h >crypto/objects/obj_dat.h";
+
+	system "perl crypto/objects/obj_dat.pl crypto/objects/objects.h crypto/objects/obj_dat.h";
 } else {
 	(system "make -f Makefile.ssl PERL=\'$perl\' links") == 0 or exit $?;
 	### (system 'make depend') == 0 or exit $? if $depflags ne "";
@@ -730,38 +740,38 @@ EOF
 	}	    
 }
 
-my $pwd;
-
-if($IsWindows) {
-	$pwd="(current directory)";
-} else {
-	$pwd =`pwd`;
-	chop($pwd);
-}
-print <<EOF;
-
-NOTE: The OpenSSL header files have been moved from include/*.h
-to include/openssl/*.h.  To include OpenSSL header files, now
-directives of the form
-     #include <openssl/foo.h>
-should be used instead of #include <foo.h>.
-These new file locations allow installing the OpenSSL header
-files in /usr/local/include/openssl/ and should help avoid
-conflicts with other libraries.
-
-To compile programs that use the old form <foo.h>,
-usually an additional compiler option will suffice: E.g., add
-     -I$prefix/include/openssl
-or
-     -I$pwd/include/openssl
-to the CFLAGS in the Makefile of the program that you want to compile
-(and leave all the original -I...'s in place!).
-
-Please make sure that no old OpenSSL header files are around:
-The include directory should now be empty except for the openssl
-subdirectory.
-
-EOF
+# my $pwd;
+# 
+# if($IsWindows) {
+# 	$pwd="(current directory)";
+# } else {
+# 	$pwd =`pwd`;
+# 	chop($pwd);
+# }
+# print <<EOF;
+# 
+# NOTE: The OpenSSL header files have been moved from include/*.h
+# to include/openssl/*.h.  To include OpenSSL header files, now
+# directives of the form
+#      #include <openssl/foo.h>
+# should be used instead of #include <foo.h>.
+# These new file locations allow installing the OpenSSL header
+# files in /usr/local/include/openssl/ and should help avoid
+# conflicts with other libraries.
+# 
+# To compile programs that use the old form <foo.h>,
+# usually an additional compiler option will suffice: E.g., add
+#      -I$prefix/include/openssl
+# or
+#      -I$pwd/include/openssl
+# to the CFLAGS in the Makefile of the program that you want to compile
+# (and leave all the original -I...'s in place!).
+# 
+# Please make sure that no old OpenSSL header files are around:
+# The include directory should now be empty except for the openssl
+# subdirectory.
+# 
+# EOF
 
 print <<\EOF if (!$no_threads && !$threads);