Add hspell option to spell-checkers list

[lyx.git] / lib / configure.m4

diff --git a/lib/configure.m4 b/lib/configure.m4
index f69946572154a5640906d805a451689c87c2b096..a2cc687dd052be786c5a31a4c8f42955cfeed735 100644 (file)
--- a/lib/configure.m4
+++ b/lib/configure.m4
@@ -199,7 +199,7 @@ fi
 rm -f chklatex.ltx chklatex.log])dnl
 dnl
 # Search LaTeX2e
-SEARCH_PROG([for a LaTeX2e program],LATEX,latex latex2e,CHECKLATEX2E,dnl
+SEARCH_PROG([for a LaTeX2e program],LATEX,pplatex latex2e latex,CHECKLATEX2E,dnl
   [lyx_check_config=no])
 latex_to_dvi=$LATEX
 test -z "$latex_to_dvi" && latex_to_dvi="none"
@@ -255,9 +255,6 @@ SEARCH_PROG([for a DVI previewer],DVI_VIEWER, xdvi windvi yap)
 # Search something to preview html
 SEARCH_PROG([for a HTML previewer],HTML_VIEWER, "mozilla file://\$\$p\$\$i" netscape)
 
-# Search for a program to preview latex code
-SEARCH_PROG([for a LaTeX preview],LATEX_VIEWER, "xterm -e less")
-
 # Search for a program to convert ps to pdf
 SEARCH_PROG([for a PS to PDF converter],ps_to_pdf_command,ps2pdf)
 test $ps_to_pdf_command = "ps2pdf" && ps_to_pdf_command="ps2pdf -dCompatibilityLevel=1.3 \$\$i"
@@ -303,8 +300,7 @@ dnl fi
 
 # Search a GUI Fax program
 SEARCH_PROG([for a fax program], fax_command, kdeprintfax ksendfax)
-test $fax_command = "kdeprintfax" && fax_command="kdeprintfax \$\$i"
-test $fax_command = "ksendfax" && fax_command="ksendfax \$\$i"
+test $fax_command != "none" && fax_command="$fax_command \$\$i"
 
 # Search for LinuxDoc support
 SEARCH_PROG([for SGML-tools 1.x (LinuxDoc)], LINUXDOC, sgml2lyx)
@@ -440,11 +436,12 @@ cat >$outfile <<EOF
 \\Format bmp      bmp  BMP             ""
 \\Format dvi     dvi   DVI             D
 \\Format eps     eps   EPS             ""
-\\Format epsi    epsi  EPSI            ""
 \\Format fax     ""    Fax             ""
 \\Format fig     fig   XFig            ""
 \\Format agr      agr  GRACE           ""
 \\Format html    html  HTML            H
+\\Format gif     gif   GIF             ""
+\\Format jpg     jpg   JPG             ""
 \\Format latex   tex   LaTeX           L
 \\Format linuxdoc sgml LinuxDoc        x
 \\Format lyx      lyx  LyX             ""
@@ -454,11 +451,14 @@ cat >$outfile <<EOF
 \\Format pdf3    pdf  "PDF (dvipdfm)"  m
 \\Format png     png   PNG             ""
 \\Format ppm     ppm   PPM             ""
+\\Format pgm     pgm   PGM             ""
+\\Format pbm     pbm   PBM             ""
 \\Format ps      ps    Postscript      t
 \\Format program  ""   Program         ""
 \\Format tgif     obj  TGIF            ""
 \\Format tiff     tif  TIFF            ""
 \\Format word    doc   Word            W
+\\Format xbm     xbm   XBM             ""
 \\Format xpm     xpm   XPM             ""
 \\Format lyxpreview    lyxpreview      "LyX Preview"           ""
 
@@ -488,7 +488,6 @@ cat >$outfile <<EOF
 \\viewer pdf "$PDF_VIEWER"
 \\viewer ps "$GHOSTVIEW -swap"
 \\viewer eps "$GHOSTVIEW"
-\\viewer latex "$LATEX_VIEWER"
 
 $rc_entries
 \\font_encoding "$chk_fontenc"
@@ -497,11 +496,11 @@ EOF
 ### the graphic converter part with the predefined ones
 #### Search for tne nonstandard converting progs
 #
-SEARCH_PROG([for an FIG -> EPS/XPM converter], FIG2DEV, fig2dev)
+SEARCH_PROG([for an FIG -> EPS/PPM converter], FIG2DEV, fig2dev)
 if test "$FIG2DEV" = "fig2dev"; then
 cat >>$outfile <<EOF
 \\converter fig eps "fig2dev -L eps \$\$i \$\$o" ""
-\\converter fig xpm "fig2dev -L xpm \$\$i \$\$o" ""
+\\converter fig ppm "fig2dev -L ppm \$\$i \$\$o" ""
 EOF
 fi
 
@@ -512,13 +511,13 @@ cat >>$outfile <<EOF
 EOF
 fi
 
-SEARCH_PROG([for an TGIF -> EPS/XPM converter], TGIF, tgif)
+SEARCH_PROG([for an TGIF -> EPS/PPM converter], TGIF, tgif)
 if test "$TGIF" = "tgif"; then
 cat >>$outfile <<EOF
 \\converter tgif eps "tgif -print -eps \$\$i" ""
 \\converter tgif pdf "tgif -print -pdf \$\$i" ""
 \\converter tgif png "tgif -print -png \$\$i" ""
-\\converter tgif xpm "tgif -print -stdout -xpm \$\$i > \$\$o" ""
+\\converter tgif ppm "tgif -print -stdout -xpm \$\$i | xpmtoppm > \$\$o" ""
 EOF
 fi
 
@@ -529,22 +528,13 @@ cat >>$outfile <<EOF
 EOF
 fi
 
-SEARCH_PROG([for an EPSI ->  EPS/XPM converter], EPS2EPS, eps2eps)
-if test "$EPS2EPS" = "eps2eps"; then
-cat >>$outfile <<EOF
-\\converter epsi pdf "epstopdf --outfile=\$\$o \$\$i" ""
-\\converter epsi eps "eps2eps \$\$i \$\$o" ""
-\\converter epsi xpm "eps2eps -sOutputFile=- \$\$i dummy.eps | convert - \$\$o" ""
-EOF
-fi
-
 #### Add Grace conversions (xmgrace needs an Xserver, gracebat doesn't.)
 SEARCH_PROG([for a Grace -> Image converter], GRACE, gracebat)
-if test "$GRACE" = "gracebat"; then 
+if test "$GRACE" = "gracebat"; then
 cat >>$outfile <<EOF
 \\converter agr eps "gracebat -hardcopy -printfile \$\$o -hdevice EPS \$\$i 2>/dev/null" ""
 \\converter agr png "gracebat -hardcopy -printfile \$\$o -hdevice PNG \$\$i 2>/dev/null" ""
-\\converter agr xpm "gracebat -hardcopy -printfile - -hdevice PNG \$\$i 2>/dev/null | convert - \$\$o" ""
+\\converter agr jpg "gracebat -hardcopy -printfile \$\$o -hdevice JPEG \$\$i 2>/dev/null" ""
 EOF
 fi
 
@@ -597,7 +587,7 @@ for file in $outfile textclass.lst packages.lst \
 done
 if test ! -r xfonts/fonts.dir ; then
     echo "removing font links"
-    rm -r xfonts/*.pfb xfonts/fonts.scale
+    rm -f xfonts/*.pfb xfonts/fonts.scale
 fi
 
 # Final clean-up