Kamil Dudka <[EMAIL PROTECTED]> writes:

> +AC_ARG_WITH(nss_compat_ossl, AC_HELP_STRING([--with-nss_compat_ossl[=DIR]],
> +         [NSS compatibility SSL libraries/include files]))
> +
> +# nss_compat_ossl
> +if test "$with_nss_compat_ossl" != "no"; then
> +     if test -z "$with_nss_compat_ossl"; then
> +             if pkg-config nss; then
> +                     CFLAGS="$CFLAGS_X `pkg-config --cflags nss`"
> +                     LIBS="$LIBS_X `pkg-config --libs nss`"

Unfortunately, this part breaks Ruby scripting support.
EL_CONFIG_SCRIPTING_RUBY saves CFLAGS and LIBS in the *_X
variables, checks for Ruby, and restores the variables if Ruby
did not work.  Now when you copy LIBS_X to LIBS, you lose the
-lruby1.8 that was added in LIBS but not in LIBS_X.
In general, each check should set the *_X variables on its own
rather than rely on values left from the previous check.

The NSS support should be mentioned in doc/installation.txt.
I was thinking of the following change, but you can do something
else if you have better ideas.

From 4e0c3737e46952d4e1edb475b6b7c0a37fa3d778 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <[EMAIL PROTECTED]>
Date: Sun, 7 Sep 2008 01:48:19 +0300
Subject: [PATCH] Mention nss_compat_ossl in doc/installation.txt

The dependency table was originally in "fixed" format, so that
AsciiDoc took a fixed number of characters to the first column
and the rest to the second column.  However, "OpenSSL or GNU TLS
or nss_compat_ossl" did not fit in that number of characters,
and backslash line continuation did not help because AsciiDoc
apparently parses that before it counts the characters.
I could have widened the column in the AsciiDoc source but
switching to "dsv" format seems prettier.
---
 doc/installation.txt |   54 +++++++++++++++++++++++++------------------------
 1 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/doc/installation.txt b/doc/installation.txt
index 25ef001..c9bddd8 100644
--- a/doc/installation.txt
+++ b/doc/installation.txt
@@ -31,40 +31,42 @@ To make use of many of ELinks features you will need to have some external
 libraries and utility programs installed on your system. It is recommended to
 have the following libraries and programs installed:
 
-`-----------------------`----------------------------------------------------
-Dependency		Description
------------------------------------------------------------------------------
-Lua or Guile		Makes it possible to write scripting plugins.	    \
+[separator="|"]
+`_______________________`____________________________________________________
+Dependency		|Description
+_____________________________________________________________________________
+Lua or Guile		|Makes it possible to write scripting plugins.	    \
 ifdef::installation-webpage[]
-			See link:manual.html#lua-scripting[the Elinks - Lua interface]    \
+			 See link:manual.html#lua-scripting[the Elinks - Lua interface]    \
 endif::installation-webpage[]
 ifndef::installation-webpage[]
-			See <<lua-scripting,the Elinks - Lua interface>>    \
+			 See <<lua-scripting,the Elinks - Lua interface>>   \
 endif::installation-webpage[]
-			for more info.
-zlib 1.2.0.2 or later	For handling gzip or deflate compressed documents   \
-			both locally and sent from server.
-bzip2			Likewise, for bzip2 compressed documents.
-LZMA Utils		Likewise, for LZMA compressed documents.            \
-			Version 4.32.5 should work.
-OpenSSL or GNU TLS	For handling secure HTTP browsing.
-GPM			'General Purpose Mouse' for mouse support.
-expat			'XML Parser Toolkit' needed for XBEL support.
-smbclient		Program needed for smb:// protocol support.
-rxvt-unicode		For terminal emulator which supports 88 colors.
-xterm with 256 colors	Program atleast patch level  179 or rxvt program    \
-			from version 2.7.9 for support of 256 colors.	    \
-			Newer PuTTY also has 256 color support.
-libidn			For internationalized domain names.
-SpiderMonkey		Mozilla's JavaScript engine for getting		    \	
-			JavaScript/ECMAScript support in ELinks.	    \
+			 for more info.
+zlib 1.2.0.2 or later	|For handling gzip or deflate compressed documents   \
+			 both locally and sent from server.
+bzip2			|Likewise, for bzip2 compressed documents.
+LZMA Utils		|Likewise, for LZMA compressed documents.            \
+			 Version 4.32.5 should work.
+OpenSSL or GNU TLS \
+or nss_compat_ossl	|For handling secure HTTP browsing.
+GPM			|'General Purpose Mouse' for mouse support.
+expat			|'XML Parser Toolkit' needed for XBEL support.
+smbclient		|Program needed for smb:// protocol support.
+rxvt-unicode		|For terminal emulator which supports 88 colors.
+xterm with 256 colors	|Program atleast patch level  179 or rxvt program   \
+			 from version 2.7.9 for support of 256 colors.	    \
+			 Newer PuTTY also has 256 color support.
+libidn			|For internationalized domain names.
+SpiderMonkey		|Mozilla's JavaScript engine for getting	    \
+			 JavaScript/ECMAScript support in ELinks.	    \
 ifdef::installation-webpage[]
-			See also link:manual.html#ecmascript[notes on ECMAScript support].
+			 See also link:manual.html#ecmascript[notes on ECMAScript support].
 endif::installation-webpage[]
 ifndef::installation-webpage[]
-			See also <<ecmascript,notes on ECMAScript support>>.
+			 See also <<ecmascript,notes on ECMAScript support>>.
 endif::installation-webpage[]
------------------------------------------------------------------------------
+_____________________________________________________________________________
 
 When compiling, you also need the header files for the libraries. Most OS
 distributors put a given library's headers in a package separate from the
-- 
1.5.6.2

Attachment: pgpwNGhMGNEw6.pgp
Description: PGP signature

_______________________________________________
elinks-dev mailing list
[email protected]
http://linuxfromscratch.org/mailman/listinfo/elinks-dev

Reply via email to