danf: curl-www/auto explainopts.t,1.3,1.4 summarize.pl,1.50,1.51

[email protected] Mon, 01 Jun 2009 21:28:23 +0000
Newsgroups gmane.comp.web.curl.www.cvs
Message-ID <[email protected]>
Update of /cvsroot/curl/curl-www/auto
In directory labb:/tmp/cvs-serv15752

Modified Files:
	explainopts.t summarize.pl 
Log Message:
Auto-detect NSS as the SSL library used in a build.


Index: explainopts.t
===================================================================
RCS file: /cvsroot/curl/curl-www/auto/explainopts.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- explainopts.t	22 Feb 2007 14:21:14 -0000	1.3
+++ explainopts.t	1 Jun 2009 21:28:21 -0000	1.4
@@ -1,5 +1,5 @@
 <p> Options = (<b>K</b>)rb4, IPv(<b>6</b>), (<b>D</b>)ebug, Open(<b>S</b>)SL,
-Gnu(<b>T</b>)LS, (<b>A</b>)synch, (<b>Z</b>)lib, (<b>G</b>)SS,
+Gnu(<b>T</b>)LS, (<b>N</b>)SS, (<b>A</b>)synch, (<b>Z</b>)lib, (<b>G</b>)SS,
 lib(<b>I</b>)dn, SS(<b>P</b>)I, libssh(<b>2</b>)
 
 <p> Text <span class='buildserverprob'>looking like this</span> is for servers

Index: summarize.pl
===================================================================
RCS file: /cvsroot/curl/curl-www/auto/summarize.pl,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- summarize.pl	8 Aug 2007 20:56:24 -0000	1.50
+++ summarize.pl	1 Jun 2009 21:28:21 -0000	1.51
@@ -315,7 +315,7 @@
     undef %serverfail;
 
     $memory=($debug)?"D":"-";
-    $https=($openssl)?"S":($gnutls?"T":"-");
+    $https=($openssl)?"S":($gnutls?"T":($nss?"N":($ssl?"?":"-")));
     $asynch=$ares?"A":"-";
     $sspi=$sspi?"P":"-";
     my $ssh=$libssh2?"2":"-";
@@ -359,6 +359,7 @@
     $debug=0;
     $openssl=0;
     $gnutls=0;
+    $nss=0;
     $libssh2=0;
     $ssl=0;
     $cvsfail=0;
@@ -542,6 +543,9 @@
             elsif($line =~ /^\#define USE_GNUTLS 1/) {
                 $gnutls = 1;
             }
+            elsif($line =~ /^\#define USE_NSS 1/) {
+                $nss = 1;
+            }
             elsif($line =~ /^\#define USE_LIBSSH2 1/) {
                 $libssh2 = 1;
             }