anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-25 05:55:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

test for grace converters; check for gnu m4

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4063 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2002-04-24 21:51:02 +00:00
parent 7bfe746bab
commit f79c6a1991
5 changed files with 67 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2002-04-24 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* configure.in: add check for GNU m4 (does not check that program
is actually gnu m4, but better than nothing)
* configure.in: small hack for compatibility with autoconf 2.52.
Basically, there is a weird interference with stdlib.h with g++
and _some_ functions (mkstemp, mktemp...)

1
configure.in
View File

@ -40,6 +40,7 @@ if test "x$KPSEWHICH" = xkpsewhich ; then
AC_DEFINE(HAVE_KPSEWHICH, 1,
[Define this if you have the kpsewhich program working on your system.])
fi
AC_CHECK_PROGS(M4, gm4 gnum4 m4, m4)
# Work around a problem in automake 1.4: when invoking install-strip,
# INSTALL_PROGRAM is changed to 'install -s', and since

8
lib/ChangeLog
View File

@ -1,3 +1,11 @@
2002-04-24 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* Makefile.am: do not set M4 explicitely
2002-04-24 Rob Lahaye <lahaye@users.sourceforge.net>
* configure.m4: add 'convert XPM to EPS', add more Grace conversions
and change tab to double space indentation in conversion section
2002-04-23 Mike Ressler <mike.ressler@alum.mit.edu>
* layouts/aastex.layout: add ProvidesNatbib

1
lib/Makefile.am
View File

@ -4,7 +4,6 @@ DISTCLEANFILES = *.orig *.rej *~ *.bak core textclass.lst packages.lst \
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
SUBDIRS = reLyX
M4=m4
CHMOD=chmod
BIND = bind/*.bind

56
lib/configure.m4
View File

@ -355,17 +355,37 @@ esac
#### Search for image conversion ####
SEARCH_PROG([for an Image -> EPS converter], TOEPS, convert pnmtops)
case $TOEPS in
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" ;;
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"
@ -375,11 +395,27 @@ if test "$TOXPM" = "convert"; then
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";;
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
MSG_CHECKING(LaTeX configuration)
# First, remove the files that we want to re-create
@ -504,7 +540,6 @@ cat >$outfile <<EOF
\\converter html latex "$html_to_latex_command" ""
\\converter word latex "$word_to_latex_command" ""
\\converter agr eps "xmgrace -hardcopy -printfile \$\$o -hdevice EPS \$\$i" ""
\\converter bmp eps "$bmp_to_eps" ""
\\converter fits eps "$fits_to_eps" ""
\\converter gif eps "$gif_to_eps" ""
@ -517,6 +552,7 @@ cat >$outfile <<EOF
\\converter tgif eps "tgif -print -eps \$\$i" ""
\\converter tiff eps "tiff2ps \$\$i > \$\$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" ""
@ -539,6 +575,10 @@ cat >$outfile <<EOF
\\converter eps pdf "$eps_to_pdf" ""
\\converter epsi pdf "$eps_to_pdf" ""
\\converter agr eps "$agr_to_eps" ""
\\converter agr pdf "$agr_to_pdf" ""
\\converter agr png "$agr_to_png" ""
\\viewer dvi "$DVI_VIEWER"
\\viewer html "$HTML_VIEWER"
\\viewer pdf "$PDF_VIEWER"