From 5ae1d38208178163819f352161013309a48974dd Mon Sep 17 00:00:00 2001
From: Dekel Tsur <dekelts@tau.ac.il>
Date: Wed, 24 Jan 2001 15:47:52 +0000
Subject: [PATCH] Add a check for dvipdfm to lib/configure.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1384 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/ChangeLog    |  4 ++++
 lib/configure    | 39 +++++++++++++++++++++++++++++++++++++++
 lib/configure.m4 |  6 ++++++
 3 files changed, 49 insertions(+)

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 5ec242aae2..7c72d27331 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-24  Dekel Tsur  <dekelts@tau.ac.il>
+
+	* configure.m4: Add a check for dvipdfm.
+
 2001-01-24  John Levon  <moz@compsoc.man.ac.uk>
 
  	* Makefile.am: make configure and configure.cmd installed
diff --git a/lib/configure b/lib/configure
index 40aa44d3d4..a7c567b32f 100755
--- a/lib/configure
+++ b/lib/configure
@@ -666,6 +666,43 @@ fi
 
 test $dvi_to_ps_command = "dvips" && dvi_to_ps_command="dvips -o \$\$o \$\$i"
 
+# Search for a program to convert dvi to pdf
+echo $ac_n "checking for a DVI to PDF converter""... $ac_c"
+echo "$ac_t""(dvipdfm)"
+dvi_to_pdf_command=
+for ac_prog in dvipdfm
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog ; ac_word=$2
+if test -n "$ac_word"; then
+  echo $ac_n "+checking for \"$ac_word\"""... $ac_c"
+  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
+      dvi_to_pdf_command="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+
+  if test -n "$dvi_to_pdf_command"; then
+    ac_result=yes
+  else
+    ac_result=no
+  fi
+  
+  echo "$ac_t""$ac_result"
+  test -n "$dvi_to_pdf_command" && break
+fi
+done
+
+if test -z "$dvi_to_pdf_command" ; then
+  dvi_to_pdf_command=none
+fi
+
+test $dvi_to_pdf_command = "dvipdfm" && dvi_to_pdf_command="dvipdfm \$\$i"
+
 # Search a *roff program (used to translate tables in ASCII export)
 echo $ac_n "checking for a *roff formatter""... $ac_c"
 echo "$ac_t""(groff nroff)"
@@ -1106,6 +1143,7 @@ cat >lyxrc.defaults <<EOF
 \\Format literate nw	NoWeb		N
 \\Format pdf	  pdf	PDF		P
 \\Format pdf2	  pdf  "PDF (pdflatex)"	F
+\\Format pdf3	  pdf  "PDF (dvipdfm)"	m
 \\Format png	  png	PNG		""
 \\Format ps	  ps	Postscript	t
 \\Format program  ""	Program		""
@@ -1116,6 +1154,7 @@ cat >lyxrc.defaults <<EOF
 \\converter latex pdf2 "$PDFLATEX \$\$i" "latex"
 \\converter latex html "$latex_to_html_command" "originaldir,needaux"
 \\converter literate latex "$literate_to_tex_command" ""
+\\converter dvi pdf3 "$dvi_to_pdf_command" ""
 \\converter dvi ps "$dvi_to_ps_command" ""
 \\converter ps pdf "$ps_to_pdf_command" ""
 \\converter ps fax "$fax_command" ""
diff --git a/lib/configure.m4 b/lib/configure.m4
index 1e564869ef..10913e9d57 100644
--- a/lib/configure.m4
+++ b/lib/configure.m4
@@ -232,6 +232,10 @@ test $ps_to_pdf_command = "ps2pdf" && ps_to_pdf_command="ps2pdf \$\$i"
 SEARCH_PROG([for a DVI to PS converter],dvi_to_ps_command,dvips)
 test $dvi_to_ps_command = "dvips" && dvi_to_ps_command="dvips -o \$\$o \$\$i"
 
+# Search for a program to convert dvi to pdf
+SEARCH_PROG([for a DVI to PDF converter],dvi_to_pdf_command,dvipdfm)
+test $dvi_to_pdf_command = "dvipdfm" && dvi_to_pdf_command="dvipdfm \$\$i"
+
 # Search a *roff program (used to translate tables in ASCII export)
 SEARCH_PROG([for a *roff formatter],ROFF,groff nroff)
 ascii_roff_command=$ROFF
@@ -407,6 +411,7 @@ cat >lyxrc.defaults <<EOF
 \\Format literate nw	NoWeb		N
 \\Format pdf	  pdf	PDF		P
 \\Format pdf2	  pdf  "PDF (pdflatex)"	F
+\\Format pdf3	  pdf  "PDF (dvipdfm)"	m
 \\Format png	  png	PNG		""
 \\Format ps	  ps	Postscript	t
 \\Format program  ""	Program		""
@@ -417,6 +422,7 @@ cat >lyxrc.defaults <<EOF
 \\converter latex pdf2 "$PDFLATEX \$\$i" "latex"
 \\converter latex html "$latex_to_html_command" "originaldir,needaux"
 \\converter literate latex "$literate_to_tex_command" ""
+\\converter dvi pdf3 "$dvi_to_pdf_command" ""
 \\converter dvi ps "$dvi_to_ps_command" ""
 \\converter ps pdf "$ps_to_pdf_command" ""
 \\converter ps fax "$fax_command" ""