polish update

[lyx.git] / lib / configure.m4

diff --git a/lib/configure.m4 b/lib/configure.m4
index ac401cd9606c505e4b6fec40146c178a0a5ee111..4f2614ec716470536d4530c42346a76e3a690586 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"
@@ -300,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)
@@ -441,6 +440,8 @@ cat >$outfile <<EOF
 \\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             ""
@@ -450,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"           ""
 
@@ -492,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
 
@@ -507,13 +511,11 @@ 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 eps "tgif -stdout -print -color -eps \$\$i > \$\$o" ""
+\\converter tgif png "tgif -stdout -print -color -xpm \$\$i | xpmtoppm | pnmtopng > \$\$o" ""
 EOF
 fi
 
@@ -530,7 +532,7 @@ 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