Baruchs latest graphics patch

[lyx.git] / lib / configure.m4

diff --git a/lib/configure.m4 b/lib/configure.m4
index 10913e9d57908a0760792d1a15c10aaf5a262a11..6f051d0dffe73b627b96fc7308ff01faddbdcc3e 100644 (file)
--- a/lib/configure.m4
+++ b/lib/configure.m4
@@ -148,6 +148,12 @@ if test ! -r ${srcdir}/chkconfig.ltx ; then
   exit 1
 fi
 
+#### Adjust PATH for Win32 (Cygwin)
+if test "x$OSTYPE" = xcygwin; then
+  echo "configure: cygwin detected; path correction"
+  srcdir=`cygpath -w "${srcdir}" | tr '\\\\' /`
+  echo "srcdir=${srcdir}"
+fi
 
 #### Create the build directories if necessary
 for dir in bind clipart doc examples images kbd layouts reLyX \
@@ -219,7 +225,7 @@ SEARCH_PROG([for a Postscript previewer],GHOSTVIEW,gv ghostview)
 SEARCH_PROG([for a PDF preview],PDF_VIEWER,acroread gv ghostview xpdf)
 
 # Search something to preview dvi
-SEARCH_PROG([for a DVI previewer],DVI_VIEWER, xdvi)
+SEARCH_PROG([for a DVI previewer],DVI_VIEWER, xdvi windvi yap)
 
 # Search something to preview html
 SEARCH_PROG([for a HTML previewer],HTML_VIEWER, netscape)
@@ -325,6 +331,24 @@ case $TOHTML in
       hevea) latex_to_html_command="hevea -s \$\$i";;
 esac
 
+#### Search for image conversion ####
+SEARCH_PROG([for an Image -> EPS converter], TOEPS, convert pnmtops)
+case $TOEPS in
+       convert) gif_to_eps="convert GIF:\$\$i EPS:\$\$o" png_to_eps="convert PNG:\$\$i EPS:\$\$o" jpg_to_eps="convert JPG:\$\$i EPS:\$\$o";;
+       pnmtops) gif_to_eps="giftopnm \$\$i | pnmtops > \$\$o" png_to_eps="pngtopnm \$\$i | pnmtops >\$\$o" jpg_to_eps="jpegtopnm \$\$i | pnmtops >\$\$o";;
+esac
+
+SEARCH_PROG([for a Image -> PNG converter], TOPNG, convert pnmtopng)
+case $TOPNG in
+       convert) gif_to_png="convert GIF:\$\$i PNG:\$\$o" eps_to_png="convert EPS:\$\$i PNG:\$\$o" jpg_to_png="convert JPG:\$\$i PNG:\$\$o";;
+       pnmtopng) gif_to_png="giftopnm \$\$i | pnmtopng >\$\$o" eps_to_png="pstopnm \$\$i| pnmtopng >\$\$o" jpg_to_png="jpegtopnm \$\$i | pnmtopng >\$\$o";;
+esac
+
+SEARCH_PROG([For an EPS -> PDF converter], EPSTOPDF, epstopdf)
+case $EPSTOPDF in
+       epstopdf) eps_to_pdf="epstopdf --outfile=\$\$o \$\$i";;
+esac
+
 #### Explore the LaTeX configuration
 MSG_CHECKING(LaTeX configuration)
 # First, remove the files that we want to re-create
@@ -401,6 +425,7 @@ cat >lyxrc.defaults <<EOF
 \\Format docbook  sgml DocBook         B
 \\Format dvi     dvi   DVI             D
 \\Format eps     eps   EPS             ""
+\\Format epsi     epsi  EPSI    ""
 \\Format fax     ""    Fax             ""
 \\Format gif      gif  GIF             ""
 \\Format html    html  HTML            H
@@ -417,7 +442,6 @@ cat >lyxrc.defaults <<EOF
 \\Format program  ""   Program         ""
 \\Format word    doc   Word            W
 
-
 \\converter latex dvi "$LATEX \$\$i" "latex"
 \\converter latex pdf2 "$PDFLATEX \$\$i" "latex"
 \\converter latex html "$latex_to_html_command" "originaldir,needaux"
@@ -438,10 +462,17 @@ cat >lyxrc.defaults <<EOF
 \\converter html latex "$html_to_latex_command" ""
 \\converter word latex "$word_to_latex_command" ""
 
-\converter gif eps "$image_command" ""
-\converter png eps "$image_command" ""
-\converter jpg eps "$image_command" ""
-\converter gif png "$image_command" ""
+\\converter gif  eps "$gif_to_eps" ""
+\\converter png  eps "$png_to_eps" ""
+\\converter jpg  eps "$jpg_to_eps" ""
+
+\\converter gif  png "$gif_to_png" ""
+\\converter eps  png "$eps_to_png" ""
+\\converter epsi png "$eps_to_png" ""
+\\converter jpg  png "$jpg_to_png" ""
+
+\\converter eps  pdf "$eps_to_pdf" ""
+\\converter epsi pdf "$eps_to_pdf" ""
 
 \\viewer dvi "$DVI_VIEWER"
 \\viewer html "$HTML_VIEWER"