generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More compact Configure usage message.

Browse Source
This commit is contained in:
Ulf Möller 2000-02-21 00:55:45 +00:00
parent d3442bc780
commit 10a926c1eb
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Configure
View File

@ -507,6 +507,14 @@ if ($target eq "TABLE") {
exit 0; exit 0;
} }
if ($target eq "LIST") {
foreach (sort keys %table) {
print;
print "\n";
}
exit 0;
}
&usage if (!defined($table{$target})); &usage if (!defined($table{$target}));
my $IsWindows=scalar grep /^$target$/,@WinTargets; my $IsWindows=scalar grep /^$target$/,@WinTargets;
@ -871,22 +879,33 @@ exit(0);
sub usage sub usage
{ {
print STDERR $usage; print STDERR $usage;
print STDERR "pick os/compiler from:"; print STDERR "\npick os/compiler from:\n";
my $j=0; my $j=0;
my $i; my $i;
my $k=0;
foreach $i (sort keys %table) foreach $i (sort keys %table)
{ {
next if $i =~ /^debug/; next if $i =~ /^debug/;
print STDERR "\n" if ($j++ % 4) == 0; $k += length($i) + 1;
printf(STDERR "%-18s ",$i); if ($k > 78)
{
print STDERR "\n";
$k=length($i);
}
print STDERR $i . " ";
} }
foreach $i (sort keys %table) foreach $i (sort keys %table)
{ {
next if $i !~ /^debug/; next if $i !~ /^debug/;
print STDERR "\n" if ($j++ % 4) == 0; $k += length($i) + 1;
printf(STDERR "%-18s ",$i); if ($k > 78)
} {
print STDERR "\n"; print STDERR "\n";
$k=length($i);
}
print STDERR $i . " ";
}
print STDERR "\n\nNOTE: If in doubt, on Unix-ish systems use './config'.\n";
exit(1); exit(1);
} }

4
config
View File

@ -535,14 +535,14 @@ fi
# compiler for the platform ... in which case we add it on # compiler for the platform ... in which case we add it on
# the end ... otherwise we leave it off # the end ... otherwise we leave it off
$PERL ./Configure 2>&1 | grep "$OUT-$CC" > /dev/null $PERL ./Configure LIST | grep "$OUT-$CC" > /dev/null
if [ $? = "0" ]; then if [ $? = "0" ]; then
OUT="$OUT-$CC" OUT="$OUT-$CC"
fi fi
OUT="$PREFIX$OUT" OUT="$PREFIX$OUT"
$PERL ./Configure 2>&1 | grep "$OUT" > /dev/null $PERL ./Configure LIST | grep "$OUT" > /dev/null
if [ $? = "0" ]; then if [ $? = "0" ]; then
echo Configuring for $OUT echo Configuring for $OUT