X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fconfigure.m4;h=10913e9d57908a0760792d1a15c10aaf5a262a11;hb=6ee60cb738833064f09f2fa003afaca9f680a584;hp=2089654070d0b063c2b2251733c123a09e51ace5;hpb=b8072fd6f77ebd592ecd514dadc04839516b8a8b;p=lyx.git diff --git a/lib/configure.m4 b/lib/configure.m4 index 2089654070..10913e9d57 100644 --- a/lib/configure.m4 +++ b/lib/configure.m4 @@ -85,6 +85,7 @@ dnl ######### End M4 macros ############################################# lyx_check_config=yes lyx_keep_temps=no srcdir= +lyx_suffix= #### Parse the command line for ac_option do @@ -96,12 +97,15 @@ Options: --help show this help lines --keep-temps keep temporary files (for debug. purposes) --without-latex-config do not run LaTeX to determine configuration + --with-lyx-suffix=suffix suffix of binary installed files EOF exit 0;; --without-latex-config) lyx_check_config=no ;; --keep-temps) lyx_keep_temps=yes ;; + --with-lyx-suffix*) + lyx_suffix=`echo "$ac_option" | sed 's,--with-lyx-suffix=,,;s,^,-,'` esac done @@ -182,12 +186,28 @@ fi # Search for an installed reLyX or a ready-to-install one save_PATH=${PATH} PATH=${PATH}:./reLyX/ -SEARCH_PROG([for reLyX LaTeX-to-LyX translator],RELYX,reLyX) +SEARCH_PROG([for a LaTeX -> LyX converter],tex_to_lyx_command,reLyX) PATH=${save_PATH} +test $tex_to_lyx_command = "reLyX" && tex_to_lyx_command="reLyX -f \$\$i" +tex_to_lyx_command=`echo $tex_to_lyx_command | sed "s,reLyX,reLyX$lyx_suffix,"` + +SEARCH_PROG([for a Noweb -> LyX converter],literate_to_lyx_command,noweb2lyx) +test $literate_to_lyx_command = "noweb2lyx" && literate_to_lyx_command="noweb2lyx \$\$i \$\$o" +literate_to_lyx_command=`echo $literate_to_lyx_command | sed "s,noweb2lyx,noweb2lyx$lyx_suffix,"` # Search something to process a literate document -SEARCH_PROG([for a Literate programming processor],LITERATE,"noweave -delay -index") -if test "$LITERATE" = "none"; then LITERATE_EXT="none"; else LITERATE_EXT=".nw"; fi +SEARCH_PROG([for a Noweb -> LaTeX converter],literate_to_tex_command,noweave) +test $literate_to_tex_command = "noweave" && literate_to_tex_command="noweave -delay -index \$\$i > \$\$o" + +SEARCH_PROG([for a HTML -> Latex converter],html_to_latex_command,html2latex) +test $html_to_latex_command = "html2latex" && html_to_latex_command="html2latex \$\$i" + +SEARCH_PROG([for a MSWord -> Latex converter],word_to_latex_command,wvCleanLatex word2x) +test "$word_to_latex_command" = "wvCleanLatex" && word_to_latex_command="wvCleanLatex \$\$i \$\$o" +test "$word_to_latex_command" = "word2x" && word_to_latex_command="word2x -f latex \$\$i" + +SEARCH_PROG([for Image converter],image_command,convert) +test $image_command = "convert" && image_command="convert \$\$i \$\$o" # Search for a Postscript interpreter SEARCH_PROG([for a Postscript interpreter],GS, gs) @@ -196,13 +216,25 @@ SEARCH_PROG([for a Postscript interpreter],GS, gs) SEARCH_PROG([for a Postscript previewer],GHOSTVIEW,gv ghostview) # Search for a program to preview pdf -SEARCH_PROG([for a PDF preview],PDFVIEWER,xpdf acroread 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 for a program to convert pdf to ps -SEARCH_PROG([for a PDF to PS converter],PDFPS,pdf2ps pdftops) +# Search something to preview html +SEARCH_PROG([for a HTML previewer],HTML_VIEWER, netscape) + +# 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 \$\$i" # Search for a program to convert dvi to ps -SEARCH_PROG([for a DVI to PS converter],DVIPS,dvips) +SEARCH_PROG([for a DVI to PS converter],dvi_to_ps_command,dvips) +test $dvi_to_ps_command = "dvips" && dvi_to_ps_command="dvips -o \$\$o \$\$i" + +# Search for a program to convert dvi to pdf +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 a *roff program (used to translate tables in ASCII export) SEARCH_PROG([for a *roff formatter],ROFF,groff nroff) @@ -218,17 +250,21 @@ test $CHKTEX = "chktex" && chktex_command="$CHKTEX -n1 -n3 -n6 -n9 -n22 -n25 -n3 # Search for a spellchecker SEARCH_PROG([for a spell-checker], SPELL,ispell) -# Search a Fax handling program -SEARCH_PROG([for a fax driver], FAX, sendfax faxsend fax) -if test $FAX = sendfax ; then - fax_command="sendfax -n -h '\$\$Host' -c '\$\$Comment' -x '\$\$Enterprise' -d '\$\$Name'@'\$\$Phone' '\$\$FName'" -elif test $FAX = faxsend ; then - fax_command="faxsend '\$\$Phone' '\$\$FName'" -elif test $FAX = fax ; then - fax_command="fax send '\$\$Phone' '\$\$FName'" -else - fax_command="none" -fi +dnl # Search a Fax handling program +dnl SEARCH_PROG([for a fax driver], FAX, sendfax faxsend fax) +dnl if test $FAX = sendfax ; then +dnl fax_command="sendfax -n -h '\$\$Host' -c '\$\$Comment' -x '\$\$Enterprise' -d '\$\$Name'@'\$\$Phone' '\$\$FName'" +dnl elif test $FAX = faxsend ; then +dnl fax_command="faxsend '\$\$Phone' '\$\$FName'" +dnl elif test $FAX = fax ; then +dnl fax_command="fax send '\$\$Phone' '\$\$FName'" +dnl else +dnl fax_command="none" +dnl fi + +# Search a GUI Fax program +SEARCH_PROG([for a fax program], fax_command, ksendfax) +test $fax_command = "ksendfax" && fax_command="ksendfax \$\$i" # Search for LinuxDoc support SEARCH_PROG([for SGML-tools 1.x (LinuxDoc)], LINUXDOC, sgml2lyx) @@ -240,11 +276,13 @@ fi case $LINUXDOC in sgml2lyx) - linuxdoc_to_latex_command="sgml2latex" - linuxdoc_to_html_command="sgml2html '\$\$FName'" - linuxdoc_to_lyx_command="sgml2lyx";; + linuxdoc_to_latex_command="sgml2latex \$\$i" + linuxdoc_to_dvi_command="sgml2latex -o dvi \$\$i" + linuxdoc_to_html_command="sgml2html \$\$i" + linuxdoc_to_lyx_command="sgml2lyx \$\$i";; none) linuxdoc_to_latex_command="none" + linuxdoc_to_dvi_command="none" linuxdoc_to_html_command="none" linuxdoc_to_lyx_command="none";; esac @@ -259,11 +297,11 @@ fi case $DOCBOOK in sgmltools) - docbook_to_dvi_command="sgmltools -b dvi" - docbook_to_html_command="sgmltools -b html '\$\$FName'";; + docbook_to_dvi_command="sgmltools -b dvi \$\$i" + docbook_to_html_command="sgmltools -b html \$\$i";; db2dvi) - docbook_to_dvi_command="db2dvi" - docbook_to_html_command="db2html '\$\$FName'";; + docbook_to_dvi_command="db2dvi \$\$i" + docbook_to_html_command="db2html \$\$i";; none) docbook_to_dvi_command="none" docbook_to_html_command="none";; @@ -279,12 +317,12 @@ case $LPR in *) :;; # leave to empty values esac -# Search for a latex to html converter -SEARCH_PROG([for an HTML converter], TOHTML, tth latex2html hevea) +SEARCH_PROG([for a LaTeX -> HTML converter], TOHTML, tth latex2html hevea) +latex_to_html_command=$TOHTML case $TOHTML in - tth) html_command="tth -t < '\$\$FName' > '\$\$OutName'";; - latex2html) html_command="latex2html -no_subdir -split 0 -show_section_numbers '\$\$FName'";; - hevea) html_command="hevea -s '\$\$FName'";; + tth) latex_to_html_command="tth -t -e2 -L\$\$b < \$\$i > \$\$o";; + latex2html) latex_to_html_command="latex2html -no_subdir -split 0 -show_section_numbers \$\$i";; + hevea) latex_to_html_command="hevea -s \$\$i";; esac #### Explore the LaTeX configuration @@ -358,27 +396,64 @@ cat >lyxrc.defaults <