Define the lyxpreview -> png converter only if dvipng is found.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8698 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/ChangeLog b/lib/ChangeLog
index cf01f42b29a63c1722d57408fa7e532bd775049b..a545bedecc827687d13821c48af5e2eb4d8ed32a 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-27  Angus Leeming  <leeming@lyx.org>
+
+       * configure.m4: don't create a lyxpreview -> png converter if
+       dvipng is not found.
+
 2004-04-26  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
        * CREDITS: add Huang Ying.

diff --git a/lib/configure.m4 b/lib/configure.m4
index ba5b1bb0efde5f7b1cd72833bded5d5c96ab10be..43d5810313c2c05bbade7085dfa73683577f925c 100644 (file)
--- a/lib/configure.m4
+++ b/lib/configure.m4
@@ -309,6 +309,13 @@ test $dvi_to_pdf_command = "dvipdfm" && dvi_to_pdf_command="dvipdfm \$\$i"
 # We have a script to convert previewlyx to ppm or to png
 lyxpreview_to_bitmap_command='python $$s/lyxpreview2bitmap.py'
 
+# Search for 'dvipng'. Only enable the conversion from lyxpreview -> png
+# if dvipng is found.
+SEARCH_PROG([for dvipng],DVIPNG,dvipng)
+
+test "$DVIPNG" = "dvipng" && \
+       lyxpreview_to_png_command = $lyxpreview_to_bitmap_command
+
 # 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
@@ -565,7 +572,7 @@ cat >$outfile <<EOF
 \\converter linuxdoc   lyx        "$linuxdoc_to_lyx_command"   ""
 \\converter literate   latex      "$literate_to_tex_command"   ""
 \\converter literate   lyx        "$literate_to_lyx_command"   ""
-\\converter lyxpreview png        "$lyxpreview_to_bitmap_command"      ""
+\\converter lyxpreview png        "$lyxpreview_to_png_command" ""
 \\converter lyxpreview ppm        "$lyxpreview_to_bitmap_command"      ""
 \\converter ps         fax        "$fax_command"       ""
 \\converter ps         pdf        "$ps_to_pdf_command" ""