[elinks-dev] Solaris build fixes

[John Hawkinson]

Hi, I'm not the list. Here are some fixes to build under Solaris 10
(no -rdynamic, no gzclearerr()). Against elinks-0.12-20070601.

Also included is a patch to add more help for -dump-color-mode.

--jhawk at mit.edu
  John Hawkinson

--- configure.in	2007/06/01 19:18:56	1.1
+++ configure.in	2007/06/02 22:21:07
@@ -256,10 +256,21 @@
 dnl
 dnl FIXME: This check doesn't work. Something to do with the compiler
 dnl happily ignoring it and stderr not being checked for error messages.
+dnl This works instead:
 AC_MSG_CHECKING([for -rdynamic])
 LDFLAGS_X="$LDFLAGS"
 LDFLAGS="$LDFLAGS -rdynamic"
-AC_TRY_LINK([], [], have_rdynamic=yes, have_rdynamic=no)
+cat > conftest.$ac_ext << _ACEOF
+int main() { return 0; }
+_ACEOF
+(eval $ac_compile) 2>conftest.er1
+(eval $ac_link) 2>conftest.err
+if test -s conftest.err
+then
+  have_rdynamic=no
+else
+  have_rdynamic=yes
+fi
 test "$have_rdynamic" = no && LDFLAGS="$LDFLAGS_X"
 AC_MSG_RESULT($have_rdynamic)
 
@@ -285,6 +296,7 @@
 AC_CHECK_FUNCS(getifaddrs getpwnam inet_pton inet_ntop)
 AC_CHECK_FUNCS(fflush fsync fseeko ftello sigaction)
 AC_CHECK_FUNCS(gettimeofday clock_gettime)
+AC_CHECK_FUNCS(gzclearerr)
 
 AC_HAVE_FUNCS(cygwin_conv_to_full_win32_path)
 
--- src/encoding/gzip.c	2007/05/31 22:40:05	1.1
+++ src/encoding/gzip.c	2007/06/02 22:22:20
@@ -33,7 +33,9 @@
 static int
 gzip_read(struct stream_encoded *stream, unsigned char *data, int len)
 {
+#ifdef HAVE_GZCLEARERR
 	gzclearerr((gzFile *) stream->data);
+#endif
 	return gzread((gzFile *) stream->data, data, len);
 }
 
--- src/config/cmdline.c	2007/06/02 21:44:28	1.1
+++ src/config/cmdline.c	2007/06/02 22:12:42
@@ -766,9 +766,19 @@
 		"dump-charset", 0, "document.dump.codepage",
 		N_("Codepage used when formatting dump output.")),
 
-	INIT_OPT_CMDALIAS("", N_("Color mode used with -dump"),
+	INIT_OPT_CMDALIAS("",
+                N_("Color mode used with -dump; "
+		   "takes a parameter from -1 to 4"),
 		"dump-color-mode", 0, "document.dump.color_mode",
-		N_("Color mode used with -dump.")),
+		N_("Color mode used with -dump.\n"
+		   "Takes a parameter:\n"
+		   "  -1: is standard dump mode\n"
+		   "   0: is mono mode\n"
+		   "   1: is 16 color mode\n"
+		   "   2: is 88 color mode\n"
+		   "   3: is 256 color mode\n"
+		   "   4: is true color mode"
+		   )),
 
 	INIT_OPT_CMDALIAS("", N_("Width of document formatted with -dump"),
 		"dump-width", 0, "document.dump.width",