Fixes from Jose' for docbook detection

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@710 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 0e42f40eb4648e52537cac8d00b3ff123597a243..9eaa9fa1d67c98276205c02d0bdc807d5a1845c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-03  Jose Abilio Oliveira Matos <jamatos@novalis.fc.up.pt>
+
+       * lib/lyxrc.example: fix examples for exporting SGML to HTML.
+
+       * lib/configure.m4: better autodetection of DocBook tools.
+
 2000-04-28  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * src/lyx_main.C (easyParse): use lyxerr instead of cerr.

diff --git a/lib/configure b/lib/configure
index a1192e247c0ee05cd7391aa2937a75a54cbe8ee6..9a3f0d3c9c442a02db61578e15100b7798b13a83 100755 (executable)
--- a/lib/configure
+++ b/lib/configure
@@ -638,11 +638,22 @@ if test $LINUXDOC != none; then
   linuxdoc_cmd="\\def\\haslinuxdoc{yes}"
 fi
 
+case $LINUXDOC in
+  sgml2lyx)
+    linuxdoc_to_latex_command="sgml2latex"
+    linuxdoc_to_html_command="sgml2html '\$\$FName'"
+    linuxdoc_to_lyx_command="sgml2lyx";;
+  none)
+    linuxdoc_to_latex_command="none"
+    linuxdoc_to_html_command="none"
+    linuxdoc_to_lyx_command="none";;
+esac
+
 # Search for DocBook support
-echo $ac_n "checking for SGML-tools 2.x (DocBook)""... $ac_c"
-echo "$ac_t""(sgmltools)"
+echo $ac_n "checking for SGML-tools 2.x (DocBook) or db2x scripts""... $ac_c"
+echo "$ac_t""(sgmltools db2dvi)"
 DOCBOOK=
-for ac_prog in sgmltools
+for ac_prog in sgmltools db2dvi
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog ; ac_word=$2
@@ -679,6 +690,17 @@ if test $DOCBOOK != none; then
   docbook_cmd="\\def\\hasdocbook{yes}"
 fi
 
+case $DOCBOOK in
+  sgmltools)
+    docbook_to_dvi_command="sgmltools -b dvi"
+    docbook_to_html_command="sgmltools -b html '\$\$FName'";;
+  db2dvi)
+    docbook_to_dvi_command="db2dvi"
+    docbook_to_html_command="db2html '\$\$FName'";;
+  none)
+    docbook_to_dvi_command="none"
+    docbook_to_html_command="none";;
+esac
 
 # Search for a spool command
 echo $ac_n "checking for a spool command""... $ac_c"
@@ -862,6 +884,11 @@ cat >lyxrc.defaults <<EOF
 \\chktex_command "$chktex_command"
 \\spell_command "$SPELL"
 \\fax_command "$fax_command"
+\\linuxdoc_to_latex_command "$linuxdoc_to_latex_command"
+\\linuxdoc_to_html_command "$linuxdoc_to_html_command"
+\\linuxdoc_to_lyx_command "$linuxdoc_to_lyx_command"
+\\docbook_to_dvi_command "$docbook_to_dvi_command"
+\\docbook_to_html_command "$docbook_to_html_command"
 \\html_command "$html_command"
 \\print_spool_command "$print_spool_command"
 \\print_spool_printerprefix "$print_spool_printerprefix"

diff --git a/lib/configure.m4 b/lib/configure.m4
index 3a96a0a5a3e4e4dcf65353e3bbe8d7b0af813c8a..5263c06218a9f4d333a703d720d298e7f934fce9 100644 (file)
--- a/lib/configure.m4
+++ b/lib/configure.m4
@@ -237,14 +237,36 @@ if test $LINUXDOC != none; then
   linuxdoc_cmd="\\def\\haslinuxdoc{yes}"
 fi
 
+case $LINUXDOC in
+  sgml2lyx)
+    linuxdoc_to_latex_command="sgml2latex"
+    linuxdoc_to_html_command="sgml2html '\$\$FName'"
+    linuxdoc_to_lyx_command="sgml2lyx";;
+  none)
+    linuxdoc_to_latex_command="none"
+    linuxdoc_to_html_command="none"
+    linuxdoc_to_lyx_command="none";;
+esac
+
 # Search for DocBook support
-SEARCH_PROG([for SGML-tools 2.x (DocBook)], DOCBOOK, sgmltools)
+SEARCH_PROG([for SGML-tools 2.x (DocBook) or db2x scripts], DOCBOOK, sgmltools db2dvi)
 chk_docbook=no
 if test $DOCBOOK != none; then
   chk_docbook=yes
   docbook_cmd="\\def\\hasdocbook{yes}"
 fi
 
+case $DOCBOOK in
+  sgmltools)
+    docbook_to_dvi_command="sgmltools -b dvi"
+    docbook_to_html_command="sgmltools -b html '\$\$FName'";;
+  db2dvi)
+    docbook_to_dvi_command="db2dvi"
+    docbook_to_html_command="db2html '\$\$FName'";;
+  none)
+    docbook_to_dvi_command="none"
+    docbook_to_html_command="none";;
+esac
 
 # Search for a spool command
 SEARCH_PROG([for a spool command], LPR, lp lpr)
@@ -350,6 +372,11 @@ cat >lyxrc.defaults <<EOF
 \\chktex_command "$chktex_command"
 \\spell_command "$SPELL"
 \\fax_command "$fax_command"
+\\linuxdoc_to_latex_command "$linuxdoc_to_latex_command"
+\\linuxdoc_to_html_command "$linuxdoc_to_html_command"
+\\linuxdoc_to_lyx_command "$linuxdoc_to_lyx_command"
+\\docbook_to_dvi_command "$docbook_to_dvi_command"
+\\docbook_to_html_command "$docbook_to_html_command"
 \\html_command "$html_command"
 \\print_spool_command "$print_spool_command"
 \\print_spool_printerprefix "$print_spool_printerprefix"

diff --git a/lib/lyxrc.example b/lib/lyxrc.example
index 681d96099917e30ad859958eb95b11a3549dab95..f62490d27a81f527f24afdd30b31b84d972b8621 100644 (file)
--- a/lib/lyxrc.example
+++ b/lib/lyxrc.example
@@ -466,7 +466,7 @@
 
 # Here you have the command to convert from linuxdoc to html.
 # Example: one html file only.
-#\linuxdoc_to_html_command "sgml2html -s 0"
+#\linuxdoc_to_html_command "sgml2html -s 0 '$$FName'"
 
 # The LinuxDoc to LyX converter
 #\linuxdoc_to_lyx_command "sgml2lyx"
@@ -479,7 +479,7 @@
 #\docbook_to_dvi_command "sgmltools -b dvi"
 
 # Command to convert a docbook file to html
-#\docbook_to_html_command "sgmltools -b html"
+#\docbook_to_html_command "sgmltools -b html '$$FName'"
 
 # Command to convert a docbook file to pdf
 #\docbook_to_pdf_command ""