From 055fe2604d9cf4121737d7bace7af3f6237347cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= <larsbj@gullik.org>
Date: Sun, 12 Jan 2003 22:51:59 +0000
Subject: [PATCH] converters patch from Michael Schmitt

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5937 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/ChangeLog    |  5 +++++
 lib/configure.m4 | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/ChangeLog b/lib/ChangeLog
index e62ec176f5..abaefb8c12 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-12  Michael Schmitt <michael.schmitt@teststep.org>
+
+	* configure.m4: Replace fig/tgif/agr->xpm converters by
+	fig/tgif/agr->ppm/jpeg converters
+
 2003-01-12  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
 	* Makefile.am (EXTRA_DIST): fix for distcheck
diff --git a/lib/configure.m4 b/lib/configure.m4
index cc410453e6..f95f6337f2 100644
--- a/lib/configure.m4
+++ b/lib/configure.m4
@@ -497,11 +497,11 @@ EOF
 ### the graphic converter part with the predefined ones
 #### Search for tne nonstandard converting progs
 #
-SEARCH_PROG([for an FIG -> EPS/XPM converter], FIG2DEV, fig2dev)
+SEARCH_PROG([for an FIG -> EPS/PPM converter], FIG2DEV, fig2dev)
 if test "$FIG2DEV" = "fig2dev"; then
 cat >>$outfile <<EOF
 \\converter fig eps "fig2dev -L eps \$\$i \$\$o" ""
-\\converter fig xpm "fig2dev -L xpm \$\$i \$\$o" ""
+\\converter fig ppm "fig2dev -L ppm \$\$i \$\$o" ""
 EOF
 fi
 
@@ -512,13 +512,13 @@ cat >>$outfile <<EOF
 EOF
 fi
 
-SEARCH_PROG([for an TGIF -> EPS/XPM converter], TGIF, tgif)
+SEARCH_PROG([for an TGIF -> EPS/PPM converter], TGIF, tgif)
 if test "$TGIF" = "tgif"; then
 cat >>$outfile <<EOF
 \\converter tgif eps "tgif -print -eps \$\$i" ""
 \\converter tgif pdf "tgif -print -pdf \$\$i" ""
 \\converter tgif png "tgif -print -png \$\$i" ""
-\\converter tgif xpm "tgif -print -stdout -xpm \$\$i > \$\$o" ""
+\\converter tgif ppm "tgif -print -stdout -xpm \$\$i | xpmtoppm > \$\$o" ""
 EOF
 fi
 
@@ -535,7 +535,7 @@ if test "$GRACE" = "gracebat"; then
 cat >>$outfile <<EOF
 \\converter agr eps "gracebat -hardcopy -printfile \$\$o -hdevice EPS \$\$i 2>/dev/null" ""
 \\converter agr png "gracebat -hardcopy -printfile \$\$o -hdevice PNG \$\$i 2>/dev/null" ""
-\\converter agr xpm "gracebat -hardcopy -printfile - -hdevice PNG \$\$i 2>/dev/null | convert - \$\$o" ""
+\\converter agr jpg "gracebat -hardcopy -printfile \$\$o -hdevice JPEG \$\$i 2>/dev/null" ""
 EOF
 fi