X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fconfigure.m4;h=9fbf2391a765bd55a70af13ff2b8ab5d0b5d405d;hb=f79c6a1991d1743ee1bf31f769bd57fb295241af;hp=a56d3d82951a2bb5c81e4deb795d00d7197b2520;hpb=9f982ffa9d9de85da8128a9327711df72866da3e;p=lyx.git diff --git a/lib/configure.m4 b/lib/configure.m4 index a56d3d8295..9fbf2391a7 100644 --- a/lib/configure.m4 +++ b/lib/configure.m4 @@ -37,7 +37,7 @@ do set dummy $ac_prog ; ac_word=$[2] if test -n "$ac_word"; then MSG_CHECKING([for \"$ac_word\"],[+]) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -x [$ac_dir/$ac_word]; then @@ -83,7 +83,7 @@ dnl dnl PROVIDE_DEFAULT_FILE(FILE, DEFAULT-VALUE) dnl define(PROVIDE_DEFAULT_FILE,[dnl -# if $1 does not exist (because LaTeX did not run), +# if $1 does not exist (because LaTeX did not run), # then provide a standard version. if test ! -f $1 ; then cat >$1 <chklatex.ltx </dev/null \ - | grep 'ThisIsLaTeX2e' >/dev/null; then + | grep 'ThisIsLaTeX2e' >/dev/null; then : else LATEX= @@ -269,7 +269,7 @@ test $dvi_to_pdf_command = "dvipdfm" && dvi_to_pdf_command="dvipdfm \$\$i" # Search a *roff program (used to translate tables in ASCII export) LYXRC_PROG([for a *roff formatter], \ascii_roff_command, dnl 'groff -t -Tlatin1 $$FName' nroff,dnl - test $prog = "nroff" && prog='tbl $$FName | nroff') + test "$prog" = "nroff" && prog='tbl $$FName | nroff') # Search the ChkTeX program LYXRC_PROG([for ChkTeX], \chktex_command,dnl @@ -336,7 +336,7 @@ case $DOCBOOK in esac # Search for a spool command -LYXRC_PROG([for a spool command], \printspool_command, lp lpr) +LYXRC_PROG([for a spool command], \print_spool_command, lp lpr) case $prog in lp) print_spool_printerprefix="-d ";; lpr) print_spool_printerprefix="-P";; @@ -355,27 +355,65 @@ 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";; + convert) + bmp_to_eps="convert BMP:\$\$i EPS:\$\$o" + fits_to_eps="convert FITS:\$\$i EPS:\$\$o" + gif_to_eps="convert GIF:\$\$i EPS:\$\$o" + jpg_to_eps="convert JPG:\$\$i EPS:\$\$o" + pbm_to_eps="convert PBM:\$\$i EPS:\$\$o" + pgm_to_eps="convert PGM:\$\$i EPS:\$\$o" + png_to_eps="convert PNG:\$\$i EPS:\$\$o" + ppm_to_eps="convert PPM:\$\$i EPS:\$\$o" + sgi_to_eps="convert SGI:\$\$i EPS:\$\$o" + xbm_to_eps="convert XBM:\$\$i EPS:\$\$o" + xwd_to_eps="convert XWD:\$\$i EPS:\$\$o" + xpm_to_eps="convert XPM:\$\$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) +SEARCH_PROG([for an 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";; + 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 a Image -> XPM converter], TOXPM, convert) +SEARCH_PROG([for an 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" + 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" + ps_to_xpm="convert PS:\$\$i XPM:\$\$o" + xbm_to_xpm="convert XBM:\$\$i XPM:\$\$o" fi -SEARCH_PROG([For an EPS -> PDF converter], EPSTOPDF, epstopdf) +SEARCH_PROG([for an EPS -> PDF converter], EPSTOPDF, epstopdf) case $EPSTOPDF in - epstopdf) eps_to_pdf="epstopdf --outfile=\$\$o \$\$i";; + epstopdf) eps_to_pdf="epstopdf --outfile=\$\$o \$\$i";; +esac + +#### Add Grace conversions (xmgrace needs an Xserver, gracebat doesn't.) +SEARCH_PROG([for a Grace -> Image converter], GRACE, gracebat) +case $GRACE in + gracebat) + for device in `gracebat -version 2>/dev/null | grep "^Dummy"` ; do + case $device in + EPS) + agr_to_eps="xmgrace -hardcopy -printfile \$\$o -hdevice $device \$\$i";; + PDF) + agr_to_pdf="xmgrace -hardcopy -printfile \$\$o -hdevice $device \$\$i";; + PNG) + agr_to_png="xmgrace -hardcopy -printfile \$\$o -hdevice $device \$\$i";; + esac + done esac #### Explore the LaTeX configuration @@ -394,15 +432,15 @@ ${docbook_cmd} \\input{${srcdir}/chkconfig.ltx} EOF ## Construct the list of classes to test for. - # build the list of available layout files and convert it to commands - # for chkconfig.ltx - for file in ./layouts/*.layout ${srcdir}/layouts/*.layout ; do + # build the list of available layout files and convert it to commands + # for chkconfig.ltx + for file in ./layouts/*.layout ${srcdir}/layouts/*.layout ; do case $file in */\*.layout) ;; *) test -r "$file" && echo $file ;; esac done | sed -e 's%^.*layouts/\(.*\)\.layout$%\\TestDocClass{\1}%'\ - > chklayouts.tex + > chklayouts.tex changequote([,])dnl [eval] ${LATEX} wrap_chkconfig.ltx 2>/dev/null | grep '^\+' [eval] `cat chkconfig.vars | sed 's/-/_/g'` @@ -411,13 +449,13 @@ fi # Do we have all the files we need? Useful if latex did not run changequote([,])dnl -echo creating textclass.lst +echo "creating textclass.lst" PROVIDE_DEFAULT_FILE(textclass.lst,dnl [# This file declares layouts and their associated definition files # (include dir. relative to the place where this file is). -# It contains only default values, since chkconfig.ltx could not be run +# It contains only default values, since chkconfig.ltx could not be run # for some reason. Run ./configure if you need to update it after a -# configuration change. +# configuration change. article article article report report report book book book @@ -426,7 +464,7 @@ letter letter letter]) PROVIDE_DEFAULT_FILE(chkconfig.sed,[s/@.*@/???/g]) -echo creating packages.lst +echo "creating packages.lst" PROVIDE_DEFAULT_FILE(packages.lst,dnl [# This file should contain the list of LaTeX packages that have been # recognized by LyX. Unfortunately, since configure could not find @@ -435,12 +473,12 @@ PROVIDE_DEFAULT_FILE(packages.lst,dnl ]) changequote(,)dnl -echo creating doc/LaTeXConfig.lyx +echo "creating doc/LaTeXConfig.lyx" echo "s/@chk_linuxdoc@/$chk_linuxdoc/g" >> chkconfig.sed echo "s/@chk_docbook@/$chk_docbook/g" >> chkconfig.sed sed -f chkconfig.sed ${srcdir}/doc/LaTeXConfig.lyx.in >doc/LaTeXConfig.lyx -echo creating $outfile +echo "creating $outfile" cat >$outfile <$outfile <$outfile <$outfile < \$\$o" "" +\\converter xbm eps "$xbm_to_eps" "" +\\converter xpm eps "$xpm_to_eps" "" +\\converter xwd eps "$xwd_to_eps" "" + +\\converter tgif xpm "tgif -print -stdout -xpm \$\$i > \$\$o" "" +\\converter tgif png "tgif -print -stdout -png \$\$i > \$\$o" "" +\\converter tgif pdf "tgif -print -stdout -pdf \$\$i > \$\$o" "" \\converter gif png "$gif_to_png" "" \\converter eps png "$eps_to_png" "" @@ -505,10 +569,16 @@ cat >$outfile <$outfile </dev/null + echo "$font.$ext -unknown-$font-medium-r-normal--0-0-0-0-p-0-adobe-fontspecific" >>xfonts/tmpfonts + num=`expr $num + 1` + break + fi + done + MSG_RESULT($result) +done + +if test ! $num = 0 ; then + echo $num >xfonts/fonts.scale + cat xfonts/tmpfonts >>xfonts/fonts.scale + cp xfonts/fonts.scale xfonts/fonts.dir +fi +rm -f xfonts/tmpfonts + + # Remove superfluous files if we are not writing in the main lib -# directory +# directory for file in $outfile textclass.lst packages.lst \ - doc/LaTeXConfig.lyx ; do + doc/LaTeXConfig.lyx xfonts/fonts.dir ; do # we rename the file first, so that we avoid comparing a file with itself mv $file $file.new - if test -r $srcdir/$file && diff $file.new $srcdir/$file >/dev/null 2>/dev/null ; - then + if test -r $srcdir/$file && diff $file.new $srcdir/$file >/dev/null 2>/dev/null ; + then echo "removing $file, which is identical to the system global version" rm -f $file.new else