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
+case `uname -s` in
+ CYGWIN*)
+ echo "configure: cygwin detected; path correction"
+ srcdir=`cygpath -w "${srcdir}" | tr '\\\\' /`
+ echo "srcdir=${srcdir}" ;;
+esac
#### Create the build directories if necessary
for dir in bind clipart doc examples help images kbd layouts reLyX \
SEARCH_PROG([for a DVI to PDF converter],dvi_to_pdf_command,dvipdfm)
test $dvi_to_pdf_command = "dvipdfm" && dvi_to_pdf_command="dvipdfm \$\$i"
-# Search for a program to convert previewlyx to eps
-SEARCH_PROG([for a LyX preview converter],lyxpreview_to_xpm_command,lyxpreview2xpm.sh)
-test $lyxpreview_to_xpm_command = "lyxpreview2xpm.sh" && lyxpreview_to_xpm_command="lyxpreview2xpm.sh \$\$i \$\$o"
+# We have a script to convert previewlyx to ppm
+lyxpreview_to_bitmap_command="lyxpreview2bitmap.sh"
# Search a *roff program (used to translate tables in ASCII export)
LYXRC_PROG([for a *roff formatter], \ascii_roff_command, dnl
# Search for a spellchecker
LYXRC_PROG([for a spell-checker], \spell_command, ispell)
+# Search for computer algebra systems
+SEARCH_PROG([for Octave],OCTAVE,octave)
+SEARCH_PROG([for Maple],MAPLE,maple)
+
dnl # Search a Fax handling program
dnl SEARCH_PROG([for a fax driver], FAX, sendfax faxsend fax)
dnl if test $FAX = sendfax ; then
\\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 latex tex LaTeX L
\\Format pdf2 pdf "PDF (pdflatex)" F
\\Format pdf3 pdf "PDF (dvipdfm)" m
\\Format png png PNG ""
+\\Format ppm ppm PPM ""
\\Format ps ps Postscript t
\\Format program "" Program ""
\\Format tgif obj TGIF ""
\\Format tiff tif TIFF ""
\\Format word doc Word W
\\Format xpm xpm XPM ""
-\\Format lyxpreview lyxpreview LYXPREVIEW ""
+\\Format lyxpreview lyxpreview "LyX Preview" ""
\\converter latex dvi "$latex_to_dvi" "latex"
\\converter latex pdf2 "$latex_to_pdf" "latex"
\\converter linuxdoc html "$linuxdoc_to_html_command" ""
\\converter docbook dvi "$docbook_to_dvi_command" ""
\\converter docbook html "$docbook_to_html_command" ""
-\\converter lyxpreview xpm "$lyxpreview_to_xpm_command" ""
+\\converter lyxpreview ppm "$lyxpreview_to_bitmap_command" ""
\\converter latex lyx "$tex_to_lyx_command" ""
\\converter literate lyx "$literate_to_lyx_command" ""
if test "$EPS2EPS" = "eps2eps"; then
cat >>$outfile <<EOF
\\converter epsi pdf "epstopdf --outfile=\$\$o \$\$i" ""
-\\converter epsi eps "eps2eps \$\$i $$o" ""
+\\converter epsi eps "eps2eps \$\$i \$\$o" ""
\\converter epsi xpm "eps2eps -sOutputFile=- \$\$i dummy.eps | convert - \$\$o" ""
EOF
fi
# create a fonts.dir file to make X fonts available to LyX
echo "checking for TeX fonts"
-fontlist="cmex10 cmmi10 cmr10 cmsy10 eufm10 msam10 msbm10i wasy10"
+fontlist="cmex10 cmmi10 cmr10 cmsy10 eufm10 msam10 msbm10 wasy10"
rm -f xfonts/fonts.dir xfonts/fonts.scale xfonts/tmpfonts
num=0