auctex-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[AUCTeX-devel] [PATCH] Merge /preview/* into top-level


From: Matthew Leach
Subject: [AUCTeX-devel] [PATCH] Merge /preview/* into top-level
Date: Sun, 19 Oct 2014 19:15:31 +0100

---
Hello,

This patch merges everything from preview/* into the top-level of the
source tree.  Rules in configure.ac and Makefile.in have been merged
and adapted.

Apologies for the length of the patch regarding the deletions, I did
try to use git's '-D' option but the patch becomes un-applyable.

Any comments welcome.

Matt

ChangeLog Entry:

2014-10-19  Matthew Leach  <address@hidden>

        * configure.ac: Merge from preview/configure.ac.

        * .gitignore: Merge from preview/.gitignore.

        * autogen.sh: Don't run autoconf in the preview direcotry.

        * Makefile.in (subdirs): Remove.
        (DESCEND): Remove.
        (previewstartfile): Adapt from preview/Makefile.in.
        (PREVIEW_AUTOLOAD): Likewise.
        (texmf): Likewise.
        (preview-latex.el): Likewise.
        (latex/Makefile): Likewise.
        (auto.el): Likewise.
        (install-startup): Likewise.
        (install-texmf): Likewise.
        (CLEANFILES): Add preview files.
        (install-el): Likewise.
        (install-lisp): Likewise.
        (all): Add texmf dependency and remove DESCEND.
        (clean): Remove DESCEND action.
        (distclean): Likewise.
        (maintainer-clean): Likewise.

        * doc/Makefile.in (preview-dtxdoc.texi): Update path of
        preview.dtx.

        * preview/ChangeLog: Move to ChangeLog-preview

        * preview/ChangeLog.1: Move to ChangeLog.1-preview

        * preview/auto.el.in: Move to top-level.

        * preview/circ.tex: Move to top-level.

        * preview/*.el: Move to top-level.

        * preview/images/: Move to images/.

        * preview/latex/: Move to latex/.

        * preview/Makefile.in: Remove.

        * preview/configure.ac: Remove.

        * preview/.gitignore: Remove.

        * preview/COPYING: Remove.

 .gitignore                                       |  34 +-
 preview/ChangeLog => ChangeLog-preview           |   0
 preview/ChangeLog.1 => ChangeLog-preview.1       |   0
 Makefile.in                                      |  79 ++-
 preview/auto.el.in => auto.el.in                 |   0
 autogen.sh                                       |   5 +-
 preview/circ.tex => circ.tex                     |   0
 configure.ac                                     | 138 ++++-
 doc/Makefile.in                                  |   4 +-
 {preview/images => images}/prverr16.xpm          |   0
 {preview/images => images}/prverr20.xpm          |   0
 {preview/images => images}/prverr24.xbm          |   0
 {preview/images => images}/prverr24.xpm          |   0
 {preview/images => images}/prvtex-cap-up.xpm     |   0
 {preview/images => images}/prvtex12.xbm          |   0
 {preview/images => images}/prvtex12.xpm          |   0
 {preview/images => images}/prvtex16.xbm          |   0
 {preview/images => images}/prvtex16.xpm          |   0
 {preview/images => images}/prvtex20.xpm          |   0
 {preview/images => images}/prvtex24.xbm          |   0
 {preview/images => images}/prvtex24.xpm          |   0
 {preview/images => images}/prvwrk12.xpm          |   0
 {preview/images => images}/prvwrk14.xpm          |   0
 {preview/images => images}/prvwrk16.xpm          |   0
 {preview/images => images}/prvwrk20.xpm          |   0
 {preview/images => images}/prvwrk24.xbm          |   0
 {preview/images => images}/prvwrk24.xpm          |   0
 {preview/latex => latex}/.gitignore              |   0
 {preview/latex => latex}/Makefile.in             |   0
 {preview/latex => latex}/README                  |   0
 {preview/latex => latex}/bootstrap.ins           |   0
 {preview/latex => latex}/preview.dtx             |   0
 preview/preview-latex.spec => preview-latex.spec |   0
 preview/preview.el => preview.el                 |   0
 preview/.gitignore                               |   9 -
 preview/COPYING                                  | 674 -----------------------
 preview/Makefile.in                              | 162 ------
 preview/configure.ac                             | 226 --------
 preview/prv-emacs.el => prv-emacs.el             |   0
 preview/prv-install.el => prv-install.el         |   0
 preview/prv-xemacs.el => prv-xemacs.el           |   0
 41 files changed, 215 insertions(+), 1116 deletions(-)
 rename preview/ChangeLog => ChangeLog-preview (100%)
 rename preview/ChangeLog.1 => ChangeLog-preview.1 (100%)
 rename preview/auto.el.in => auto.el.in (100%)
 rename preview/circ.tex => circ.tex (100%)
 rename {preview/images => images}/prverr16.xpm (100%)
 rename {preview/images => images}/prverr20.xpm (100%)
 rename {preview/images => images}/prverr24.xbm (100%)
 rename {preview/images => images}/prverr24.xpm (100%)
 rename {preview/images => images}/prvtex-cap-up.xpm (100%)
 rename {preview/images => images}/prvtex12.xbm (100%)
 rename {preview/images => images}/prvtex12.xpm (100%)
 rename {preview/images => images}/prvtex16.xbm (100%)
 rename {preview/images => images}/prvtex16.xpm (100%)
 rename {preview/images => images}/prvtex20.xpm (100%)
 rename {preview/images => images}/prvtex24.xbm (100%)
 rename {preview/images => images}/prvtex24.xpm (100%)
 rename {preview/images => images}/prvwrk12.xpm (100%)
 rename {preview/images => images}/prvwrk14.xpm (100%)
 rename {preview/images => images}/prvwrk16.xpm (100%)
 rename {preview/images => images}/prvwrk20.xpm (100%)
 rename {preview/images => images}/prvwrk24.xbm (100%)
 rename {preview/images => images}/prvwrk24.xpm (100%)
 rename {preview/latex => latex}/.gitignore (100%)
 rename {preview/latex => latex}/Makefile.in (100%)
 rename {preview/latex => latex}/README (100%)
 rename {preview/latex => latex}/bootstrap.ins (100%)
 rename {preview/latex => latex}/preview.dtx (100%)
 rename preview/preview-latex.spec => preview-latex.spec (100%)
 rename preview/preview.el => preview.el (100%)
 delete mode 100644 preview/.gitignore
 delete mode 100644 preview/COPYING
 delete mode 100644 preview/Makefile.in
 delete mode 100644 preview/configure.ac
 rename preview/prv-emacs.el => prv-emacs.el (100%)
 rename preview/prv-install.el => prv-install.el (100%)
 rename preview/prv-xemacs.el => prv-xemacs.el (100%)

diff --git a/.gitignore b/.gitignore
index d663413..70f7b39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,22 +23,22 @@ doc/preview-dtxdoc.texi
 doc/preview-latex.info
 doc/tex-ref.pdf
 doc/version.texi
-preview/auto.el
-preview/latex/prauctex.cfg
-preview/latex/prauctex.def
-preview/latex/prcounters.def
-preview/latex/preview-mk.ins
-preview/latex/preview.aux
-preview/latex/preview.drv
-preview/latex/preview.dvi
-preview/latex/preview.pdf
-preview/latex/preview.sty
-preview/latex/prfootnotes.def
-preview/latex/prlyx.def
-preview/latex/prshowbox.def
-preview/latex/prshowlabels.def
-preview/latex/prtightpage.def
-preview/latex/prtracingall.def
-preview/preview-latex.el
+auto.el
+latex/prauctex.cfg
+latex/prauctex.def
+latex/prcounters.def
+latex/preview-mk.ins
+latex/preview.aux
+latex/preview.drv
+latex/preview.dvi
+latex/preview.pdf
+latex/preview.sty
+latex/prfootnotes.def
+latex/prlyx.def
+latex/prshowbox.def
+latex/prshowlabels.def
+latex/prtightpage.def
+latex/prtracingall.def
+preview-latex.el
 PROBLEMS.preview
 
diff --git a/preview/ChangeLog b/ChangeLog-preview
similarity index 100%
rename from preview/ChangeLog
rename to ChangeLog-preview
diff --git a/preview/ChangeLog.1 b/ChangeLog-preview.1
similarity index 100%
rename from preview/ChangeLog.1
rename to ChangeLog-preview.1
diff --git a/Makefile.in b/Makefile.in
index 583b6e7..8ed7a89 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -34,12 +34,12 @@ localstatedir = @address@hidden(null)
 infodir = @address@hidden(null)
 lispdir = @address@hidden(null)
 address@hidden@
+previewstartfile = @previewstartfile@
 packagelispdir = @address@hidden(null)
 packagedatadir = @address@hidden(null)
 packagedir = @address@hidden(null)
 autodir = @address@hidden(null)
 address@hidden@
address@hidden@
 styledir = $(packagedatadir)/style
 AUCTEXDATE = @AUCTEXDATE@
 AUCTEXVERSION = @AUCTEXVERSION@
@@ -56,7 +56,10 @@ ELCC=$(EMACS) -batch -q -no-site-file -no-init-file -l 
lpath.el
 AUTOLOAD=--eval '(let ((generated-autoload-file (expand-file-name "$@"))) \
   (mapcar (function update-file-autoloads) command-line-args-left) \
   (save-buffers-kill-emacs t))'
-DESCEND=test -z "$(subdirs)" || (OLDPWD="`pwd`";for i in ""$(subdirs);do cd 
$$i;echo "Descending into `pwd`";$(MAKE) 'DESTDIR=$(DESTDIR)' 
PACKAGE=$(PACKAGE) $@ || exit $$?;cd "$$OLDPWD";echo "Ascending into 
$$OLDPWD";done)
+
+PREVIEW_AUTOLOAD=--eval '(let ((generated-autoload-file (expand-file-name 
"$@"))) \
+               (update-file-autoloads "preview.el")(save-buffers-kill-emacs 
t))'
+
 
 EXCLUDEDFILES=autogen.sh .cvsignore .gitignore doc/.gitignore 
preview/.gitignore \
        preview/latex/.gitignore README.GIT tests
@@ -137,15 +140,37 @@ STYLESRC = style/prosper.el \
           style/exercise.el  style/plext.el     style/cleveref.el
 STYLEELC = $(STYLESRC:.el=.elc)
 
-CLEANFILES = $(AUCELC) $(STYLEELC) $(MULEELC)
+ifeq (@preview_enabled@,yes)
+   PREVIEWSRC = @PLAT_LISP@ preview.el
+   PREVIEWELC = $(PREVIEWSRC:.el=.elc)
+   PREVIEWLATEX = test "x$(packagedir)" != xno || $(MAKE) preview-latex.el
+   TEXMF = (cd latex ; $(MAKE) all)
+
+   # Install actions
+   INS_TEXMF = (cd latex ; $(MAKE) DESTDIR=$(DESTDIR) install)
+   PREVIEW_INS_STARTUP = test $(packagedir) != no || \
+     $(INSTALL_DATA) preview-latex.el $(DESTDIR)$(previewstartfile)
+else
+   # Don't do anything with preview if the user doesn't want the
+   # preview component.
+   PREVIEWSRC =
+   PREVIEWELC =
+   PREVIEWLATEX =
+   TEXMF =
+   INS_TEXMF =
+   PREVIEW_INS_STARTUP =
+endif
+
+
+
+CLEANFILES = $(AUCELC) $(STYLEELC) $(MULEELC) $(PREVIEWELC) preview-latex.el
 DISTCLEANFILES = Makefile tex-site.el tex-site.el.out auctex.el \
        auto-loads.el config.*
 DISTTEXTS = FAQ INSTALL INSTALL.windows README TODO PROBLEMS.preview
 
 NOSEARCH = style/.nosearch
 
-all: lisp docs
-       $(DESCEND)
+all: texmf lisp docs
 
 .PHONY: all lisp info dvi some install install-el install-lisp docs    \
        install-docs install-auto install-metadata install-startup      \
@@ -154,8 +179,22 @@ all: lisp docs
        tar-ball rpm-packages wc xemacs-package windows-package         \
        release-sign release-upload preview-ball
 
-lisp:  tex-site.el $(AUCSRC) $(STYLESRC) $(MULESRC)
-       $(ELCC) -f batch-byte-compile $(AUCSRC) $(STYLESRC) $(MULESRC)
+texmf: latex/Makefile
+       $(TEXMF)
+
+lisp:  tex-site.el $(AUCSRC) $(STYLESRC) $(MULESRC) $(PREVIEWSRC)
+       $(ELCC) -f batch-byte-compile $(AUCSRC) $(STYLESRC) $(MULESRC) 
$(PREVIEWSRC)
+       $(PREVIEWLATEX)
+
+preview-latex.el: preview.el auto.el
+       rm -f preview-latex.el
+       -$(EMACS) -batch -no-site-file -no-init-file $(PREVIEW_AUTOLOAD) ; \
+       test -r $@ || { \
+         echo ";; Auto-generated preview-latex.el" > $@ ; \
+         echo "" >> $@ ; \
+         $(EMACS) -batch -no-site-file -no-init-file $(PREVIEW_AUTOLOAD) ; \
+       }
+       cat auto.el >> $@
 
 docs:
        cd doc ; $(MAKE) all
@@ -178,6 +217,12 @@ tex-site.el.out: tex-site.el.in Makefile config.status
 auctex.el: auctex.el.in config.status
        ./config.status
 
+latex/Makefile: latex/Makefile.in Makefile config.status
+       ./config.status
+
+auto.el: auto.el.in Makefile config.status
+       ./config.status
+
 configure: configure.ac aclocal.m4
        autoconf
 
@@ -203,8 +248,8 @@ auto-loads.el: $(AUCSRC) $(MULESRC) Makefile
 
 some:  $(AUCELC) $(STYLEELC)
 
-install: install-lisp install-docs install-images install-startup
-       $(DESCEND)
+install: install-texmf install-lisp install-docs install-images \
+         install-startup
        $(MAKE) 'DESTDIR=$(DESTDIR)' install-metadata
 
 install-man: doc/Makefile
@@ -212,9 +257,14 @@ install-man: doc/Makefile
        $(INSTALL_DATA) RELEASE $(DESTDIR)$(packagedir)/man/auctex
 
 install-startup:
+       $(PREVIEWLATEX)
+       $(PREVIEW_INS_STARTUP)
        test $(packagedir) != no || \
          $(INSTALL_DATA) auctex.el $(DESTDIR)$(auctexstartfile)
 
+install-texmf:
+       $(INS_TEXMF)
+
 install-el:
        -$(MKINSTALLDIRS) $(DESTDIR)$(lispdir)
        rm -f $(DESTDIR)$(packagelispdir)/tex-site.el # Remove old 
(Git-version) mistakes
@@ -231,10 +281,10 @@ install-el:
        else rm -f $(DESTDIR)$(lispdir)/tex-site.el ; \
        fi
        -$(MKINSTALLDIRS) $(DESTDIR)$(packagelispdir)
-       @: $(MAKE) ; for x in $(AUCSRC) $(MULESRC); do \
+       @: $(MAKE) ; for x in $(AUCSRC) $(MULESRC) $(PREVIEWSRC); do \
          echo '$(INSTALL_DATA)' $$x '$(DESTDIR)$(packagelispdir)' ; \
        done
-       @for x in $(AUCSRC) $(MULESRC); do \
+       @for x in $(AUCSRC) $(MULESRC) $(PREVIEWSRC); do \
          $(INSTALL_DATA) $$x $(DESTDIR)$(packagelispdir) ; \
        done;
        -$(MKINSTALLDIRS) $(DESTDIR)$(styledir)
@@ -249,10 +299,10 @@ install-el:
        -$(INSTALL_DATA) $(NOSEARCH) $(DESTDIR)$(autodir)
 
 install-lisp: some install-el
-       @: $(MAKE) ; for x in $(AUCSRC) $(MULESRC); do \
+       @: $(MAKE) ; for x in $(AUCSRC) $(MULESRC) $(PREVIEWSRC); do \
          echo '$(INSTALL_DATA)' $${x}c '$(DESTDIR)$(packagelispdir)' ; \
        done
-       @for x in $(AUCSRC) $(MULESRC); do \
+       @for x in $(AUCSRC) $(MULESRC) $(PREVIEWSRC); do \
          $(INSTALL_DATA) $${x}c $(DESTDIR)$(packagelispdir) ; \
        done
        @: $(MAKE) ; for x in $(STYLESRC) ; do \
@@ -301,19 +351,16 @@ install-metadata:
 clean: doc/Makefile
        rm -f $(CLEANFILES)
        cd doc && $(MAKE) clean
-       $(DESCEND)
 
 distclean: doc/Makefile
        rm -f $(CLEANFILES) $(DISTCLEANFILES)
        cd doc && $(MAKE) distclean
-       $(DESCEND)
 
 maintainer-clean: doc/Makefile
        rm -f $(DISTTEXTS)
        rm -rf autom4te.cache
        rm -f $(CLEANFILES) $(DISTCLEANFILES)
        cd doc && $(MAKE) maintainer-clean
-       $(DESCEND)
 
 extraclean: maintainer-clean
        rm -f *~ \#*\#
diff --git a/preview/auto.el.in b/auto.el.in
similarity index 100%
rename from preview/auto.el.in
rename to auto.el.in
diff --git a/autogen.sh b/autogen.sh
index 99c32a7..c61b534 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,10 +29,7 @@ test "x${PDFTEX}" != x || PDFTEX=pdftex
 test "x${PERL}" != x || PERL=perl
 test "x${MAKE}" != x || MAKE=make
 ${AUTOCONF} || { echo "Error running ${AUTOCONF} in ." >&2 ; exit 1; }
-cd preview
-${AUTOCONF} -I.. || { echo "Error running ${AUTOCONF} in preview" >&2 ; exit 
1; }
-cd ..
-rm -rf autom4te.cache preview/autom4te.cache
+rm -rf autom4te.cache
 if test "x${AUCTEXDATE}" = x
 then
     AUCTEXDATE=`LC_ALL=C sed -n '1s/^\([-0-9][-0-9]*\).*/\1/p' ChangeLog`
diff --git a/preview/circ.tex b/circ.tex
similarity index 100%
rename from preview/circ.tex
rename to circ.tex
diff --git a/configure.ac b/configure.ac
index 7add2aa..937a5d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,10 +52,18 @@ AC_ARG_ENABLE([build-dir-test],
    fi],
   [VALID_BUILD_DIR])
 
+AC_ARG_ENABLE(preview,
+  [  --disable-preview       disable inclusion of preview-latex],
+  [preview_enabled="$enableval"],
+  [preview_enabled="yes"])
+AC_SUBST(preview_enabled)
+
 if test ${EMACS_FLAVOR} = "xemacs"  ; then
    EMACS_PATH_PACKAGEDIR
+   PLAT_LISP=prv-xemacs.el
 else
    packagedir=no
+   PLAT_LISP=prv-emacs.el
 fi
 
 if test "X${packagedir}" = Xno
@@ -74,6 +82,21 @@ then
        auctexstartfile="${lispdir}/auctex.el"
      fi])
    AC_MSG_RESULT([[${auctexstartfile}]])
+
+   AC_MSG_CHECKING(what file to use for preview startup)
+   AC_ARG_WITH(previewstartfile,
+   [[  --with-previewstartfile=FILE    What file to use for preview startup.]],
+   [[ previewstartfile="${withval}" ]],
+   [ _tmpdir_="${lispdir}"
+     AC_FULL_EXPAND(_tmpdir_)
+     if test -d "${_tmpdir_}/site-start.d"
+     then
+       previewstartfile="${lispdir}/site-start.d/preview-latex.el"
+     else
+       previewstartfile="${lispdir}/preview-latex.el"
+     fi])
+   AC_MSG_RESULT([[${previewstartfile}]])
+
    packagelispdir="${lispdir}/auctex"
    packagedatadir="${packagelispdir}"
    texsitedir="${lispdir}"
@@ -83,12 +106,15 @@ else
    packagelispdir="${packagedir}/lisp/auctex"
    texsitedir="$packagelispdir"
    auctexstartfile="${packagelispdir}"/auto-autoloads.el
+   previewstartfile="${packagelispdir}"/auto-autoloads.el
    packagedatadir="${packagedir}/etc/auctex"
    infodir="${packagedir}/info"
    INSTALL_INFO=:
 fi
 
 AC_SUBST(auctexstartfile)
+AC_SUBST(previewstartfile)
+AC_SUBST(PLAT_LISP)
 
 AC_MSG_CHECKING([where the package lisp files go])
 AC_ARG_WITH(packagelispdir,
@@ -125,6 +151,111 @@ AC_PATH_PROG(TEX, tex, :)
 AC_PATH_PROG(PDFTEX, pdftex, :)
 AC_PATH_PROG(DVIPS, dvips, :)
 
+
+dnl Preview related options.
+if test "X${preview_enabled}" = Xyes
+then
+   AC_ARG_VAR(GS,[Ghostscript executable for batch operation])
+   AC_CHECK_PROGS(GS, gs GSWIN32C.EXE, NONE)
+
+   EMACS_LISP([[lispGS]],[[(if (member dir (list \"NONE\" (if (eq system-type 
'windows-nt) \"GSWIN32C.EXE\" \"gs\"))) \"\" \`(defvar preview-gs-command 
,dir))]],-no-site-file,[[dir]],[["${GS}"]])
+   AC_SUBST(lispGS)
+
+   dnl check to see if GS supports -dTextAlphaBits and -dGraphicsAlphaBits
+   dnl Check to see if specific drivers are built in.
+   dnl Need table of mappings, with priority
+
+   AC_PATH_PROG_REQUIRED(LATEX, latex, [LaTeX not found, aborting!
+   You must install LaTeX for preview to work.])
+
+   AC_PATH_PROG(PDFLATEX, pdflatex)
+
+   # Determine which latex-style components to install
+   # To match .sty, .def, .cfg, but _not_ .drv
+   TEXMFGEN=[`sed -n 
's/^%<installer>.*file[{]\\([^}.]*\\.[sdc][tef][yfg]\\)[}].*/\\1/p' 
latex/preview.dtx`]
+   # Replace newlines with spaces.
+   TEXMFGEN="`echo ${TEXMFGEN}`"
+   AC_SUBST(TEXMFGEN)
+
+   AC_PATH_PROG_REQUIRED(TEX, tex, NONE)
+
+   TEX_PATH_TEXMFDIR
+
+   if test "x${texmfdir}" = "xno"
+   then
+     packagetexstyles="${packagedatadir}/latex"
+     AC_LISPIFY_DIR(packagetexstyles,"${previewstartfile}")
+     lisppackagetexstyles="(defvar preview-TeX-style-dir 
${lisppackagetexstyles})"
+     test "X${TEXHASH}" = X && TEXHASH=:
+   else
+     lisppackagetexstyles=
+   fi
+   AC_SUBST(lisppackagetexstyles)
+
+   # Be very careful about assuming things about the available hash programs
+   # MiKTeX comes with a braindead link to mktexlsr, apparently, so first
+   # try the regular utility from them.
+   AC_ARG_VAR(TEXHASH,[command to update the TeX filename database.
+   Set to : to skip updating the database on installation.
+   This is the default for --without-texmf-dir])
+
+   if test "X${TEXHASH}" = "X"
+   then
+     AC_PATH_PROG(TEXHASH, texhash)
+     AC_CHECK_PROG(TEXHASH, initexmf, initexmf -u)
+     if test "X${TEXHASH}" = X
+     then
+        AC_PATH_PROGS(TEXHASH, mktexlsr MakeTeXls-R, :)
+     fi
+   fi
+
+   AC_MSG_CHECKING([[for glaring installation conflicts]])
+   exppackagelispdir="$packagelispdir"
+   AC_FULL_EXPAND(exppackagelispdir)
+   exppreviewstartfile="$previewstartfile"
+   AC_FULL_EXPAND(exppreviewstartfile)
+
+   EMACS_LISP(shadows,[[
+     (concat
+       (and (setq tmp (locate-library \"preview.elc\"))
+            (not (string= (file-truename tmp)
+                       (file-truename (expand-file-name \"preview.elc\"
+                                         packagelispdir))))
+            (format \"Conflicting previous installation in \`%s' found!\n\"
+                    (file-name-directory tmp)))
+       (and (setq tmp (locate-library \"preview-latex.el\"))
+            (not (string= (file-truename tmp)
+                          (file-truename previewstartfile)))
+            (format \"Conflicting previous startup file \`%s' found!\n\" 
tmp)))]],,
+     [[packagelispdir previewstartfile]],[["${exppackagelispdir}" 
"${exppreviewstartfile}"]])
+   if test "NONE${shadows}" != NONE
+   then
+     conflictsmsg="Conflicts with previous installations have been detected.
+   Please fix them before continuing.
+   "
+     AC_MSG_RESULT([[ouch!
+   ]])
+   AC_MSG_WARN([[${shadows}
+   ]])
+   else
+     conflictsmsg=
+     AC_MSG_RESULT([[probably none]])
+   fi
+
+   AC_SHELL_QUOTIFY(texmfdir)
+   AC_SHELL_QUOTIFY(exec_prefix)
+   AC_SHELL_QUOTIFY(libdir)
+   AC_SHELL_QUOTIFY(previewtexmfdir)
+   AC_SHELL_QUOTIFY(previewdocdir)
+   AC_SHELL_QUOTIFY(previewstartfile)
+   AC_SHELL_QUOTIFY(auctexdir)
+   AC_SHELL_QUOTIFY(datadir)
+   AC_SHELL_QUOTIFY(GS)
+   AC_SHELL_QUOTIFY(TEXHASH)
+   AC_SHELL_QUOTIFY(LATEX)
+   AC_SHELL_QUOTIFY(PDFLATEX)
+fi
+
 AC_ARG_VAR(PERL,[Perl executable.  If set to :, some documentation
 cannot be regenerated, but installation of an unmodified tarball will
 succeed.])
@@ -150,11 +281,6 @@ then
   AC_PATH_PROG(INSTALL_INFO, install-info, :, ${PATH} /usr/sbin /sbin)
 fi
 
-AC_ARG_ENABLE(preview,
-  [  --disable-preview       disable inclusion of preview-latex],
-  [preview_enabled="$enableval"],
-  [preview_enabled="yes"])
-AC_SUBST(preview_enabled)
 
 if test "X${preview_enabled}" = Xyes
 then
@@ -197,7 +323,7 @@ AC_SHELL_QUOTIFY(TEXI2HTML)
 AC_SHELL_QUOTIFY(TEXI2DVI)
 AC_SHELL_QUOTIFY(TEXI2PDF)
 
-AC_OUTPUT(Makefile tex-site.el.out:tex-site.el.in doc/Makefile auctex.el)
+AC_OUTPUT(Makefile tex-site.el.out:tex-site.el.in doc/Makefile auctex.el 
auto.el latex/Makefile)
 
 
 cat >&2 <<EOF
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 40e40ce..bb9abf4 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -135,8 +135,8 @@ preview-latex/index.html: $(PREVIEWTEXIFILES)
 
 html-docs: preview-latex/index.html
 
-preview-dtxdoc.texi: ../preview/latex/preview.dtx preview-dtxdoc.pl
-       -$(PERL) preview-dtxdoc.pl ../preview/latex/preview.dtx \
+preview-dtxdoc.texi: ../latex/preview.dtx preview-dtxdoc.pl
+       -$(PERL) preview-dtxdoc.pl ../latex/preview.dtx \
                preview-dtxdoc.texi
 
 preview-latex.dvi: $(PREVIEWTEXIFILES)
diff --git a/preview/images/prverr16.xpm b/images/prverr16.xpm
similarity index 100%
rename from preview/images/prverr16.xpm
rename to images/prverr16.xpm
diff --git a/preview/images/prverr20.xpm b/images/prverr20.xpm
similarity index 100%
rename from preview/images/prverr20.xpm
rename to images/prverr20.xpm
diff --git a/preview/images/prverr24.xbm b/images/prverr24.xbm
similarity index 100%
rename from preview/images/prverr24.xbm
rename to images/prverr24.xbm
diff --git a/preview/images/prverr24.xpm b/images/prverr24.xpm
similarity index 100%
rename from preview/images/prverr24.xpm
rename to images/prverr24.xpm
diff --git a/preview/images/prvtex-cap-up.xpm b/images/prvtex-cap-up.xpm
similarity index 100%
rename from preview/images/prvtex-cap-up.xpm
rename to images/prvtex-cap-up.xpm
diff --git a/preview/images/prvtex12.xbm b/images/prvtex12.xbm
similarity index 100%
rename from preview/images/prvtex12.xbm
rename to images/prvtex12.xbm
diff --git a/preview/images/prvtex12.xpm b/images/prvtex12.xpm
similarity index 100%
rename from preview/images/prvtex12.xpm
rename to images/prvtex12.xpm
diff --git a/preview/images/prvtex16.xbm b/images/prvtex16.xbm
similarity index 100%
rename from preview/images/prvtex16.xbm
rename to images/prvtex16.xbm
diff --git a/preview/images/prvtex16.xpm b/images/prvtex16.xpm
similarity index 100%
rename from preview/images/prvtex16.xpm
rename to images/prvtex16.xpm
diff --git a/preview/images/prvtex20.xpm b/images/prvtex20.xpm
similarity index 100%
rename from preview/images/prvtex20.xpm
rename to images/prvtex20.xpm
diff --git a/preview/images/prvtex24.xbm b/images/prvtex24.xbm
similarity index 100%
rename from preview/images/prvtex24.xbm
rename to images/prvtex24.xbm
diff --git a/preview/images/prvtex24.xpm b/images/prvtex24.xpm
similarity index 100%
rename from preview/images/prvtex24.xpm
rename to images/prvtex24.xpm
diff --git a/preview/images/prvwrk12.xpm b/images/prvwrk12.xpm
similarity index 100%
rename from preview/images/prvwrk12.xpm
rename to images/prvwrk12.xpm
diff --git a/preview/images/prvwrk14.xpm b/images/prvwrk14.xpm
similarity index 100%
rename from preview/images/prvwrk14.xpm
rename to images/prvwrk14.xpm
diff --git a/preview/images/prvwrk16.xpm b/images/prvwrk16.xpm
similarity index 100%
rename from preview/images/prvwrk16.xpm
rename to images/prvwrk16.xpm
diff --git a/preview/images/prvwrk20.xpm b/images/prvwrk20.xpm
similarity index 100%
rename from preview/images/prvwrk20.xpm
rename to images/prvwrk20.xpm
diff --git a/preview/images/prvwrk24.xbm b/images/prvwrk24.xbm
similarity index 100%
rename from preview/images/prvwrk24.xbm
rename to images/prvwrk24.xbm
diff --git a/preview/images/prvwrk24.xpm b/images/prvwrk24.xpm
similarity index 100%
rename from preview/images/prvwrk24.xpm
rename to images/prvwrk24.xpm
diff --git a/preview/latex/.gitignore b/latex/.gitignore
similarity index 100%
rename from preview/latex/.gitignore
rename to latex/.gitignore
diff --git a/preview/latex/Makefile.in b/latex/Makefile.in
similarity index 100%
rename from preview/latex/Makefile.in
rename to latex/Makefile.in
diff --git a/preview/latex/README b/latex/README
similarity index 100%
rename from preview/latex/README
rename to latex/README
diff --git a/preview/latex/bootstrap.ins b/latex/bootstrap.ins
similarity index 100%
rename from preview/latex/bootstrap.ins
rename to latex/bootstrap.ins
diff --git a/preview/latex/preview.dtx b/latex/preview.dtx
similarity index 100%
rename from preview/latex/preview.dtx
rename to latex/preview.dtx
diff --git a/preview/preview-latex.spec b/preview-latex.spec
similarity index 100%
rename from preview/preview-latex.spec
rename to preview-latex.spec
diff --git a/preview/preview.el b/preview.el
similarity index 100%
rename from preview/preview.el
rename to preview.el
diff --git a/preview/.gitignore b/preview/.gitignore
deleted file mode 100644
index 9cc263e..0000000
--- a/preview/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-*.log
-Makefile
-auto
-auto.el
-autom4te.cache
-config.cache
-config.status
-configure
-preview-latex.el
diff --git a/preview/COPYING b/preview/COPYING
deleted file mode 100644
index 94a9ed0..0000000
--- a/preview/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/preview/Makefile.in b/preview/Makefile.in
deleted file mode 100644
index c8b058c..0000000
--- a/preview/Makefile.in
+++ /dev/null
@@ -1,162 +0,0 @@
-# Makefile for AUCTeX
-
-# Maintainer: address@hidden
-
-# Copyright (C) 2001, 2002, 2003, 2004, 2005,
-#   2006 Free Software Foundation, Inc.
-
-# This file is part of AUCTeX.
-
-# AUCTeX is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-
-# AUCTeX is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with AUCTeX; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-
address@hidden@
-PACKAGE=preview
-PACKAGE_INFO=preview-latex
address@hidden@
-ELCC=$(EMACS) -batch -q -no-site-file -no-init-file
-AUCTEX=-eval '(let ((dir (pop command-line-args-left))) \
-  (if (not (string-equal dir "")) (push dir load-path)))' $(auctexdir) --eval 
'(push "." load-path)'
-AUTOLOAD=--eval '(let ((generated-autoload-file (expand-file-name "$@"))) \
-               (update-file-autoloads "preview.el")(save-buffers-kill-emacs 
t))'
-
-LISP_SOURCES = @PLAT_LISP@ preview.el
-LISP_OBJS = $(LISP_SOURCES:.el=.elc)
-
-ICON_SOURCES = \
- images/prverr16.xpm  images/prverr20.xpm       images/prverr24.xbm \
- images/prverr24.xpm  images/prvtex-cap-up.xpm  images/prvtex12.xbm \
- images/prvtex12.xpm  images/prvtex16.xbm       images/prvtex16.xpm \
- images/prvtex20.xpm  images/prvtex24.xbm       images/prvtex24.xpm \
- images/prvwrk12.xpm  images/prvwrk14.xpm       images/prvwrk16.xpm \
- images/prvwrk20.xpm  images/prvwrk24.xbm       images/prvwrk24.xpm
-
-prefix = @address@hidden(null)
-exec_prefix = @address@hidden(null)
-libdir = @address@hidden(null)
-packagedatadir = @address@hidden(null)
-datarootdir = @address@hidden(null)
-datadir = @address@hidden(null)
-previewstartfile = @previewstartfile@
-packagedir = @address@hidden(null)
-packagelispdir = @address@hidden(null)
-auctexdir = @address@hidden(null)
-DESTDIR=
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = ../mkinstalldirs
-
-all: texmf lisp install-hint
-
-lisp: $(LISP_OBJS)
-       test "x$(packagedir)" != xno || $(MAKE) preview-latex.el
-
-texmf: latex/Makefile
-       (cd latex ; $(MAKE) all)
-
-latex/Makefile: latex/Makefile.in Makefile config.status
-       ./config.status
-
-auto.el: auto.el.in Makefile config.status
-       ./config.status
-
-configure: configure.ac ../aclocal.m4
-       autoconf -I..
-
-Makefile: Makefile.in config.status
-       ./config.status
-
-config.status: configure
-       ./config.status --recheck
-
-install-hint:
-       @echo 'Congratulations!  Build is complete.'
-       @echo 
-       @echo 'Now, run "make install" as root, or whatever user has 
permissions'
-       @echo 'to write to the install directory.'
-
-
-.PHONY: install install-texmf install-el install-images install-startup \
-       install-nosearch use-hint all lisp texmf
-
-install: install-texmf install-el install-nosearch install-images \
-         install-startup use-hint
-
-use-hint:
-       @echo "Installation completed."
-       @echo
-       @echo "Read the PROBLEMS file if you experience problems."
-       @echo "Please use M-x preview-report-bug if you experience any"
-       @echo "problems not mentioned in there."
-
-install-el: $(LISP_OBJS) auto.el
-       -$(MKINSTALLDIRS) $(DESTDIR)$(packagelispdir)
-       for x in $(LISP_SOURCES) ; do \
-         echo $(INSTALL_DATA) $$x $(DESTDIR)$(packagelispdir) ; \
-         $(INSTALL_DATA) $$x $(DESTDIR)$(packagelispdir) ; \
-         echo $(INSTALL_DATA) $${x}c $(DESTDIR)$(packagelispdir) ; \
-         $(INSTALL_DATA) $${x}c $(DESTDIR)$(packagelispdir) ; \
-       done
-
-install-nosearch:
-       -$(MKINSTALLDIRS) $(DESTDIR)$(packagedatadir)
-       : >$(DESTDIR)$(packagedatadir)/.nosearch
-
-install-images: $(ICON_SOURCES)
-       -$(MKINSTALLDIRS) $(DESTDIR)$(packagedatadir)/images
-       for x in $(ICON_SOURCES); do \
-         echo $(INSTALL_DATA) $$x $(DESTDIR)$(packagedatadir)/images ; \
-         $(INSTALL_DATA) $$x $(DESTDIR)$(packagedatadir)/images ; \
-       done
-
-install-texmf:
-       (cd latex ; $(MAKE) DESTDIR=$(DESTDIR) install)
-
-install-startup:
-       test $(packagedir) != no || $(MAKE) preview-latex.el
-       test $(packagedir) != no || \
-         $(INSTALL_DATA) preview-latex.el $(DESTDIR)$(previewstartfile)
-
-$(LISP_OBJS):  $(LISP_SOURCES)
-       for x in $(LISP_SOURCES) ; do \
-         echo $(ELCC) $(AUCTEX) -f batch-byte-compile $$x ; \
-         $(ELCC) $(AUCTEX) -f batch-byte-compile $$x ; \
-       done
-
-preview-latex.el: preview.el auto.el
-       rm -f preview-latex.el
-       -$(EMACS) -batch -no-site-file -no-init-file $(AUTOLOAD) ; \
-       test -r $@ || { \
-         echo ";; Auto-generated preview-latex.el" > $@ ; \
-         echo "" >> $@ ; \
-         $(EMACS) -batch -no-site-file -no-init-file $(AUTOLOAD) ; \
-       }
-       cat auto.el >> $@
-
-.PHONY: clean distclean maintainer-clean tarball-ready
-
-clean:
-       rm -f latex.out testdocstrip.tex preview-latex.el
-       rm -rf *.prv *.elc *~ *.aux *.dvi *.log 
-       (cd latex ; $(MAKE) clean)
-
-distclean: clean
-       rm -f config.log config.cache config.status
-       rm -f Makefile */Makefile auto.el
-
-maintainer-clean: 
-       $(MAKE) distclean
-       rm -rf autom4te.cache
diff --git a/preview/configure.ac b/preview/configure.ac
deleted file mode 100644
index 6c40005..0000000
--- a/preview/configure.ac
+++ /dev/null
@@ -1,226 +0,0 @@
-dnl Autoconf script for AUCTeX
-
-dnl Maintainer: address@hidden
-
-dnl Copyright (C) 2001, 2002, 2003, 2004, 2005,
-dnl   2006 Free Software Foundation, Inc.
-
-dnl This file is part of AUCTeX.
-
-dnl AUCTeX is free software; you can redistribute it and/or modify it
-dnl under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
-
-dnl AUCTeX is distributed in the hope that it will be useful, but
-dnl WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-dnl General Public License for more details.
-
-dnl You should have received a copy of the GNU General Public License
-dnl along with AUCTeX; see the file COPYING.  If not, write to the Free
-dnl Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-dnl MA 02110-1301, USA.
-
-AC_INIT(preview-latex,11.84,address@hidden)
-
-AC_PROG_MAKE_SET
-AC_PROG_INSTALL
-
-# Import unquoted variables.
-TEX="$TEX_UNQUOTED"
-packagedir="$packagedir_unquoted"
-packagelispdir="$packagelispdir_unquoted"
-packagedatadir="$packagedatadir_unquoted"
-EMACS="$EMACS_UNQUOTED"
-
-EMACS_PROG_EMACS
-
-if test ${EMACS_FLAVOR} = xemacs
-then
-  EMACS_CHECK_VERSION(21,4)
-else
-  EMACS_CHECK_VERSION(21,1)
-fi
-
-# The Debian package uses `--disable-build-dir-test'; normal users should
-# never need to modify the default behavior.
-AC_ARG_ENABLE([build-dir-test],
-  [  --enable-build-dir-test test for build directory inside `load-path'
-                         (on by default)],
-  [if ! [[ "X-${enableval}" = "X-no" ]]
-     then VALID_BUILD_DIR
-   fi],
-  [VALID_BUILD_DIR])
-
-if test ${EMACS_FLAVOR} = "xemacs"  ; then
-   PLAT_LISP=prv-xemacs.el
-   EMACS_PATH_PACKAGEDIR([preview],[preview])
-else
-   PLAT_LISP=prv-emacs.el
-   packagedir=no
-fi
-
-if test "X${packagedir}" = Xno
-then
-   EMACS_PATH_LISPDIR
-   AC_MSG_CHECKING(what file to use for preview startup)
-   AC_ARG_WITH(previewstartfile,
-   [[  --with-previewstartfile=FILE    What file to use for preview startup.]],
-   [[ previewstartfile="${withval}" ]],
-   [ _tmpdir_="${lispdir}"
-     AC_FULL_EXPAND(_tmpdir_)
-     if test -d "${_tmpdir_}/site-start.d"
-     then
-       previewstartfile="${lispdir}/site-start.d/preview-latex.el"
-     else
-       previewstartfile="${lispdir}/preview-latex.el"
-     fi])
-   AC_MSG_RESULT([[${previewstartfile}]])
-   test "X$packagelispdir" = X && packagelispdir="${lispdir}/preview"
-   test "X$packagedatadir" = X && packagedatadir="${packagelispdir}"
-else
-   #lispdir is only used for determining relative files.
-   lispdir="${packagedir}"
-   test "X$packagelispdir" = X && packagelispdir="${packagedir}/lisp/preview"
-   previewstartfile="${packagelispdir}"/auto-autoloads.el
-   test "X$packagedatadir" = X && packagedatadir="${packagedir}/etc/preview"
-fi
-
-AC_SUBST(previewstartfile)
-
-AC_MSG_CHECKING([where the package lisp files go])
-AC_ARG_WITH(packagelispdir,
-[[  --with-packagelispdir=DIR
-                        Directory for the package lisp files.]],
-  [packagelispdir=["${withval}"]])
-AC_LISPIFY_DIR(packagelispdir,"${previewstartfile}")
-AC_MSG_RESULT([[${packagelispdir}]])
-
-AC_MSG_CHECKING([where the data files go])
-AC_ARG_WITH(packagedatadir,
-[[  --with-packagedatadir=DIR         Where the data files go.]],
-  [packagedatadir=["${withval}"]])
-AC_LISPIFY_DIR(packagedatadir,"${previewstartfile}")
-AC_MSG_RESULT([[${packagedatadir}]])
-
-AC_SUBST(PLAT_LISP)
-AC_SUBST(packagedir)
-
-EMACS_CHECK_AUCTEX
-AC_SUBST(auctexdir)
-
-AC_ARG_VAR(GS,[Ghostscript executable for batch operation])
-AC_CHECK_PROGS(GS, gs GSWIN32C.EXE, NONE)
-
-EMACS_LISP([[lispGS]],[[(if (member dir (list \"NONE\" (if (eq system-type 
'windows-nt) \"GSWIN32C.EXE\" \"gs\"))) \"\" \`(defvar preview-gs-command 
,dir))]],-no-site-file,[[dir]],[["${GS}"]])
-AC_SUBST(lispGS)
-
-dnl check to see if GS supports -dTextAlphaBits and -dGraphicsAlphaBits
-dnl Check to see if specific drivers are built in.
-dnl Need table of mappings, with priority
-
-AC_PATH_PROG_REQUIRED(LATEX, latex, [LaTeX not found, aborting!
-You must install LaTeX for preview to work.])
-
-AC_PATH_PROG(PDFLATEX, pdflatex)
-
-# Determine which latex-style components to install
-# To match .sty, .def, .cfg, but _not_ .drv
-TEXMFGEN=[`sed -n 
's/^%<installer>.*file[{]\\([^}.]*\\.[sdc][tef][yfg]\\)[}].*/\\1/p' 
latex/preview.dtx`]
-# Replace newlines with spaces.
-TEXMFGEN="`echo ${TEXMFGEN}`"
-AC_SUBST(TEXMFGEN)
-
-AC_PATH_PROG_REQUIRED(TEX, tex, NONE)
-
-TEX_PATH_TEXMFDIR
-
-if test "x${texmfdir}" = "xno"
-then
-  packagetexstyles="${packagedatadir}/latex"
-  AC_LISPIFY_DIR(packagetexstyles,"${previewstartfile}")
-  lisppackagetexstyles="(defvar preview-TeX-style-dir ${lisppackagetexstyles})"
-  test "X${TEXHASH}" = X && TEXHASH=:
-else
-  lisppackagetexstyles=
-fi
-AC_SUBST(lisppackagetexstyles)
-
-# Be very careful about assuming things about the available hash programs
-# MiKTeX comes with a braindead link to mktexlsr, apparently, so first
-# try the regular utility from them.
-AC_ARG_VAR(TEXHASH,[command to update the TeX filename database.
-Set to : to skip updating the database on installation.
-This is the default for --without-texmf-dir])
-
-if test "X${TEXHASH}" = "X"
-then
-  AC_PATH_PROG(TEXHASH, texhash)
-  AC_CHECK_PROG(TEXHASH, initexmf, initexmf -u)
-  if test "X${TEXHASH}" = X
-  then
-     AC_PATH_PROGS(TEXHASH, mktexlsr MakeTeXls-R, :)
-  fi
-fi
-
-AC_MSG_CHECKING([[for glaring installation conflicts]])
-exppackagelispdir="$packagelispdir"
-AC_FULL_EXPAND(exppackagelispdir)
-exppreviewstartfile="$previewstartfile"
-AC_FULL_EXPAND(exppreviewstartfile)
-
-EMACS_LISP(shadows,[[
-  (concat
-    (and (setq tmp (locate-library \"preview.elc\"))
-         (not (string= (file-truename tmp)
-                      (file-truename (expand-file-name \"preview.elc\"
-                                      packagelispdir))))
-         (format \"Conflicting previous installation in \`%s' found!\n\"
-                 (file-name-directory tmp)))
-    (and (setq tmp (locate-library \"preview-latex.el\"))
-         (not (string= (file-truename tmp)
-                       (file-truename previewstartfile)))
-         (format \"Conflicting previous startup file \`%s' found!\n\" 
tmp)))]],,
-  [[packagelispdir previewstartfile]],[["${exppackagelispdir}" 
"${exppreviewstartfile}"]])
-if test "NONE${shadows}" != NONE
-then
-  conflictsmsg="Conflicts with previous installations have been detected.
-Please fix them before continuing.
-"
-  AC_MSG_RESULT([[ouch!
-]])
-AC_MSG_WARN([[${shadows}
-]])
-else
-  conflictsmsg=
-  AC_MSG_RESULT([[probably none]])
-fi
-
-
-AC_SHELL_QUOTIFY(texmfdir)
-AC_SHELL_QUOTIFY(prefix)
-AC_SHELL_QUOTIFY(exec_prefix)
-AC_SHELL_QUOTIFY(libdir)
-AC_SHELL_QUOTIFY(previewtexmfdir)
-AC_SHELL_QUOTIFY(previewdocdir)
-AC_SHELL_QUOTIFY(packagedir)
-AC_SHELL_QUOTIFY(packagelispdir)
-AC_SHELL_QUOTIFY(previewstartfile)
-AC_SHELL_QUOTIFY(lispdir)
-AC_SHELL_QUOTIFY(packagedatadir)
-AC_SHELL_QUOTIFY(auctexdir)
-AC_SHELL_QUOTIFY(datadir)
-AC_SHELL_QUOTIFY(GS)
-AC_SHELL_QUOTIFY(TEXHASH)
-AC_SHELL_QUOTIFY(EMACS)
-AC_SHELL_QUOTIFY(TEX)
-AC_SHELL_QUOTIFY(LATEX)
-AC_SHELL_QUOTIFY(PDFLATEX)
-
-AC_OUTPUT(Makefile auto.el latex/Makefile)
-cat >&2 <<EOF
-
-Congratulations!  Configuration of preview is complete.
-${conflictsmsg}
-EOF
diff --git a/preview/prv-emacs.el b/prv-emacs.el
similarity index 100%
rename from preview/prv-emacs.el
rename to prv-emacs.el
diff --git a/preview/prv-install.el b/prv-install.el
similarity index 100%
rename from preview/prv-install.el
rename to prv-install.el
diff --git a/preview/prv-xemacs.el b/prv-xemacs.el
similarity index 100%
rename from preview/prv-xemacs.el
rename to prv-xemacs.el
-- 
2.1.2




reply via email to

[Prev in Thread] Current Thread [Next in Thread]