X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fconfigure;h=3361f4277640623afee4b7235c8f6fb885bcd7e3;hb=ce5660a75cfebdbbd4ad5913f871c57b2f9b1c9d;hp=985661d7902fdefad5b4cb511fc761e9cac9c86f;hpb=27de1486ca34aaad446adb798d71a77d6f6304da;p=lyx.git

diff --git a/lib/configure b/lib/configure
index 985661d790..3361f42776 100755
--- a/lib/configure
+++ b/lib/configure
@@ -11,6 +11,7 @@
 lyx_check_config=yes
 lyx_keep_temps=no
 srcdir=
+lyx_suffix=
 
 #### Parse the command line
 for ac_option do
@@ -22,12 +23,15 @@ Options:
   --help                   show this help lines
   --keep-temps             keep temporary files (for debug. purposes)
   --without-latex-config   do not run LaTeX to determine configuration
+  --with-lyx-suffix=suffix suffix of binary installed files
 EOF
       exit 0;;
     --without-latex-config)
       lyx_check_config=no ;;
     --keep-temps)
       lyx_keep_temps=yes ;;
+    --with-lyx-suffix*)
+      lyx_suffix=`echo "$ac_option" | sed 's,--with-lyx-suffix=,,;s,^,-,'`
   esac 
 done
 
@@ -68,9 +72,16 @@ if test ! -r ${srcdir}/chkconfig.ltx ; then
   exit 1
 fi
 
+#### Adjust PATH for Win32 (Cygwin)
+if test "x$OSTYPE" = xcygwin; then
+  echo "configure: cygwin detected; path correction"
+  srcdir=`cygpath -w "${srcdir}" | tr '\\\\' /`
+  echo "srcdir=${srcdir}"
+fi
 
 #### Create the build directories if necessary
-for dir in bind doc kbd layouts templates reLyX ; do
+for dir in bind clipart doc examples images kbd layouts reLyX \
+    scripts templates ui ; do
   test ! -d $dir && mkdir $dir
 done
 
@@ -78,7 +89,7 @@ done
 #### Searching some useful programs
 # Search LaTeX2e
 echo $ac_n "checking for a LaTeX2e program""... $ac_c"
-echo "$ac_t"""
+echo "$ac_t""(latex latex2e)"
 LATEX=
 for ac_prog in latex latex2e
 do
@@ -86,7 +97,7 @@ do
 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="${IFS}:"
+  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
@@ -129,86 +140,287 @@ if test -z "$LATEX" ; then
     lyx_check_config=no
 fi
 
+if test x$lyx_check_config != x ; then
+echo $ac_n "checking for the pdflatex program""... $ac_c"
+echo "$ac_t""(pdflatex)"
+PDFLATEX=
+for ac_prog in pdflatex
+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
+      PDFLATEX="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+
+  if test -n "$PDFLATEX"; then
+    ac_result=yes
+  else
+    ac_result=no
+  fi
+  
+## Check whether this is really LaTeX2e
+rm -f chklatex.ltx
+cat >chklatex.ltx <<EOF
+\\nonstopmode\\makeatletter
+\\ifx\\undefined\\documentclass\\else
+  \\message{ThisIsLaTeX2e}
+\\fi
+\\@@end
+EOF
+if eval ${LATEX} chklatex.ltx </dev/null 2>/dev/null \
+                       | grep 'ThisIsLaTeX2e' >/dev/null; then
+  :
+else
+  LATEX=
+  ac_result="not useable"
+fi
+rm -f chklatex.ltx chklatex.log
+  echo "$ac_t""$ac_result"
+  test -n "$PDFLATEX" && break
+fi
+done
+
+if test -z "$PDFLATEX" ; then
+  PDFLATEX=none
+fi
+
+fi
 
 # Search for an installed reLyX or a ready-to-install one
 save_PATH=${PATH}
 PATH=${PATH}:./reLyX/
-echo $ac_n "checking for reLyX LaTeX-to-LyX translator""... $ac_c"
-echo "$ac_t"""
-RELYX=
+echo $ac_n "checking for a LaTeX -> LyX converter""... $ac_c"
+echo "$ac_t""(reLyX)"
+tex_to_lyx_command=
 for ac_prog in reLyX
 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="${IFS}:"
+  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
-      RELYX="$ac_prog"
+      tex_to_lyx_command="$ac_prog"
       break
     fi
   done
   IFS="$ac_save_ifs"
 
-  if test -n "$RELYX"; then
+  if test -n "$tex_to_lyx_command"; then
     ac_result=yes
   else
     ac_result=no
   fi
   
   echo "$ac_t""$ac_result"
-  test -n "$RELYX" && break
+  test -n "$tex_to_lyx_command" && break
 fi
 done
 
-if test -z "$RELYX" ; then
-  RELYX=none
+if test -z "$tex_to_lyx_command" ; then
+  tex_to_lyx_command=none
 fi
 
 PATH=${save_PATH}
+test $tex_to_lyx_command = "reLyX" && tex_to_lyx_command="reLyX -f \$\$i"
+tex_to_lyx_command=`echo $tex_to_lyx_command | sed "s,reLyX,reLyX$lyx_suffix,"`
+
+echo $ac_n "checking for a Noweb -> LyX converter""... $ac_c"
+echo "$ac_t""(noweb2lyx)"
+literate_to_lyx_command=
+for ac_prog in noweb2lyx
+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
+      literate_to_lyx_command="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+
+  if test -n "$literate_to_lyx_command"; then
+    ac_result=yes
+  else
+    ac_result=no
+  fi
+  
+  echo "$ac_t""$ac_result"
+  test -n "$literate_to_lyx_command" && break
+fi
+done
+
+if test -z "$literate_to_lyx_command" ; then
+  literate_to_lyx_command=none
+fi
+
+test $literate_to_lyx_command = "noweb2lyx" && literate_to_lyx_command="noweb2lyx \$\$i \$\$o"
+literate_to_lyx_command=`echo $literate_to_lyx_command | sed "s,noweb2lyx,noweb2lyx$lyx_suffix,"`
 
 # Search something to process a literate document
-echo $ac_n "checking for a Literate programming processor""... $ac_c"
-echo "$ac_t"""
-LITERATE=
-for ac_prog in "noweave -delay -index"
+echo $ac_n "checking for a Noweb -> LaTeX converter""... $ac_c"
+echo "$ac_t""(noweave)"
+literate_to_tex_command=
+for ac_prog in noweave
 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="${IFS}:"
+  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
-      LITERATE="$ac_prog"
+      literate_to_tex_command="$ac_prog"
       break
     fi
   done
   IFS="$ac_save_ifs"
 
-  if test -n "$LITERATE"; then
+  if test -n "$literate_to_tex_command"; then
     ac_result=yes
   else
     ac_result=no
   fi
   
   echo "$ac_t""$ac_result"
-  test -n "$LITERATE" && break
+  test -n "$literate_to_tex_command" && break
 fi
 done
 
-if test -z "$LITERATE" ; then
-  LITERATE=none
+if test -z "$literate_to_tex_command" ; then
+  literate_to_tex_command=none
 fi
 
-if test "$LITERATE" = "none"; then LITERATE_EXT="none"; else LITERATE_EXT=".nw"; fi
+test $literate_to_tex_command = "noweave" && literate_to_tex_command="noweave -delay -index \$\$i > \$\$o"
+
+echo $ac_n "checking for a HTML -> Latex converter""... $ac_c"
+echo "$ac_t""(html2latex)"
+html_to_latex_command=
+for ac_prog in html2latex
+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
+      html_to_latex_command="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+
+  if test -n "$html_to_latex_command"; then
+    ac_result=yes
+  else
+    ac_result=no
+  fi
+  
+  echo "$ac_t""$ac_result"
+  test -n "$html_to_latex_command" && break
+fi
+done
+
+if test -z "$html_to_latex_command" ; then
+  html_to_latex_command=none
+fi
+
+test $html_to_latex_command = "html2latex" && html_to_latex_command="html2latex \$\$i"
+
+echo $ac_n "checking for a MSWord -> Latex converter""... $ac_c"
+echo "$ac_t""(wvCleanLatex word2x)"
+word_to_latex_command=
+for ac_prog in wvCleanLatex word2x
+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
+      word_to_latex_command="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+
+  if test -n "$word_to_latex_command"; then
+    ac_result=yes
+  else
+    ac_result=no
+  fi
+  
+  echo "$ac_t""$ac_result"
+  test -n "$word_to_latex_command" && break
+fi
+done
+
+if test -z "$word_to_latex_command" ; then
+  word_to_latex_command=none
+fi
+
+test "$word_to_latex_command" = "wvCleanLatex" && word_to_latex_command="wvCleanLatex \$\$i \$\$o"
+test "$word_to_latex_command" = "word2x" && word_to_latex_command="word2x -f latex \$\$i"
+
+echo $ac_n "checking for Image converter""... $ac_c"
+echo "$ac_t""(convert)"
+image_command=
+for ac_prog in convert
+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
+      image_command="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+
+  if test -n "$image_command"; then
+    ac_result=yes
+  else
+    ac_result=no
+  fi
+  
+  echo "$ac_t""$ac_result"
+  test -n "$image_command" && break
+fi
+done
+
+if test -z "$image_command" ; then
+  image_command=none
+fi
+
+test $image_command = "convert" && image_command="convert \$\$i \$\$o"
 
 # Search for a Postscript interpreter
 echo $ac_n "checking for a Postscript interpreter""... $ac_c"
-echo "$ac_t"""
+echo "$ac_t""(gs)"
 GS=
 for ac_prog in gs
 do
@@ -216,7 +428,7 @@ do
 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="${IFS}:"
+  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
@@ -244,7 +456,7 @@ fi
 
 # Search something to preview postscript
 echo $ac_n "checking for a Postscript previewer""... $ac_c"
-echo "$ac_t"""
+echo "$ac_t""(gv ghostview)"
 GHOSTVIEW=
 for ac_prog in gv ghostview
 do
@@ -252,7 +464,7 @@ do
 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="${IFS}:"
+  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
@@ -278,9 +490,228 @@ if test -z "$GHOSTVIEW" ; then
 fi
 
 
+# Search for a program to preview pdf
+echo $ac_n "checking for a PDF preview""... $ac_c"
+echo "$ac_t""(acroread gv ghostview xpdf)"
+PDF_VIEWER=
+for ac_prog in acroread gv ghostview xpdf
+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
+      PDF_VIEWER="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+
+  if test -n "$PDF_VIEWER"; then
+    ac_result=yes
+  else
+    ac_result=no
+  fi
+  
+  echo "$ac_t""$ac_result"
+  test -n "$PDF_VIEWER" && break
+fi
+done
+
+if test -z "$PDF_VIEWER" ; then
+  PDF_VIEWER=none
+fi
+
+
+# Search something to preview dvi
+echo $ac_n "checking for a DVI previewer""... $ac_c"
+echo "$ac_t""(xdvi windvi yap)"
+DVI_VIEWER=
+for ac_prog in xdvi windvi yap
+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_VIEWER="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+
+  if test -n "$DVI_VIEWER"; then
+    ac_result=yes
+  else
+    ac_result=no
+  fi
+  
+  echo "$ac_t""$ac_result"
+  test -n "$DVI_VIEWER" && break
+fi
+done
+
+if test -z "$DVI_VIEWER" ; then
+  DVI_VIEWER=none
+fi
+
+
+# Search something to preview html
+echo $ac_n "checking for a HTML previewer""... $ac_c"
+echo "$ac_t""(netscape)"
+HTML_VIEWER=
+for ac_prog in netscape
+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
+      HTML_VIEWER="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+
+  if test -n "$HTML_VIEWER"; then
+    ac_result=yes
+  else
+    ac_result=no
+  fi
+  
+  echo "$ac_t""$ac_result"
+  test -n "$HTML_VIEWER" && break
+fi
+done
+
+if test -z "$HTML_VIEWER" ; then
+  HTML_VIEWER=none
+fi
+
+
+# Search for a program to convert ps to pdf
+echo $ac_n "checking for a PS to PDF converter""... $ac_c"
+echo "$ac_t""(ps2pdf)"
+ps_to_pdf_command=
+for ac_prog in ps2pdf
+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
+      ps_to_pdf_command="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+
+  if test -n "$ps_to_pdf_command"; then
+    ac_result=yes
+  else
+    ac_result=no
+  fi
+  
+  echo "$ac_t""$ac_result"
+  test -n "$ps_to_pdf_command" && break
+fi
+done
+
+if test -z "$ps_to_pdf_command" ; then
+  ps_to_pdf_command=none
+fi
+
+test $ps_to_pdf_command = "ps2pdf" && ps_to_pdf_command="ps2pdf \$\$i"
+
+# Search for a program to convert dvi to ps
+echo $ac_n "checking for a DVI to PS converter""... $ac_c"
+echo "$ac_t""(dvips)"
+dvi_to_ps_command=
+for ac_prog in dvips
+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_ps_command="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+
+  if test -n "$dvi_to_ps_command"; then
+    ac_result=yes
+  else
+    ac_result=no
+  fi
+  
+  echo "$ac_t""$ac_result"
+  test -n "$dvi_to_ps_command" && break
+fi
+done
+
+if test -z "$dvi_to_ps_command" ; then
+  dvi_to_ps_command=none
+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"""
+echo "$ac_t""(groff nroff)"
 ROFF=
 for ac_prog in groff nroff
 do
@@ -288,7 +719,7 @@ do
 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="${IFS}:"
+  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
@@ -319,7 +750,7 @@ test $ROFF = "nroff" && ascii_roff_command="tbl \$\$FName | nroff"
 
 # Search the ChkTeX program
 echo $ac_n "checking for ChkTeX""... $ac_c"
-echo "$ac_t"""
+echo "$ac_t""(chktex)"
 CHKTEX=
 for ac_prog in chktex
 do
@@ -327,7 +758,7 @@ do
 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="${IFS}:"
+  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
@@ -357,7 +788,7 @@ test $CHKTEX = "chktex" && chktex_command="$CHKTEX -n1 -n3 -n6 -n9 -n22 -n25 -n3
 
 # Search for a spellchecker
 echo $ac_n "checking for a spell-checker""... $ac_c"
-echo "$ac_t"""
+echo "$ac_t""(ispell)"
 SPELL=
 for ac_prog in ispell
 do
@@ -365,7 +796,7 @@ do
 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="${IFS}:"
+  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
@@ -391,54 +822,47 @@ if test -z "$SPELL" ; then
 fi
 
 
-# Search a Fax handling program
-echo $ac_n "checking for a fax driver""... $ac_c"
-echo "$ac_t"""
-FAX=
-for ac_prog in sendfax faxsend fax
+
+# Search a GUI Fax program
+echo $ac_n "checking for a fax program""... $ac_c"
+echo "$ac_t""(ksendfax)"
+fax_command=
+for ac_prog in ksendfax
 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="${IFS}:"
+  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
-      FAX="$ac_prog"
+      fax_command="$ac_prog"
       break
     fi
   done
   IFS="$ac_save_ifs"
 
-  if test -n "$FAX"; then
+  if test -n "$fax_command"; then
     ac_result=yes
   else
     ac_result=no
   fi
   
   echo "$ac_t""$ac_result"
-  test -n "$FAX" && break
+  test -n "$fax_command" && break
 fi
 done
 
-if test -z "$FAX" ; then
-  FAX=none
+if test -z "$fax_command" ; then
+  fax_command=none
 fi
 
-if test $FAX = sendfax ; then
-  fax_command="sendfax -n -h '\$\$Host' -c '\$\$Comment' -x '\$\$Enterprise' -d '\$\$Name'@'\$\$Phone' '\$\$FName'"
-elif test $FAX = faxsend ; then
-  fax_command="faxsend '\$\$Phone' '\$\$FName'"
-elif test $FAX = fax ; then
-  fax_command="fax send '\$\$Phone' '\$\$FName'"
-else
-  fax_command="none"
-fi
+test $fax_command = "ksendfax" && fax_command="ksendfax \$\$i"
 
 # Search for LinuxDoc support
 echo $ac_n "checking for SGML-tools 1.x (LinuxDoc)""... $ac_c"
-echo "$ac_t"""
+echo "$ac_t""(sgml2lyx)"
 LINUXDOC=
 for ac_prog in sgml2lyx
 do
@@ -446,7 +870,7 @@ do
 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="${IFS}:"
+  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
@@ -477,17 +901,30 @@ if test $LINUXDOC != none; then
   linuxdoc_cmd="\\def\\haslinuxdoc{yes}"
 fi
 
+case $LINUXDOC in
+  sgml2lyx)
+    linuxdoc_to_latex_command="sgml2latex \$\$i"
+    linuxdoc_to_dvi_command="sgml2latex -o dvi \$\$i"
+    linuxdoc_to_html_command="sgml2html \$\$i"
+    linuxdoc_to_lyx_command="sgml2lyx \$\$i";;
+  none)
+    linuxdoc_to_latex_command="none"
+    linuxdoc_to_dvi_command="none"
+    linuxdoc_to_html_command="none"
+    linuxdoc_to_lyx_command="none";;
+esac
+
 # Search for DocBook support
-echo $ac_n "checking for SGML-tools 2.x (DocBook)""... $ac_c"
-echo "$ac_t"""
+echo $ac_n "checking for SGML-tools 2.x (DocBook) or db2x scripts""... $ac_c"
+echo "$ac_t""(sgmltools db2dvi)"
 DOCBOOK=
-for ac_prog in sgmltools
+for ac_prog in sgmltools db2dvi
 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="${IFS}:"
+  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
@@ -518,10 +955,21 @@ if test $DOCBOOK != none; then
   docbook_cmd="\\def\\hasdocbook{yes}"
 fi
 
+case $DOCBOOK in
+  sgmltools)
+    docbook_to_dvi_command="sgmltools -b dvi \$\$i"
+    docbook_to_html_command="sgmltools -b html \$\$i";;
+  db2dvi)
+    docbook_to_dvi_command="db2dvi \$\$i"
+    docbook_to_html_command="db2html \$\$i";;
+  none)
+    docbook_to_dvi_command="none"
+    docbook_to_html_command="none";;
+esac
 
 # Search for a spool command
 echo $ac_n "checking for a spool command""... $ac_c"
-echo "$ac_t"""
+echo "$ac_t""(lp lpr)"
 LPR=
 for ac_prog in lp lpr
 do
@@ -529,7 +977,7 @@ do
 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="${IFS}:"
+  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
@@ -562,6 +1010,47 @@ case $LPR in
    *) :;; # leave to empty values
 esac
 
+echo $ac_n "checking for a LaTeX -> HTML converter""... $ac_c"
+echo "$ac_t""(tth latex2html hevea)"
+TOHTML=
+for ac_prog in tth latex2html hevea
+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
+      TOHTML="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+
+  if test -n "$TOHTML"; then
+    ac_result=yes
+  else
+    ac_result=no
+  fi
+  
+  echo "$ac_t""$ac_result"
+  test -n "$TOHTML" && break
+fi
+done
+
+if test -z "$TOHTML" ; then
+  TOHTML=none
+fi
+
+latex_to_html_command=$TOHTML
+case $TOHTML in
+	tth) latex_to_html_command="tth -t -e2 -L\$\$b < \$\$i > \$\$o";;
+ latex2html) latex_to_html_command="latex2html -no_subdir -split 0 -show_section_numbers \$\$i";;
+      hevea) latex_to_html_command="hevea -s \$\$i";;
+esac
+
 #### Explore the LaTeX configuration
 echo $ac_n "checking LaTeX configuration""... $ac_c"
 # First, remove the files that we want to re-create
@@ -583,7 +1072,7 @@ EOF
   for file in ./layouts/*.layout ${srcdir}/layouts/*.layout ; do 
     case $file in
       */\*.layout) ;;
-      *) echo $file ;;
+      *) test -r "$file" && echo $file ;;
     esac
   done | sed -e 's%^.*layouts/\(.*\)\.layout$%\\TestDocClass{\1}%'\
              > chklayouts.tex
@@ -645,17 +1134,63 @@ cat >lyxrc.defaults <<EOF
 # want to customize LyX, make a copy of the file LYXDIR/lyxrc as
 # ~/.lyx/lyxrc and edit this file instead. Any setting in lyxrc will
 # override the values given here.
-\\latex_command "$LATEX"
-\\relyx_command "$RELYX"
-\\literate_command "$LITERATE"
-\\literate_extension "$LITERATE_EXT"
+\\Format text	  txt	ASCII		A
+\\Format textparagraph txt ASCII(paragraphs)	""
+\\Format docbook  sgml	DocBook		B
+\\Format dvi	  dvi	DVI		D
+\\Format eps	  eps	EPS		""
+\\Format fax	  ""	Fax		""
+\\Format gif      gif	GIF		""
+\\Format html	  html	HTML		H
+\\Format jpg      jpg	JPEG		""
+\\Format latex	  tex	LaTeX		L
+\\Format linuxdoc sgml	LinuxDoc	x
+\\Format lyx      lyx	LyX		""
+\\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		""
+\\Format word	  doc	Word		W
+
+
+\\converter latex dvi "$LATEX \$\$i" "latex"
+\\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" ""
+\\converter linuxdoc lyx "$linuxdoc_to_lyx_command" ""
+\\converter linuxdoc latex "$linuxdoc_to_latex_command" ""
+\\converter linuxdoc dvi "$linuxdoc_to_dvi_command" ""
+\\converter linuxdoc html "$linuxdoc_to_html_command" ""
+\\converter docbook dvi "$docbook_to_dvi_command" ""
+\\converter docbook html "$docbook_to_html_command" ""
+
+\\converter latex lyx "$tex_to_lyx_command" ""
+\\converter literate lyx "$literate_to_lyx_command" ""
+\\converter html latex "$html_to_latex_command" ""
+\\converter word latex "$word_to_latex_command" ""
+
+\converter gif eps "$image_command" ""
+\converter png eps "$image_command" ""
+\converter jpg eps "$image_command" ""
+\converter gif png "$image_command" ""
+
+\\viewer dvi "$DVI_VIEWER"
+\\viewer html "$HTML_VIEWER"
+\\viewer pdf "$PDF_VIEWER"
+\\viewer ps "$GHOSTVIEW -swap"
+\\viewer eps "$GHOSTVIEW"
+
 \\ps_command "$GS"
-\\view_ps_command "$GHOSTVIEW -swap"
-\\view_pspic_command "$GHOSTVIEW"
 \\ascii_roff_command "$ascii_roff_command"
 \\chktex_command "$chktex_command"
 \\spell_command "$SPELL"
-\\fax_command "$fax_command"
 \\print_spool_command "$print_spool_command"
 \\print_spool_printerprefix "$print_spool_printerprefix"
 \\font_encoding "$chk_fontenc"