X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fconfigure.m4;h=6cfa32a414bbb2f687d471e792ba447f465f0109;hb=ce5660a75cfebdbbd4ad5913f871c57b2f9b1c9d;hp=d6b3b884005fc154d37a21ab57c61bb28ab23399;hpb=29f7055e9527314060b4a74c31a46155ff264a63;p=lyx.git diff --git a/lib/configure.m4 b/lib/configure.m4 index d6b3b88400..6cfa32a414 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 @@ -144,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 \ @@ -184,24 +194,26 @@ save_PATH=${PATH} PATH=${PATH}:./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 \$\$FName" +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 \$\$FName \$\$OutName" +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 Noweb -> LaTeX converter],literate_to_tex_command,noweave) -test $literate_to_tex_command = "noweave" && literate_to_tex_command="noweave -delay -index \$\$FName > \$\$OutName" +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 \$\$FName" +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 \$\$FName \$\$OutName" -test $word_to_latex_command = "word2x" && word_to_latex_command="word2x -f latex \$\$FName" +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 \$\$FName \$\$OutName" +test $image_command = "convert" && image_command="convert \$\$i \$\$o" # Search for a Postscript interpreter SEARCH_PROG([for a Postscript interpreter],GS, gs) @@ -213,18 +225,22 @@ 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) # 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 \$\$FName" +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],dvi_to_ps_command,dvips) -test $dvi_to_ps_command = "dvips" && dvi_to_ps_command="dvips -o \$\$OutName \$\$FName" +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) @@ -254,7 +270,7 @@ dnl fi # Search a GUI Fax program SEARCH_PROG([for a fax program], fax_command, ksendfax) -test $fax_command = "ksendfax" && fax_command="ksendfax \$\$FName" +test $fax_command = "ksendfax" && fax_command="ksendfax \$\$i" # Search for LinuxDoc support SEARCH_PROG([for SGML-tools 1.x (LinuxDoc)], LINUXDOC, sgml2lyx) @@ -266,10 +282,10 @@ fi case $LINUXDOC in sgml2lyx) - linuxdoc_to_latex_command="sgml2latex \$\$FName" - linuxdoc_to_dvi_command="sgml2latex -o dvi \$\$FName" - linuxdoc_to_html_command="sgml2html \$\$FName" - linuxdoc_to_lyx_command="sgml2lyx \$\$FName";; + 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" @@ -287,11 +303,11 @@ fi case $DOCBOOK in sgmltools) - docbook_to_dvi_command="sgmltools -b dvi \$\$FName" - 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 \$\$FName" - 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";; @@ -308,11 +324,11 @@ case $LPR in esac SEARCH_PROG([for a LaTeX -> HTML converter], TOHTML, tth latex2html hevea) -latex_to_html_command = $TOHTML +latex_to_html_command=$TOHTML case $TOHTML in - tth) latex_to_html_command="tth -t -e2 -L\$\$BaseName < \$\$FName > \$\$OutName";; - latex2html) latex_to_html_command="latex2html -no_subdir -split 0 -show_section_numbers \$\$FName";; - hevea) latex_to_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 @@ -386,24 +402,33 @@ cat >lyxrc.defaults <lyxrc.defaults <