Oops! Forgot to commit a few files.

[lyx.git] / lib / configure.m4

diff --git a/lib/configure.m4 b/lib/configure.m4
index 4874a815a144d605aedeabc721ee9b6c2079a896..ce3855ddc4d5419db51ceed506428bdcd4665575 100644 (file)
--- a/lib/configure.m4
+++ b/lib/configure.m4
@@ -186,8 +186,8 @@ SEARCH_PROG([for reLyX LaTeX-to-LyX translator],RELYX,reLyX)
 PATH=${save_PATH}
 
 # Search something to process a literate document
-SEARCH_PROG([for a Literate programming processor],LITERATE,"noweave -delay -index")
-if test "$LITERATE" = "none"; then LITERATE_EXT="none"; else LITERATE_EXT=".nw"; fi
+SEARCH_PROG([for a Literate programming processor],LITERATE,"noweave -delay -index \$\$FName > \$\$OutName")
+if test "$LITERATE" = "none"; then LITERATE_EXT="none"; else LITERATE_EXT="nw"; fi
 
 # Search for a Postscript interpreter
 SEARCH_PROG([for a Postscript interpreter],GS, gs)
@@ -249,10 +249,12 @@ fi
 case $LINUXDOC in
   sgml2lyx)
     linuxdoc_to_latex_command="sgml2latex \$\$FName"
+    linuxdoc_to_dvi_command="sgml2latex -o dvi \$\$FName"
     linuxdoc_to_html_command="sgml2html \$\$FName"
     linuxdoc_to_lyx_command="sgml2lyx";;
   none)
     linuxdoc_to_latex_command="none"
+    linuxdoc_to_dvi_command="none"
     linuxdoc_to_html_command="none"
     linuxdoc_to_lyx_command="none";;
 esac
@@ -291,7 +293,7 @@ esac
 SEARCH_PROG([for an HTML converter], TOHTML, tth latex2html hevea)
 latex_to_html_command = $TOHTML
 case $TOHTML in
-       tth) latex_to_html_command="tth -t < \$\$FName > \$\$OutName";;
+       tth) latex_to_html_command="tth -t -e2 -L\$\$BaseName < \$\$FName > \$\$OutName";;
  latex2html) latex_to_html_command="latex2html -no_subdir -split 0 -show_section_numbers \$\$FName";;
       hevea) latex_to_html_command="hevea -s \$\$FName";;
 esac
@@ -367,25 +369,27 @@ cat >lyxrc.defaults <<EOF
 # want to customize LyX, make a copy of the file LYXDIR/lyxrc as
 # ~/.lyx/lyxrc and edit this file instead. Any setting in lyxrc will
 # override the values given here.
-\\converter tex dvi "$LATEX" noflags
-\\converter tex pdf "$PDFLATEX" noflags
-\\converter dvi ps "$dvi_to_ps_command" noflags
-\\converter ps pdf "$ps_to_pdf_command" noflags
-\\converter sgml tex "$linuxdoc_to_latex_command" noflags
-\\converter sgml html "$linuxdoc_to_html_command" noflags
-\\converter docbook dvi "$docbook_to_dvi_command" noflags
-\\converter docbook html "$docbook_to_html_command" noflags
-\\converter tex html "$latex_to_html_command" noflags
+\\converter tex dvi "$LATEX" ""
+\\converter tex pdf "$PDFLATEX" ""
+\\converter dvi ps "$dvi_to_ps_command" ""
+\\converter ps pdf "$ps_to_pdf_command" ""
+\\converter sgml tex "$linuxdoc_to_latex_command" ""
+\\converter sgml dvi "$linuxdoc_to_dvi_command" ""
+\\converter sgml html "$linuxdoc_to_html_command" ""
+\\converter docbook dvi "$docbook_to_dvi_command" ""
+\\converter docbook html "$docbook_to_html_command" ""
+\\converter tex html "$latex_to_html_command"
+       "originaldir,needaux"
+\\converter $LITERATE_EXT tex "$LITERATE" ""
 
 \\viewer dvi "$DVI_VIEWER"
 \\viewer html "$HTML_VIEWER"
 \\viewer pdf "$PDF_VIEWER"
 \\viewer ps "$GHOSTVIEW -swap"
-\\viewer pspic "$GHOSTVIEW"
+\\viewer eps "$GHOSTVIEW"
 
 \\relyx_command "$RELYX"
 \\linuxdoc_to_lyx_command "$linuxdoc_to_lyx_command"
-\\literate_command "$LITERATE"
 \\literate_extension "$LITERATE_EXT"
 \\ps_command "$GS"
 \\ascii_roff_command "$ascii_roff_command"