replace LyXCursor by CursorSlice

[lyx.git] / lib / configure.m4

diff --git a/lib/configure.m4 b/lib/configure.m4
index 2ad6325e8260dfb62d8a58aef250c5cc3ca57738..5628f246cdfab2c33b2287eea3d488dd8d9bde24 100644 (file)
--- a/lib/configure.m4
+++ b/lib/configure.m4
@@ -176,9 +176,22 @@ fi
 #### Adjust PATH for Win32 (Cygwin)
 case `uname -s` in
    CYGWIN*)
-     echo "configure: cygwin detected; path correction"
-     srcdir=`cygpath -w "${srcdir}" | tr '\\\\' /`
-     echo "srcdir=${srcdir}" ;;
+     tmpfname="/tmp/x$$.ltx";
+     echo "\\documentstyle{article}" > $tmpfname
+     echo "\\begin{document}\\end{document}" >> $tmpfname
+     inpname=`cygpath -w $tmpfname | tr '\\\\' /`
+     echo "\\input{$inpname}" > wrap_temp$$.ltx
+     check_err=`latex wrap_temp$$.ltx 2>&1 < /dev/null | grep Error`
+     rm -f wrap_temp$$.* /tmp/x$$.*
+     if [ x"$check_err" = "x" ]
+     then
+       echo "configure: cygwin detected; path correction"
+       srcdir=`cygpath -w "${srcdir}" | tr '\\\\' /`
+       echo "srcdir=${srcdir}"
+     else
+       echo "configure: cygwin detected; path correction is not needed"
+     fi
+     ;;
 esac
 
 #### Create the build directories if necessary
@@ -410,11 +423,7 @@ PROVIDE_DEFAULT_FILE(textclass.lst,dnl
 # It contains only default values, since chkconfig.ltx could not be run
 # for some reason. Run ./configure if you need to update it after a
 # configuration change.
-article        article article
-report report  report
-book   book    book
-linuxdoc       linuxdoc        linuxdoc
-letter letter  letter])
+article        article article false])
 
 PROVIDE_DEFAULT_FILE(chkconfig.sed,[s/@.*@/???/g])
 
@@ -462,7 +471,7 @@ cat >$outfile <<EOF
 \\Format lyxpreview    lyxpreview      "LyX Preview"           ""
 \\Format literate nw   NoWeb           N
 \\Format pbm     pbm   PBM             ""
-\\Format pdf     pdf   PDF             P
+\\Format pdf     pdf  "PDF (ps2pdf)"   P
 \\Format pdf2    pdf  "PDF (pdflatex)" F
 \\Format pdf3    pdf  "PDF (dvipdfm)"  m
 \\Format pdftex   pdftex_t PDFTEX       ""
@@ -590,6 +599,8 @@ if test ! $num = 0 ; then
   echo $num >xfonts/fonts.scale
   cat xfonts/tmpfonts >>xfonts/fonts.scale
   cp xfonts/fonts.scale xfonts/fonts.dir
+  # create a resource list file for Display Postscript
+  (cd xfonts ; rm -f PSres.upr ; makepsres -q) || true
 fi
 rm -f xfonts/tmpfonts