X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=Configure;h=3dc6a429994c2ed7f043c5f24b8e45a62cc8b843;hp=941b4aa3d484e014f76a8a9b8330997e875f6715;hb=ce023e77d7b208016276157fa14a6e2636649e85;hpb=2e963849b7ec501e4f2d6ffee31e08b2643b6e11 diff --git a/Configure b/Configure index 941b4aa3d4..3dc6a42999 100755 --- a/Configure +++ b/Configure @@ -80,7 +80,7 @@ my $usage="Usage: Configure [no- ...] [enable- ...] [experimenta # Minimum warning options... any contributions to OpenSSL should at least get # past these. -my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Wtype-limits -Werror -DREF_CHECK -DDEBUG_UNUSED"; +my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Wtype-limits -Werror -DREF_DEBUG -DDEBUG_UNUSED"; # These are used in addition to $gcc_devteam_warn when the compiler is clang. # TODO(openssl-team): fix problems and investigate if (at least) the @@ -91,9 +91,6 @@ my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare # -Wextended-offsetof my $clang_devteam_warn = "-Wno-unused-parameter -Wno-missing-field-initializers -Wno-language-extension-token -Wno-extended-offsetof -Wconditional-uninitialized -Qunused-arguments -Wincompatible-pointer-types-discards-qualifiers -Wmissing-variable-declarations"; -# Warn that "make depend" should be run? -my $warn_make_depend = 0; - # These are used in addition to $gcc_devteam_warn unless this is a mingw build. # This adds backtrace information to the memory leak info. my $memleak_devteam_backtrace = "-rdynamic -DCRYPTO_MDEBUG_BACKTRACE"; @@ -212,7 +209,7 @@ $config{sdirs} = [ "bn", "ec", "rsa", "dsa", "dh", "dso", "engine", "buffer", "bio", "stack", "lhash", "rand", "err", "evp", "asn1", "pem", "x509", "x509v3", "conf", "txt_db", "pkcs7", "pkcs12", "comp", "ocsp", "ui", - "cms", "ts", "jpake", "srp", "store", "cmac", "ct", "async", "kdf" + "cms", "ts", "jpake", "srp", "cmac", "ct", "async", "kdf" ]; # Known TLS and DTLS protocols @@ -294,7 +291,6 @@ my @disablables = ( "ssl-trace", "static-engine", "stdio", - "store", "threads", "tls", "unit-test", @@ -319,11 +315,10 @@ my %disabled = ( # "what" => "comment" [or special keyword "experimental "sctp" => "default", "shared" => "default", "ssl-trace" => "default", - "store" => "experimental", "unit-test" => "default", "zlib" => "default", - "zlib-dynamic" => "default", "crypto-mdebug" => "default", + "heartbeats" => "default", ); my @experimental = (); @@ -385,13 +380,13 @@ while ((my $first, my $second) = (shift @list, shift @list)) { unshift @list, $second; } -# Construct the string of what $config{depflags} should look like with the defaults -# from %disabled above. (we need this to see if we should advise the user -# to run "make depend"): -my $default_depflags = join(" ", - map { my $x = $_; $x =~ tr{[a-z]-}{[A-Z]_}; "-DOPENSSL_NO_$x"; } - grep { $disabled{$_} !~ /\(no-depflags\)$/ } - sort keys %disabled); +# Construct the string of what $config{depdefines} should look like with +# the defaults from %disabled above. (we need this to see if we should +# advise the user to run "make depend"): +my @default_depdefines = + map { my $x = $_; $x =~ tr{[a-z]-}{[A-Z]_}; "OPENSSL_NO_$x"; } + grep { $disabled{$_} !~ /\(no-depdefines\)$/ } + sort keys %disabled; # Explicit "no-..." options will be collected in %disabled along with the defaults. # To remove something from %disabled, use "enable-foo" (unless it's experimental). @@ -401,13 +396,24 @@ my $default_depflags = join(" ", # We will collect such requests in @experimental. # To avoid accidental use of experimental features, applications will have to use -DOPENSSL_EXPERIMENTAL_FOO. +my @generated_headers = ( + "include/openssl/opensslconf.h", + "crypto/include/internal/bn_conf.h" + ); + +my @generated_by_make_headers = ( + "crypto/buildinf.h" + ); + my $no_sse2=0; &usage if ($#ARGV < 0); -my $flags=""; -$config{depflags}=""; +my $user_cflags=""; +my @user_defines=(); +my $unified = 0; +$config{depdefines}=[]; $config{openssl_experimental_defines}=[]; $config{openssl_api_defines}=[]; $config{openssl_algorithm_defines}=[]; @@ -417,7 +423,6 @@ $config{openssl_other_defines}=[]; my $libs=""; my $target=""; $config{options}=""; -my $make_depend=0; my %withargs=(); my $build_prefix = "release_"; @@ -577,9 +582,15 @@ foreach (@argvcopy) } elsif (/^[-+]/) { - if (/^--prefix=(.*)$/) + if (/^--unified$/) + { + $unified=1; + } + elsif (/^--prefix=(.*)$/) { $config{prefix}=$1; + die "Directory given with --prefix MUST be absolute\n" + unless file_name_is_absolute($config{prefix}); } elsif (/^--api=(.*)$/) { @@ -625,10 +636,14 @@ foreach (@argvcopy) { $libs.=$_." "; } + elsif (/^-D(.*)$/) + { + push @user_defines, $1; + } else # common if (/^[-+]/), just pass down... { $_ =~ s/%([0-9a-f]{1,2})/chr(hex($1))/gei; - $flags.=$_." "; + $user_cflags.=$_." "; } } elsif ($_ =~ /^([^:]+):(.+)$/) @@ -749,7 +764,7 @@ foreach (sort (keys %disabled)) push @{$config{openssl_other_defines}}, "OPENSSL_NO_$ALGO"; print " OPENSSL_NO_$ALGO"; - if (/^err$/) { $flags .= "-DOPENSSL_NO_ERR "; } + if (/^err$/) { push @user_defines, "OPENSSL_NO_ERR"; } elsif (/^asm$/) { $no_asm = 1; } } else @@ -757,7 +772,7 @@ foreach (sort (keys %disabled)) ($ALGO,$algo) = ("RMD160","rmd160") if ($algo eq "ripemd"); push @{$config{openssl_algorithm_defines}}, "OPENSSL_NO_$ALGO"; - $config{depflags} .= " -DOPENSSL_NO_$ALGO"; + push @{$config{depdefines}}, "OPENSSL_NO_$ALGO"; print " OPENSSL_NO_$ALGO"; # fix-up crypto/directory name(s) @@ -772,8 +787,6 @@ foreach (sort (keys %disabled)) print "\n"; } -my $exp_cflags = ""; - foreach (sort @experimental) { my $ALGO; @@ -781,7 +794,6 @@ foreach (sort @experimental) # opensslconf.h will set OPENSSL_NO_... unless OPENSSL_EXPERIMENTAL_... is defined push @{$config{openssl_experimental_defines}}, "OPENSSL_NO_$ALGO"; - $exp_cflags .= " -DOPENSSL_EXPERIMENTAL_$ALGO"; } print "Configuring for $target\n"; @@ -814,17 +826,14 @@ my $make = $ENV{'MAKE'} || "make"; $config{cross_compile_prefix} = $ENV{'CROSS_COMPILE'} if $config{cross_compile_prefix} eq ""; -$config{prefix} = "/usr/local" if !$config{prefix}; -$config{openssldir} = "ssl" if !$config{openssldir}; -$config{openssldir} = catdir($config{prefix}, $config{openssldir}) - unless file_name_is_absolute($config{openssldir}); - # Allow environment CC to override compiler... $target{cc} = $ENV{CC} || $target{cc}; -# For cflags, lflags, plib_lflags and ex_libs, add the debug_ or release_ -# attributes. +# For cflags, lflags, plib_lflags, ex_libs and defines, add the debug_ +# or release_ attributes. # Do it in such a way that no spurious space is appended (hence the grep). +$config{defines} = [ @{$target{defines}}, + @{$target{$build_prefix."defines"}} ]; $config{cflags} = join(" ", grep { $_ ne "" } ($target{cflags}, $target{$build_prefix."cflags"})); @@ -846,27 +855,29 @@ $target{nm} = "nm"; $target{build_scheme} = [ $target{build_scheme} ] if ref($target{build_scheme}) ne "ARRAY"; +###### TO BE REMOVED BEFORE FINAL RELEASE +###### +###### If the user has chosen --unified, we give it to them. +if ($target{build_file} eq "Makefile" + && $target{build_scheme}->[0] eq "unixmake" + && $unified) { + $target{build_scheme} = [ "unified", "unix" ]; +} + my ($builder, $builder_platform, @builder_opts) = @{$target{build_scheme}}; -# if $config{prefix}/lib$target{multilib} is not an existing directory, then -# assume that it's not searched by linker automatically, in -# which case adding $target{multilib} suffix causes more grief than -# we're ready to tolerate, so don't... -$target{multilib}="" if !-d "$config{prefix}/lib$target{multilib}"; +push @{$config{defines}}, + map { (my $x = $_) =~ s/^OPENSSL_NO_/OPENSSL_EXPERIMENTAL_/; $x } + @{$config{openssl_experimental_defines}}; -$config{libdir}="lib$target{multilib}" if $config{libdir} eq ""; -$config{enginesdir}=$config{prefix} . "/" . $config{libdir} . "/engines"; - -$config{cflags} .= "$exp_cflags"; - -if ($target =~ /^mingw/ && `$target{cc} --target-help 2>&1` !~ m/-mno-cygwin/m) +if ($target =~ /^mingw/ && `$target{cc} --target-help 2>&1` =~ m/-mno-cygwin/m) { - $config{cflags} =~ s/-mno-cygwin\s*//; - $target{shared_ldflag} =~ s/-mno-cygwin\s*//; + $config{cflags} .= " -mno-cygwin"; + $target{shared_ldflag} .= " -mno-cygwin"; } -if ($target =~ /linux.*-mips/ && !$no_asm && $flags !~ /-m(ips|arch=)/) { +if ($target =~ /linux.*-mips/ && !$no_asm && $user_cflags !~ /-m(ips|arch=)/) { # minimally required architecture flags for assembly modules $config{cflags}="-mips2 $config{cflags}" if ($target =~ /mips32/); $config{cflags}="-mips3 $config{cflags}" if ($target =~ /mips64/); @@ -874,9 +885,12 @@ if ($target =~ /linux.*-mips/ && !$no_asm && $flags !~ /-m(ips|arch=)/) { my $no_shared_warn=0; my $no_user_cflags=0; +my $no_user_defines=0; -if ($flags ne "") { $config{cflags}="$flags$config{cflags}"; } +if ($user_cflags ne "") { $config{cflags}="$user_cflags$config{cflags}"; } else { $no_user_cflags=1; } +if (@user_defines) { $config{defines}=[ @user_defines, @{$config{defines}} ]; } +else { $no_user_defines=1; } # The DSO code currently always implements all functions so that no # applications will have to worry about that from a compilation point @@ -884,23 +898,23 @@ else { $no_user_cflags=1; } # has support compiled in for them. Currently each method is enabled # by a define "DSO_" ... we translate the "dso_scheme" config # string entry into using the following logic; -my $dso_cflags; if (!$no_dso && $target{dso_scheme} ne "") { $target{dso_scheme} =~ tr/[a-z]/[A-Z]/; if ($target{dso_scheme} eq "DLFCN") { - $dso_cflags = "-DDSO_DLFCN -DHAVE_DLFCN_H"; + $config{defines} = [ "DSO_DLFCN", "HAVE_DLFCN_H", + @{$config{defines}} ] } elsif ($target{dso_scheme} eq "DLFCN_NO_H") { - $dso_cflags = "-DDSO_DLFCN"; + $config{defines} = [ "DSO_DLFCN", @{$config{defines}} ] } else { - $dso_cflags = "-DDSO_$target{dso_scheme}"; + $config{defines} = [ "DSO_$target{dso_scheme}", + @{$config{defines}} ] } - $config{cflags} = "$dso_cflags $config{cflags}"; } my $thread_cflags = ""; @@ -915,37 +929,38 @@ if ($target{thread_cflag} eq "(unknown)" && $threads) # If the user asked for "threads", [s]he is also expected to # provide any system-dependent compiler options that are # necessary. - if ($no_user_cflags) + if ($no_user_cflags && $no_user_defines) { print "You asked for multi-threading support, but didn't\n"; print "provide any system-specific compiler options\n"; exit(1); } - $thread_cflags="-DOPENSSL_THREADS" ; push @thread_defines, "OPENSSL_THREADS"; } else { - $thread_cflags="-DOPENSSL_THREADS $target{thread_cflag}"; - push @thread_defines, "OPENSSL_THREADS"; + $thread_cflags=" $target{thread_cflag}"; + push @thread_defines, @{$target{thread_defines}}, "OPENSSL_THREADS"; } $config{ex_libs}="$libs$config{ex_libs}" if ($libs ne ""); if ($no_asm) { - $config{cflags}=~s/-D[BL]_ENDIAN// if ($config{fips}); + @{$config{defines}} = grep !/^[BL]_ENDIAN$/, @{$config{defines}} + if ($config{fips}); } if ($threads) { $config{cflags} = "$thread_cflags $config{cflags}" if $thread_cflags; + push @{$config{defines}}, @thread_defines; push @{$config{openssl_thread_defines}}, @thread_defines; } if ($zlib) { - $config{cflags} = "-DZLIB $config{cflags}"; + push @{$config{defines}}, "ZLIB"; if (defined($disabled{"zlib-dynamic"})) { if (defined($withargs{zlib_lib})) @@ -959,7 +974,7 @@ if ($zlib) } else { - $config{cflags} = "-DZLIB_SHARED $config{cflags}"; + push @{$config{defines}}, "ZLIB_SHARED"; } } @@ -977,7 +992,8 @@ if (!$config{no_shared}) { if ($target{shared_cflag} ne "") { - $config{cflags} = "$target{shared_cflag} -DOPENSSL_PIC $config{cflags}"; + push @{$config{defines}}, "OPENSSL_PIC"; + $config{cflags} = "$target{shared_cflag} $config{cflags}"; } } @@ -999,22 +1015,8 @@ if ($builder ne "mk1mf") # # Platform fix-ups # -# Unlike other OSes (like Solaris, Linux, Tru64, IRIX) BSD run-time -# linkers (tested OpenBSD, NetBSD and FreeBSD) "demand" RPATH set on -# .so objects. Apparently application RPATH is not global and does -# not apply to .so linked with other .so. Problem manifests itself -# when libssl.so fails to load libcrypto.so. One can argue that we -# should engrave this into Makefile.shared rules or into BSD-* config -# lines above. Meanwhile let's try to be cautious and pass -rpath to -# linker only when --prefix is not /usr. -if ($target =~ /^BSD-/) - { - $target{shared_ldflag}.=" -Wl,-rpath,\$\$(LIBRPATH)" if ($config{prefix} !~ m|^/usr[/]*$|); - } - if ($target{sys_id} ne "") { - #$config{cflags}="-DOPENSSL_SYS_$target{sys_id} $config{cflags}"; push @{$config{openssl_sys_defines}}, "OPENSSL_SYS_$target{sys_id}"; } @@ -1025,44 +1027,44 @@ if ($target{ranlib} eq "") if (!$no_asm) { $target{cpuid_asm_src}=$table{BASE}->{cpuid_asm_src} if ($config{processor} eq "386"); - $target{cpuid_asm_src}.=" uplink.c uplink-x86.s" if ($config{cflags} =~ /-DOPENSSL_USE_APPLINK/); + $target{cpuid_asm_src}.=" uplink.c uplink-x86.s" if (grep { $_ eq "OPENSSL_USE_APPLINK"} @{$config{defines}}); $target{bn_asm_src} =~ s/\w+-gf2m.c// if (defined($disabled{ec2m})); # bn-586 is the only one implementing bn_*_part_words - $config{cflags}.=" -DOPENSSL_BN_ASM_PART_WORDS" if ($target{bn_asm_src} =~ /bn-586/); - $config{cflags}.=" -DOPENSSL_IA32_SSE2" if (!$no_sse2 && $target{bn_asm_src} =~ /86/); + push @{$config{defines}}, "OPENSSL_BN_ASM_PART_WORDS" if ($target{bn_asm_src} =~ /bn-586/); + push @{$config{defines}}, "OPENSSL_IA32_SSE2" if (!$no_sse2 && $target{bn_asm_src} =~ /86/); - $config{cflags}.=" -DOPENSSL_BN_ASM_MONT" if ($target{bn_asm_src} =~ /-mont/); - $config{cflags}.=" -DOPENSSL_BN_ASM_MONT5" if ($target{bn_asm_src} =~ /-mont5/); - $config{cflags}.=" -DOPENSSL_BN_ASM_GF2m" if ($target{bn_asm_src} =~ /-gf2m/); + push @{$config{defines}}, "OPENSSL_BN_ASM_MONT" if ($target{bn_asm_src} =~ /-mont/); + push @{$config{defines}}, "OPENSSL_BN_ASM_MONT5" if ($target{bn_asm_src} =~ /-mont5/); + push @{$config{defines}}, "OPENSSL_BN_ASM_GF2m" if ($target{bn_asm_src} =~ /-gf2m/); if ($config{fips}) { push @{$config{openssl_other_defines}}, "OPENSSL_FIPS"; } if ($target{sha1_asm_src}) { - $config{cflags}.=" -DSHA1_ASM" if ($target{sha1_asm_src} =~ /sx86/ || $target{sha1_asm_src} =~ /sha1/); - $config{cflags}.=" -DSHA256_ASM" if ($target{sha1_asm_src} =~ /sha256/); - $config{cflags}.=" -DSHA512_ASM" if ($target{sha1_asm_src} =~ /sha512/); + push @{$config{defines}}, "SHA1_ASM" if ($target{sha1_asm_src} =~ /sx86/ || $target{sha1_asm_src} =~ /sha1/); + push @{$config{defines}}, "SHA256_ASM" if ($target{sha1_asm_src} =~ /sha256/); + push @{$config{defines}}, "SHA512_ASM" if ($target{sha1_asm_src} =~ /sha512/); } if ($target{md5_asm_src}) { - $config{cflags}.=" -DMD5_ASM"; + push @{$config{defines}}, "MD5_ASM"; } $target{cast_asm_src}=$table{BASE}->{cast_asm_src} if (!$config{no_shared}); # CAST assembler is not PIC if ($target{rmd160_asm_src}) { - $config{cflags}.=" -DRMD160_ASM"; + push @{$config{defines}}, "RMD160_ASM"; } if ($target{aes_asm_src}) { - $config{cflags}.=" -DAES_ASM" if ($target{aes_asm_src} =~ m/\baes-/);; + push @{$config{defines}}, "AES_ASM" if ($target{aes_asm_src} =~ m/\baes-/);; # aes-ctr.fake is not a real file, only indication that assembler # module implements AES_ctr32_encrypt... - $config{cflags}.=" -DAES_CTR_ASM" if ($target{aes_asm_src} =~ s/\s*aes-ctr\.fake//); + push @{$config{defines}}, "AES_CTR_ASM" if ($target{aes_asm_src} =~ s/\s*aes-ctr\.fake//); # aes-xts.fake indicates presence of AES_xts_[en|de]crypt... - $config{cflags}.=" -DAES_XTS_ASM" if ($target{aes_asm_src} =~ s/\s*aes-xts\.fake//); + push @{$config{defines}}, "AES_XTS_ASM" if ($target{aes_asm_src} =~ s/\s*aes-xts\.fake//); $target{aes_asm_src} =~ s/\s*(vpaes|aesni)-x86\.s//g if ($no_sse2); - $config{cflags}.=" -DVPAES_ASM" if ($target{aes_asm_src} =~ m/vpaes/); - $config{cflags}.=" -DBSAES_ASM" if ($target{aes_asm_src} =~ m/bsaes/); + push @{$config{defines}}, "VPAES_ASM" if ($target{aes_asm_src} =~ m/vpaes/); + push @{$config{defines}}, "BSAES_ASM" if ($target{aes_asm_src} =~ m/bsaes/); } if ($target{wp_asm_src} =~ /mmx/) { if ($config{processor} eq "386") { @@ -1072,13 +1074,13 @@ if (!$no_asm) { } } if ($target{modes_asm_src} =~ /ghash-/) { - $config{cflags}.=" -DGHASH_ASM"; + push @{$config{defines}}, "GHASH_ASM"; } if ($target{ec_asm_src} =~ /ecp_nistz256/) { - $config{cflags}.=" -DECP_NISTZ256_ASM"; + push @{$config{defines}}, "ECP_NISTZ256_ASM"; } if ($target{poly1305_asm_src} ne "") { - $config{cflags}.=" -DPOLY1305_ASM"; + push @{$config{defines}}, "POLY1305_ASM"; } } @@ -1131,9 +1133,9 @@ $config{cflags} =~ s/([\\\"])/\\\1/g; if (defined($config{api})) { $config{openssl_api_defines} = [ "OPENSSL_MIN_API=".$apitable->{$config{api}} ]; - my $apiflag = sprintf("-DOPENSSL_API_COMPAT=%s", $apitable->{$config{api}}); - $default_depflags .= " $apiflag"; - $config{cflags} .= " $apiflag"; + my $apiflag = sprintf("OPENSSL_API_COMPAT=%s", $apitable->{$config{api}}); + push @default_depdefines, $apiflag; + push @{$config{defines}}, $apiflag; } if ($strict_warnings) @@ -1489,9 +1491,15 @@ EOF foreach (@{$depends{$dest}}) { my $d = cleanfile($sourced, $_, $blddir); - # If it isn't found in the source, let's assume it's generated - # and that the Makefile template has the lines - if (! -f $d) { + # If we know it's generated, or assume it is because we can't + # find it in the source tree, we set file we depend on to be + # in the build tree rather than the source tree, and assume + # and that there are lines to build it in a BEGINRAW..ENDRAW + # section or in the Makefile template. + if (! -f $d + || !(grep { $d eq $_ } + map { cleanfile($srcdir, $_, $blddir) } + (@generated_headers, @generated_by_make_headers))) { $d = cleanfile($buildd, $_, $blddir); } # Take note if the file to depend on is being renamed @@ -1673,6 +1681,7 @@ EOF print "IsMK1MF =", ($builder eq "mk1mf" ? "yes" : "no"), "\n"; print "CC =$target{cc}\n"; print "CFLAG =$config{cflags}\n"; +print "DEFINES =",join(" ", @{$config{defines}}),"\n"; print "LFLAG =$config{lflags}\n"; print "PLIB_LFLAG =$config{plib_lflags}\n"; print "EX_LIBS =$config{ex_libs}\n"; @@ -1704,14 +1713,10 @@ print "THIRTY_TWO_BIT mode\n" if $config{b32}; print "BN_LLONG mode\n" if $config{bn_ll}; print "RC4 uses $config{rc4_int}\n" if $config{rc4_int} != $def_int; -mkpath(catdir($blddir, "include/openssl")); -run_dofile(catfile($blddir, "include/openssl/opensslconf.h"), - catfile($srcdir, "include/openssl/opensslconf.h.in")); - -mkpath(catdir($blddir, "crypto/include/internal")); -foreach my $alg ( 'bn' ) { - run_dofile(catfile($blddir, "crypto/include/internal/${alg}_conf.h"), - catfile($srcdir, "crypto/include/internal/${alg}_conf.h.in")); +for (@generated_headers) { + mkpath(catdir($blddir, dirname($_))); + run_dofile(catfile($blddir, $_), + catfile($srcdir, $_.".in")); } ### @@ -1754,53 +1759,18 @@ my %builders = ( run_dofile(catfile($blddir, $target{build_file}), $config{build_file_template}, catfile($srcdir, "Configurations", "common.tmpl")); - - my $make_command = "$make PERL=\'$config{perl}\'"; - my $make_targets = ""; - $make_targets .= " depend" - if $config{depflags} ne $default_depflags && $make_depend; - (system $make_command.$make_targets) == 0 - or die "make $make_targets failed" - if $make_targets ne ""; - if ($config{depflags} ne $default_depflags && !$make_depend) { - $warn_make_depend++; - } }, unixmake => sub { build_Makefile(); run_dofile("util/domd", "util/domd.in"); chmod 0755, "util/domd"; - - my $make_command = "$make PERL=\'$config{perl}\'"; - my $make_targets = ""; - $make_targets .= " depend" - if $config{depflags} ne $default_depflags && $make_depend; - (system $make_command.$make_targets) == 0 - or die "make $make_targets failed" - if $make_targets ne ""; - - if ($config{depflags} ne $default_depflags && !$make_depend) { - $warn_make_depend++; - } }, mk1mf => sub { my $platform = shift; # The only reason we do this is to have something to build MINFO from build_Makefile(); - open (OUT,">crypto/buildinf.h") || die "Can't open buildinf.h"; - printf OUT <<"EOF"; -#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 - close(OUT); - # create the ms/version32.rc file if needed if ($platform ne "netware") { my ($v1, $v2, $v3, $v4); @@ -1887,13 +1857,38 @@ shared libraries, please let us know (but please first make sure you have tried with a current version of OpenSSL). EOF -print <<"EOF" if ($warn_make_depend); +###### TO BE REMOVED BEFORE FINAL RELEASE +###### +###### If the user hasn't chosen --unified, try to nudge them. +if ($target{build_file} eq "Makefile" + && $target{build_scheme}->[0] eq "unixmake" + && !$unified) { + + my $plausible_builddir = + abs2rel(rel2abs("../_openssl-build_$target"),rel2abs(".")); + my $plausible_to_sourcedir = + abs2rel(rel2abs("."),rel2abs("../_openssl-build_$target")); + print <<"EOF"; -*** Because of configuration changes, you MUST do the following before -*** building: +---------------------------------------------------------------------- +Please consider configuring with the flag --unified . +It's to test out a new "unified" building system. + +One cool feature is that you can have your build directory elsewhere, +for example: + + make clean # Clean the current configuration away + mkdir $plausible_builddir + cd $plausible_builddir + $plausible_to_sourcedir/config --unified + make + make test + +Please report any problem you have. +---------------------------------------------------------------------- - make depend EOF +} exit(0); @@ -1921,10 +1916,10 @@ sub asm { sub _add { my $separator = shift; - # If there's any ARRAY in the collection of values, we will return - # an ARRAY of combined values, otherwise a string of joined values - # with $separator as the separator. - my $found_array = 0; + # If there's any ARRAY in the collection of values OR the separator + # is undef, we will return an ARRAY of combined values, otherwise a + # string of joined values with $separator as the separator. + my $found_array = !defined($separator); my @values = map { @@ -2147,8 +2142,11 @@ sub print_table_entry "sys_id", "cc", "cflags", + "defines", "debug_cflags", + "debug_defines", "release_cflags", + "release_defines", "thread_cflag", "unistd", "ld", @@ -2183,6 +2181,7 @@ sub print_table_entry "shared_target", "shared_cflag", "shared_ldflag", + "shared_rcflag", "shared_extension", "obj_extension", "exe_extension",