Fix check of what makedepprog should be

[openssl.git] / Configure

diff --git a/Configure b/Configure
index 0a0717425738eaa34647ee6724c01f1a52c6c61c..e52eecd52272721bbabf8440ab3f8cdf9db4d95a 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -1142,31 +1142,11 @@ if (!$no_asm) {
     }
 }
 
-$config{makedepprog} = "makedepend";
-if ($target{cc} eq "gcc" || ($target{cc} eq 'cc' && $config{target} =~ /darwin/)) {
-    $config{makedepprog} = $target{cc};
-}
-# On different platforms, shared library suffixes takes interesting forms.
-# On Most Unixen, it's .so.{version} or .sl.{version}, while on MacOS X,
-# it's .{version}.dylib.  We're want to separate the two so we can calculate
-# symlinks.
-# FIXME: is this actually needed any more?  Makefile.shared seems to just
-# symlink a file name without SOVER to the file with full SOVER, nothing in
-# between.
-if ($target{shared_extension} =~ /^(|(?<e>\.s[ol])(?<v>\..*)|(?<v>\..*)(?<e>\.dylib))$/) {
-    my @vernums = split /\./, $+{v};
-    shift @vernums;             # Because the initial period in shlib_extension.
-    my @s = ();
-    while (@vernums) {
-       pop @vernums;
-       push @s, join(".", $+{e} eq ".dylib" ? "" : $+{e},
-                     @vernums,
-                     $+{e} eq ".dylib" ? $+{e} : () );
-    }
-    $config{shared_link_extensions} = join(" ", @s);
-} else {
-    $config{shared_link_extensions} = "";
-}
+my $ecc = $target{cc};
+$ecc = "clang" if `$target{cc} --version 2>&1` =~ /clang/;
+
+$config{makedepprog} =
+    $ecc eq "gcc" || $ecc eq "clang" ? $target{cc} : "makedepend";
 $config{depflags} =~ s/^\s*//;
 
 
@@ -1237,9 +1217,6 @@ if (defined($config{api})) {
     $config{cflags} .= " $apiflag";
 }
 
-my $ecc = $target{cc};
-$ecc = "clang" if `$target{cc} --version 2>&1` =~ /clang/;
-
 if ($strict_warnings)
        {
        my $wopt;
@@ -1310,6 +1287,21 @@ foreach (sort keys %target) {
 print OUT <<"EOF";
 );
 
+EOF
+print OUT "our \%available_protocols = (\n";
+print OUT "  tls => [ ", join(", ", map { quotify("perl", $_) } @tls), " ],\n";
+print OUT "  dtls => [ ", join(", ", map { quotify("perl", $_) } @dtls), " ],\n";
+print OUT <<"EOF";
+);
+
+EOF
+print OUT "our \%disabled = (\n";
+foreach (sort keys %disabled) {
+    print OUT "  ", quotify("perl", $_), " => ", quotify("perl", $disabled{$_}), ",\n";
+}
+print OUT <<"EOF";
+);
+
 EOF
 print OUT "our %withargs = (\n";
 foreach (sort keys %withargs) {