Re: Detect alternatives to w3m

[Dimitrie O. Paun]

On Wed, 8 Oct 2003, Francois Gouget wrote:
> I did not know about w3m before I saw this patch. More well-known and
> widely spread alternatives are lynx and links which are command-line
> compatible with w3m. So I propose to also look for them.

Yeah, I didn't know about w3m either. Wouldn't a configure check be
better here?

Detect alternatives to w3m

[Alexandre Julliard]

"Dimitrie O. Paun"  writes:
> Yeah, I didn't know about w3m either. Wouldn't a configure check be
> better here?

Actually it seems there is now (finally) a docbook2txt tool, we should
probably use that instead.

Detect alternatives to w3m

[Dimitrie O. Paun]

On Wed, 8 Oct 2003, Alexandre Julliard wrote:
> Actually it seems there is now (finally) a docbook2txt tool, we should
> probably use that instead.

Indeed.

ChangeLog
    Dimitrie O. Paun 
    Use docbook2txt to generate the text output instead of adhoc hacks.

Index: configure.ac
===================================================================
RCS file: /var/cvs/wine/configure.ac,v
retrieving revision 1.184
diff -u -r1.184 configure.ac
--- configure.ac	7 Oct 2003 22:49:22 -0000	1.184
+++ configure.ac	8 Oct 2003 18:57:53 -0000
@@ -121,6 +121,10 @@
 AC_CHECK_PROGS(DB2PS, docbook2ps db2ps, false)
 AC_SUBST(DB2PS)

+dnl Check for db2txt
+AC_CHECK_PROGS(DB2TXT, docbook2txt db2txt, false)
+AC_SUBST(DB2TXT)
+
 dnl **** Check for some libraries ****

dnl Check for -lm
Index: documentation/Makefile.in
===================================================================
RCS file: /var/cvs/wine/documentation/Makefile.in,v
retrieving revision 1.39
diff -u -r1.39 Makefile.in
--- documentation/Makefile.in	2 Oct 2003 04:28:17 -0000	1.39
+++ documentation/Makefile.in	8 Oct 2003 19:08:10 -0000
@@ -6,6 +6,7 @@
 DB2HTML   = @DB2HTML@
 DB2PDF    = @DB2PDF@
 DB2PS     = @DB2PS@
+DB2TXT    = @DB2TXT@

EXTRASUBDIRS = samples

@@ -61,10 +62,11 @@
 @MAKE_RULES@

everything: $(MAN_TARGETS) doc
-doc: html pdf ps
+doc: html pdf ps txt
 html: $(ALLBOOKS:%=%.html) wine-faq.html
 pdf: $(ALLBOOKS:%=%.pdf)
 ps: $(ALLBOOKS:%=%.ps)
+txt: $(ALLBOOKS:%=%.txt)

.PHONY: everything doc html pdf ps dist

@@ -79,13 +81,13 @@
 .sgml.ps:
    $(DB2PS) $<

-.html.txt:
-	w3m -dump $< > $@ || ($(RM) $@ && false)
+.sgml.txt:
+	$(DB2TXT) $<

-wine-devel.pdf wine-devel.ps wine-devel.html: $(WINE_DEVEL_SRCS)
-wine-user.pdf wine-user.ps wine-user.html: $(WINE_USER_SRCS)
-wine-faq.pdf wine-faq.ps wine-faq.html: $(WINE_FAQ_SRCS)
-winelib-user.pdf winelib-user.ps winelib-user.html: $(WINELIB_USER_SRCS)
+wine-devel.pdf wine-devel.ps wine-devel.html wine-devel.txt: $(WINE_DEVEL_SRCS)
+wine-user.pdf wine-user.ps wine-user.html wine-user.txt: $(WINE_USER_SRCS)
+wine-faq.pdf wine-faq.ps wine-faq.html wine-faq.txt: $(WINE_FAQ_SRCS)
+winelib-user.pdf winelib-user.ps winelib-user.html winelib-user.txt: $(WINELIB_USER_SRCS)

wine.man: wine.man.in
    sed -e 's,@bindir@,$(bindir),g' -e 's,@dlldir@,$(dlldir),g' -e 's,@PACKAGE_STRING@,@PACKAGE_STRING@,g' $(SRCDIR)/wine.man.in >$@ || ($(RM) $@ && false)

Detect alternatives to w3m

[Francois Gouget]

On Wed, 8 Oct 2003, Dimitrie O. Paun wrote:
[...]
> Index: documentation/Makefile.in

[...]
> -doc: html pdf ps
> +doc: html pdf ps txt
>  html: $(ALLBOOKS:%=%.html) wine-faq.html
>  pdf: $(ALLBOOKS:%=%.pdf)
>  ps: $(ALLBOOKS:%=%.ps)
> +txt: $(ALLBOOKS:%=%.txt)

'txt' should probably also generate wine-faq.txt.

Detect alternatives to w3m

[Bill Medland]

On October 8, 2003 12:16 pm, Dimitrie O. Paun wrote:
> On Wed, 8 Oct 2003, Alexandre Julliard wrote:
> > Actually it seems there is now (finally) a docbook2txt tool, we should
> > probably use that instead.
>
> Indeed.
>
> ChangeLog
>     Dimitrie O. Paun 
>     Use docbook2txt to generate the text output instead of adhoc hacks.
> Index: configure.ac
>
> RCS file: /var/cvs/wine/configure.ac,v
> retrieving revision 1.184
> diff -u -r1.184 configure.ac
> --- configure.ac	7 Oct 2003 22:49:22 -0000	1.184
> +++ configure.ac	8 Oct 2003 18:57:53 -0000
> @@ -121,6 +121,10 @@
>  AC_CHECK_PROGS(DB2PS, docbook2ps db2ps, false)
>  AC_SUBST(DB2PS)
>
> +dnl Check for db2txt
> +AC_CHECK_PROGS(DB2TXT, docbook2txt db2txt, false)
> +AC_SUBST(DB2TXT)
> -
>
> dnl **** Check for some libraries ****
>
> dnl Check for -lm

Having just fallen over this might I suggest that the configure check also 
checks for lynx; if lynx is not installed then even though docbook2txt is 
present it fails.

Or is there a version of docbook2txt that doesn't depend upon lynx?

Detect alternatives to w3m

[Dimitrie O. Paun]

On Thu, 9 Oct 2003, Bill Medland wrote:
> Having just fallen over this might I suggest that the configure check also 
> checks for lynx; if lynx is not installed then even though docbook2txt is 
> present it fails.
>
> Or is there a version of docbook2txt that doesn't depend upon lynx?

I have no idea how docbook2txt works, but we can't check for the entire
graph of dependencies when checking for a feature. We have rpm(1) & friends
for that task.

Detect alternatives to w3m

[Bill Medland]

On October 9, 2003 03:02 pm, Dimitrie O. Paun wrote:
> On Thu, 9 Oct 2003, Bill Medland wrote:
> > Having just fallen over this might I suggest that the configure check
> > also checks for lynx; if lynx is not installed then even though
> > docbook2txt is present it fails.
> >
> > Or is there a version of docbook2txt that doesn't depend upon lynx?
>
> I have no idea how docbook2txt works, but we can't check for the entire
> graph of dependencies when checking for a feature. We have rpm(1) & friends
> for that task.

It isn't a rpm dependency on my system (RedHat 8.0), at least I presume it 
isn't since I didn't have any difficulty ending up with docbook2txt but no 
lynx.

OK.  I guess it is enough to make people aware that if they try to build the 
documentation now and they get back a message that "No way to convert HTML to 
text found" then it probably means they need to install lynx.