if test -n "[$]$2"; then
ac_result=yes
+ ifelse($4,,,[$4])
else
ac_result=no
fi
- ifelse($4,,,[$4])
MSG_RESULT($ac_result)
test -n "[$]$2" && break
fi
fi
#### Create the build directories if necessary
-for dir in bind clipart doc examples images kbd layouts reLyX \
+for dir in bind clipart doc examples help images kbd layouts reLyX \
scripts templates ui ; do
test ! -d $dir && mkdir $dir
done
# Search LaTeX2e
SEARCH_PROG([for a LaTeX2e program],LATEX,latex latex2e,CHECKLATEX2E,dnl
[lyx_check_config=no])
-if test x$lyx_check_config != x ; then
-SEARCH_PROG([for the pdflatex program],PDFLATEX,pdflatex,CHECKLATEX2E)
+latex_to_dvi=$LATEX
+test -z "$latex_to_dvi" && latex_to_dvi="none"
+
+# Search for pdflatex
+if test ${lyx_check_config} = no ; then
+ latex_to_pdf=none
+else
+ SEARCH_PROG([for the pdflatex program],latex_to_pdf,pdflatex)
fi
+test $latex_to_dvi != "none" && latex_to_dvi="$latex_to_dvi \$\$i"
+test $latex_to_pdf != "none" && latex_to_pdf="$latex_to_pdf \$\$i"
+
# Search for an installed reLyX or a ready-to-install one
save_PATH=${PATH}
PATH=${PATH}:./reLyX/
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 a Image -> XPM converter], TOXPM, convert)
+if test "$TOXPM" = "convert"; then
+ gif_to_xpm="convert GIF:\$\$i XPM:\$\$o"
+ eps_to_xpm="convert EPS:\$\$i XPM:\$\$o"
+ jpg_to_xpm="convert JPG:\$\$i XPM:\$\$o"
+ png_to_xpm="convert PNG:\$\$i XPM:\$\$o"
+fi
+
SEARCH_PROG([For an EPS -> PDF converter], EPSTOPDF, epstopdf)
case $EPSTOPDF in
epstopdf) eps_to_pdf="epstopdf --outfile=\$\$o \$\$i";;
\\Format png png PNG ""
\\Format ps ps Postscript t
\\Format program "" Program ""
+\\Format xpm xpm XPM ""
\\Format word doc Word W
-\\converter latex dvi "$LATEX \$\$i" "latex"
-\\converter latex pdf2 "$PDFLATEX \$\$i" "latex"
+\\converter latex dvi "$latex_to_dvi" "latex"
+\\converter latex pdf2 "$latex_to_pdf" "latex"
\\converter latex html "$latex_to_html_command" "originaldir,needaux"
\\converter literate latex "$literate_to_tex_command" ""
\\converter dvi pdf3 "$dvi_to_pdf_command" ""
\\converter epsi png "$eps_to_png" ""
\\converter jpg png "$jpg_to_png" ""
+\\converter gif xpm "$gif_to_xpm" ""
+\\converter eps xpm "$eps_to_xpm" ""
+\\converter epsi xpm "$eps_to_xpm" ""
+\\converter jpg xpm "$jpg_to_xpm" ""
+\\converter png xpm "$png_to_xpm" ""
+
\\converter eps pdf "$eps_to_pdf" ""
\\converter epsi pdf "$eps_to_pdf" ""