Commit 10a926c1 authored by Ulf Möller's avatar Ulf Möller
Browse files

More compact Configure usage message.

parent d3442bc7

Configure

+25 −6
Original line number Diff line number Diff line
@@ -507,6 +507,14 @@ if ($target eq "TABLE") { 
	exit 0;

}



if ($target eq "LIST") {

	foreach (sort keys %table) {

		print;

		print "\n";

	}

	exit 0;

}



&usage if (!defined($table{$target}));



my $IsWindows=scalar grep /^$target$/,@WinTargets;
@@ -871,22 +879,33 @@ exit(0); 
sub usage

	{

	print STDERR $usage;

	print STDERR "pick os/compiler from:";

	print STDERR "\npick os/compiler from:\n";

	my $j=0;

	my $i;

        my $k=0;

	foreach $i (sort keys %table)

		{

		next if $i =~ /^debug/;

		print STDERR "\n" if ($j++ % 4) == 0;

		printf(STDERR "%-18s ",$i);

		$k += length($i) + 1;

		if ($k > 78)

			{

			print STDERR "\n";

			$k=length($i);

			}

		print STDERR $i . " ";

		}

	foreach $i (sort keys %table)

		{

		next if $i !~ /^debug/;

		print STDERR "\n" if ($j++ % 4) == 0;

		printf(STDERR "%-18s ",$i);

		}

		$k += length($i) + 1;

		if ($k > 78)

			{

			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);

	}

config

+2 −2
Original line number Diff line number Diff line
@@ -535,14 +535,14 @@ fi 
# compiler for the platform ... in which case we add it on

# 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

  OUT="$OUT-$CC"

fi



OUT="$PREFIX$OUT"



$PERL ./Configure 2>&1 | grep "$OUT" > /dev/null

$PERL ./Configure LIST | grep "$OUT" > /dev/null

if [ $? = "0" ]; then

  echo Configuring for $OUT