Correct spelling of "Acknowledgments" in the APA layout.

[lyx.git] / lib / configure.m4

diff --git a/lib/configure.m4 b/lib/configure.m4
index ba5b1bb0efde5f7b1cd72833bded5d5c96ab10be..4b0d3584303d6ea5a7c902d0e7829e049b602207 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
@@ -433,12 +440,12 @@ changequote([,])dnl
              [eval] "found_$cleanclass=yes"
 changequote(,)dnl
             # The sed commands below are a bit scary. Here is what they do:
-            # 1-3: remove the \DeclareFOO macro and add the correct boolean 
-            #      at the end of the line telling whether the class is 
+            # 1-3: remove the \DeclareFOO macro and add the correct boolean
+            #      at the end of the line telling whether the class is
              #      available
-            # 4: if the macro had an optional argument with several 
+            # 4: if the macro had an optional argument with several
             #    parameters, only keep the first one
-            # 5: if the macro did not have an optional argument, provide one 
+            # 5: if the macro did not have an optional argument, provide one
             #    (equal to the class name)
             # 6: remove brackets and replace with correctly quoted entries
             grep '\\Declare\(LaTeX\|DocBook\|LinuxDoc\)Class' "$file" \
@@ -452,7 +459,7 @@ changequote(,)dnl
            fi
         fi ;;
     esac
-  done 
+  done
   MSG_RESULT(done)
 else
   MSG_RESULT(auto)
@@ -514,6 +521,7 @@ cat >$outfile <<EOF
 \\Format date       ""     "date command"          "" ""       ""
 \\Format dateout    tmp    "date (output)"         "" ""       ""
 \\Format docbook    sgml    DocBook                B  ""       ""
+\\Format docbook-xml xml    "Docbook (xml)"        "" "" ""
 \\Format dvi        dvi     DVI                    D  "$DVI_VIEWER"    ""
 \\Format eps        eps     EPS                    "" "$EPS_VIEWER"    ""
 \\Format fax        ""      Fax                    "" ""       ""
@@ -547,6 +555,7 @@ cat >$outfile <<EOF
 \\Format xpm        xpm     XPM                    "" "$RASTERIMAGE_VIEWER"    "$RASTERIMAGE_EDITOR"
 
 \\converter date       dateout    "date +%d-%m-%Y > \$\$o"     ""
+\\converter docbook    docbook-xml "cp \$\$i \$\$o" "xml"
 \\converter docbook    dvi        "$docbook_to_dvi_command"    ""
 \\converter docbook    html       "$docbook_to_html_command"   ""
 \\converter dvi        pdf3       "$dvi_to_pdf_command"        ""
@@ -565,7 +574,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" ""