Make sure int SSL_COMP_add_compression_method() checks if a certain

[openssl.git] / util / selftest.pl

diff --git a/util/selftest.pl b/util/selftest.pl
index 04b4425d7ef9d0bd78234e88913fda321f7a5100..276b81183d2922162c0c034867e9c11558f1d83e 100644 (file)
--- a/util/selftest.pl
+++ b/util/selftest.pl
@@ -19,6 +19,7 @@ my $ok=0;
 my $cc="cc";
 my $cversion="??";
 my $sep="-----------------------------------------------------------------------------\n";
+my $not_our_fault="\nPlease ask your system administrator/vendor for more information.\n[Problems with your operating system setup should not be reported\nto the OpenSSL project.]\n";
 
 open(OUT,">$report") or die;
 
@@ -49,6 +50,7 @@ if (open(IN,"<Makefile.ssl")) {
 
 $cversion=`$cc -v 2>&1`;
 $cversion=`$cc -V 2>&1` if $cversion =~ "usage";
+$cversion=`$cc -V |head -1` if $cversion =~ "Error";
 $cversion=`$cc --version` if $cversion eq "";
 $cversion =~ s/Reading specs.*\n//;
 $cversion =~ s/usage.*\n//;
@@ -56,7 +58,7 @@ chomp $cversion;
 
 if (open(IN,"<CHANGES")) {
     while(<IN>) {
-       if (/\*\) (.{0,55})/) {
+       if (/\*\) (.{0,55})/ && !/applies to/) {
            $last=$1;
            last;
        }
@@ -76,16 +78,18 @@ print OUT "\n";
 
 print "Checking compiler...\n";
 if (open(TEST,">cctest.c")) {
-    print TEST "#include <stdio.h>\nmain(){printf(\"Hello world\\n\");}\n";
+    print TEST "#include <stdio.h>\n#include <errno.h>\nmain(){printf(\"Hello world\\n\");}\n";
     close(TEST);
     system("$cc -o cctest cctest.c");
     if (`./cctest` !~ /Hello world/) {
        print OUT "Compiler doesn't work.\n";
+       print OUT $not_our_fault;
        goto err;
     }
     system("ar r cctest.a /dev/null");
     if (not -f "cctest.a") {
        print OUT "Check your archive tool (ar).\n";
+       print OUT $not_our_fault;
        goto err;
     }
 } else {
@@ -102,6 +106,7 @@ if (open(TEST,">cctest.c")) {
        } else {
            print OUT "Can't compile test program!\n";
        }
+       print OUT $not_our_fault;
        goto err;
     }
 } else {
@@ -127,6 +132,8 @@ if (system("make 2>&1 | tee make.log") > 255) {
 
 $_=$options;
 s/no-asm//;
+s/no-shared//;
+s/no-krb5//;
 if (/no-/)
 {
     print OUT "Test skipped.\n";