[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/auctex 88b381c 54/67: Drop xemacs support and mule chec
From: |
Tassilo Horn |
Subject: |
[elpa] externals/auctex 88b381c 54/67: Drop xemacs support and mule check from configure and Makefile |
Date: |
Fri, 8 Feb 2019 11:40:39 -0500 (EST) |
branch: externals/auctex
commit 88b381c291059819eea3d5a386ef019d5313f581
Author: Ikumi Keita <address@hidden>
Commit: Ikumi Keita <address@hidden>
Drop xemacs support and mule check from configure and Makefile
* aclocal.m4:
* configure.ac:
* doc/Makefile.in: Drop xemacs support and mule check.
* Makefile.in: Merge mule file into main files.
Drop xemacs support.
* prv-install.el: Remove.
---
Makefile.in | 107 +++++++++++++++-------------------------------------
aclocal.m4 | 112 +++++++------------------------------------------------
configure.ac | 101 ++++++++++++++++---------------------------------
doc/Makefile.in | 24 +++---------
prv-install.el | 114 --------------------------------------------------------
5 files changed, 84 insertions(+), 374 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 627935d..a5bf496 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,7 +2,7 @@
# Maintainer: address@hidden
-# Copyright (C) 2003-2008, 2010, 2013-2015 Free Software
+# Copyright (C) 2003-2008, 2010, 2013-2015, 2018 Free Software
# Foundation, Inc.
# This file is part of AUCTeX.
@@ -37,7 +37,6 @@ address@hidden@
previewstartfile = @previewstartfile@
packagelispdir = @address@hidden(null)
packagedatadir = @address@hidden(null)
-packagedir = @address@hidden(null)
autodir = @address@hidden(null)
address@hidden@
styledir = $(packagedatadir)/style
@@ -74,18 +73,14 @@ DIST_PREFIX=$(PWD)/auctex-dist
FTPDIR = $(DIST_PREFIX)/ftp
WWWDIR = $(DIST_PREFIX)/www
CTANDIR = $(DIST_PREFIX)/ctan
-XEMACS_BUILD_DIR = xemacs-build
PREVIEW_BUILD_DIR = preview-build
COMMITTER="`git config --get user.name`\ \ \<`git config --get user.email`\>"
RPMROOT = /usr/src/redhat
RPM_SIGN = --sign
-MULESRC = @MULESRC@
-MULEELC = @MULEELC@
-
AUCSRC = tex.el tex-buf.el tex-style.el plain-tex.el latex.el tex-info.el \
texmathp.el multi-prompt.el tex-mik.el font-latex.el tex-font.el \
- context.el context-en.el context-nl.el tex-fold.el \
+ context.el context-en.el context-nl.el tex-fold.el tex-jp.el \
toolbar-x.el tex-bar.el bib-cite.el tex-ispell.el latex-flymake.el
AUCELC = $(AUCSRC:.el=.elc)
@@ -177,12 +172,12 @@ STYLEELC = $(STYLESRC:.el=.elc)
ifeq (@preview_enabled@,yes)
PREVIEWSRC = @PLAT_LISP@ preview.el
PREVIEWELC = $(PREVIEWSRC:.el=.elc)
- PREVIEWLATEX = test "x$(packagedir)" != xno || $(MAKE) preview-latex.el
+ PREVIEWLATEX = $(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 || \
+ PREVIEW_INS_STARTUP = \
$(INSTALL_DATA) preview-latex.el $(DESTDIR)$(previewstartfile)
else
# Don't do anything with preview if the user doesn't want the
@@ -197,7 +192,7 @@ endif
-CLEANFILES = $(AUCELC) $(STYLEELC) $(MULEELC) $(PREVIEWELC) preview-latex.el
+CLEANFILES = $(AUCELC) $(STYLEELC) $(PREVIEWELC) preview-latex.el
DISTCLEANFILES = Makefile tex-site.el tex-site.el.out auctex.el \
auto-loads.el config.* preview.el
DISTTEXTS = FAQ INSTALL INSTALL.windows README TODO PROBLEMS.preview
@@ -207,17 +202,17 @@ NOSEARCH = style/.nosearch
all: texmf lisp docs
.PHONY: all lisp info dvi some install install-el install-lisp docs \
- install-docs install-auto install-metadata install-startup \
- install-man clean distclean maintainer-clean extraclean \
+ install-docs install-auto install-startup \
+ clean distclean maintainer-clean extraclean \
tar-ball-clean check-tag check release-commit dist snapshot \
- patch tar-ball rpm-packages wc xemacs-package windows-package \
+ patch tar-ball rpm-packages wc windows-package \
release-sign release-upload preview-ball uninstall
texmf: latex/Makefile
$(TEXMF)
-lisp: tex-site.el $(AUCSRC) $(STYLESRC) $(MULESRC) $(PREVIEWSRC)
- $(ELCC) -f batch-byte-compile $(AUCSRC) $(STYLESRC) $(MULESRC)
$(PREVIEWSRC)
+lisp: tex-site.el $(AUCSRC) $(STYLESRC) $(PREVIEWSRC)
+ $(ELCC) -f batch-byte-compile $(AUCSRC) $(STYLESRC) $(PREVIEWSRC)
$(PREVIEWLATEX)
preview-latex.el: preview.el
@@ -240,9 +235,9 @@ dvi:
tex-site.el: tex-site.el.out auto-loads.el Makefile
cat tex-site.el.out >$@
- test X$(packagedir) != Xno || cat auto-loads.el >>$@
+ cat auto-loads.el >>$@
echo "(provide 'tex-site)" >>$@ ; \
- test X$(packagedir) != Xno || echo ";;; tex-site.el ends here" >>$@
+ echo ";;; tex-site.el ends here" >>$@
tex-site.el.out: tex-site.el.in Makefile config.status
./config.status
@@ -265,32 +260,24 @@ doc/Makefile: doc/Makefile.in config.status ChangeLog.1
config.status: configure
./config.status --recheck
-auto-loads.el: $(AUCSRC) $(MULESRC) Makefile
- test X$(packagedir) != Xno || { \
- rm -f $@ ; \
- $(ELCC) $(AUTOLOAD) $(AUCSRC) $(MULESRC) || : ; \
- test -r $@ || { \
- echo ";; Auto-generated part of tex-site.el" > $@ ; \
- echo "" >> $@ ; \
- $(ELCC) $(AUTOLOAD) $(AUCSRC) $(MULESRC) ; \
- } ; \
+auto-loads.el: $(AUCSRC) Makefile
+ rm -f $@
+ -$(ELCC) $(AUTOLOAD) $(AUCSRC)
+ test -r $@ || { \
+ echo ";; Auto-generated part of tex-site.el" > $@ ; \
+ echo "" >> $@ ; \
+ $(ELCC) $(AUTOLOAD) $(AUCSRC) ; \
}
some: $(AUCELC) $(STYLEELC)
install: install-texmf install-lisp install-docs install-images \
install-startup
- $(MAKE) 'DESTDIR=$(DESTDIR)' install-metadata
-
-install-man: doc/Makefile
- cd doc && $(MAKE) 'DESTDIR=$(DESTDIR)' install-man
- $(INSTALL_DATA) RELEASE $(DESTDIR)$(packagedir)/man/auctex
install-startup:
$(PREVIEWLATEX)
$(PREVIEW_INS_STARTUP)
- test $(packagedir) != no || \
- $(INSTALL_DATA) auctex.el $(DESTDIR)$(auctexstartfile)
+ $(INSTALL_DATA) auctex.el $(DESTDIR)$(auctexstartfile)
install-texmf:
$(INS_TEXMF)
@@ -306,15 +293,12 @@ install-el:
mv $(DESTDIR)$(lispdir)/tex-site.el
$(DESTDIR)$(lispdir)/tex-site.el.save ; \
fi; \
}
- if test X$(packagedir) = Xno; \
- then $(INSTALL_DATA) tex-site.el $(DESTDIR)$(lispdir) ; \
- else rm -f $(DESTDIR)$(lispdir)/tex-site.el ; \
- fi
+ $(INSTALL_DATA) tex-site.el $(DESTDIR)$(lispdir)
-$(MKINSTALLDIRS) $(DESTDIR)$(packagelispdir)
- @: $(MAKE) ; for x in $(AUCSRC) $(MULESRC) $(PREVIEWSRC); do \
+ @: $(MAKE) ; for x in $(AUCSRC) $(PREVIEWSRC); do \
echo '$(INSTALL_DATA)' $$x '$(DESTDIR)$(packagelispdir)' ; \
done
- @for x in $(AUCSRC) $(MULESRC) $(PREVIEWSRC); do \
+ @for x in $(AUCSRC) $(PREVIEWSRC); do \
$(INSTALL_DATA) $$x $(DESTDIR)$(packagelispdir) ; \
done;
-$(MKINSTALLDIRS) $(DESTDIR)$(styledir)
@@ -329,10 +313,10 @@ install-el:
-$(INSTALL_DATA) $(NOSEARCH) $(DESTDIR)$(autodir)
install-lisp: some install-el
- @: $(MAKE) ; for x in $(AUCSRC) $(MULESRC) $(PREVIEWSRC); do \
+ @: $(MAKE) ; for x in $(AUCSRC) $(PREVIEWSRC); do \
echo '$(INSTALL_DATA)' $${x}c '$(DESTDIR)$(packagelispdir)' ; \
done
- @for x in $(AUCSRC) $(MULESRC) $(PREVIEWSRC); do \
+ @for x in $(AUCSRC) $(PREVIEWSRC); do \
$(INSTALL_DATA) $${x}c $(DESTDIR)$(packagelispdir) ; \
done
@: $(MAKE) ; for x in $(STYLESRC) ; do \
@@ -359,28 +343,10 @@ install-docs: doc/Makefile
install-auto:
@echo "Use \"M-x TeX-auto-generate-global RET\" instead."
-install-metadata:
- test "x$(packagedir)" = xno || { \
- $(MKINSTALLDIRS) $(DESTDIR)$(packagedir)/pkginfo || : ; \
- $(ELCC) -l prv-install -f preview-make-package
$(DESTDIR)$(packagedir) "$(PACKAGE)" \"`echo $(AUCTEXDATE)|sed
's/\(.*\)-\(.*\)-\(.*\)/\1.\2\3/'`\" \"$(AUCTEXVERSION)\" tex-site.el && \
- cd $(DESTDIR)$(packagedir) && \
- find "etc/$(PACKAGE)" "lisp/$(PACKAGE)" -print
>"pkginfo/MANIFEST.$(PACKAGE)" && \
- for i in $(PACKAGE_INFO); do \
- test -r "info/$$i.info" && echo "info/$$i.info" >>
"pkginfo/MANIFEST.$(PACKAGE)" ; \
- done && \
- echo "pkginfo/MANIFEST.$(PACKAGE)" >> "pkginfo/MANIFEST.$(PACKAGE)" ;
\
- }
-
uninstall:
rm -rf $(DESTDIR)$(packagelispdir) $(DESTDIR)$(packagedatadir) \
$(DESTDIR)$(autodir)
- if test X$(packagedir) = Xno ; then \
- rm -f $(DESTDIR)$(lispdir)/tex-site.el \
- $(DESTDIR)$(auctexstartfile) ; \
- else \
- rm -f $(DESTDIR)$(packagedir)/man/auctex/RELEASE \
- $(DESTDIR)$(packagedir)/pkginfo/MANIFEST.$(PACKAGE); \
- fi
+ rm -f $(DESTDIR)$(lispdir)/tex-site.el $(DESTDIR)$(auctexstartfile)
cd doc ; $(MAKE) DESTDIR=$(DESTDIR) uninstall
rm -f $(DESTDIR)$(previewstartfile)
rm -rf $(DESTDIR)$(packagelispdir)
@@ -408,7 +374,6 @@ extraclean: maintainer-clean
tar-ball-clean: check-tag
rm -rf auctex-$(TAG)/
- rm -rf $(XEMACS_BUILD_DIR)/
wc:
wc $(AUCSRC) $(STYLESRC)
@@ -489,25 +454,22 @@ change-history-commit:
# 3) dist TAG=<tag>
# Create the tar ball and other release files and put them into $FTPDIR.
#
-# 4) xemacs-package TAG=<tag>
-# Create the precompiled XEmacs package.
-#
-# 5) windows-package WEMACSVER=<emacs-version> TAG=<tag>
+# 4) windows-package WEMACSVER=<emacs-version> TAG=<tag>
# Create the precompiled AUCTeX package for Windows.
# This requires a compiled Emacs of the same version at location $WEMACS.
# NOTA BENE: you may need to use bash shell for this recipe to work.
#
-# 6) release-sign TAG=<tag>
+# 5) release-sign TAG=<tag>
# Sign the tar ball and create directive files for upload. NOTA BENE: you
# may need to use bash shell for this recipe to work.
#
-# 7) release-upload
+# 6) release-upload
# Upload files to GNU FTP server.
#
-# 8) www-doc TAG=<tag>
+# 7) www-doc TAG=<tag>
# Create documentation for AUCTeX home page.
#
-# 9) preview-ball TAG=<tag>
+# 8) preview-ball TAG=<tag>
# Create preview package. (Not for GNU FTP server but for CTAN.)
dist: check-tag tar-ball
@@ -574,13 +536,6 @@ patch:
diff -u auctex-$(OLD) auctex-$(TAG) | gzip --best \
>$(FTPDIR)/auctex-$(OLD)-to-$(TAG).patch.gz
-xemacs-package: check-tag
- rm -rf $(XEMACS_BUILD_DIR)
- $(CP_A) auctex-$(TAG) $(XEMACS_BUILD_DIR)
- cd $(XEMACS_BUILD_DIR) \
- && ./configure INSTALL_INFO=: TEXHASH=: --with-xemacs
--with-packagedir=`pwd`/xemacs-package --without-texmf-dir
--with-auto-dir=etc/auctex/auto \
- && $(MAKE) all install-man install && cd xemacs-package && tar -cf -
--owner=root --group=root . | gzip --best > $(FTPDIR)/auctex-$(TAG)-pkg.tar.gz
-
# Pre-compiled AUCTeX package for Emacs on Windows
WBUILDDIR=$(PWD)/windows-package
WEMACS=/usr/src/emacs-$(WEMACSVER)/src/emacs
diff --git a/aclocal.m4 b/aclocal.m4
index 08b0b52..383a593 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -34,7 +34,7 @@ AC_DEFUN(EMACS_PATH_PREFIX,[
prefix) (error "NONE"))]],[[-no-site-file]],[[cmd]],[$2])])
AC_DEFUN(EMACS_PROG_EMACS, [
-# Check for (X)Emacs, report its path, flavor and prefix
+# Check for Emacs, report its path, flavor and prefix
# Apparently, if you run a shell window in Emacs, it sets the EMACS
# environment variable to 't'. Let's undo the damage.
@@ -44,48 +44,16 @@ fi
AC_ARG_WITH(emacs,
[ --with-emacs@<:@=PATH@:>@ Use Emacs to build (on PATH if given)],
[if test "${withval}" = "yes"; then EMACS=emacs
- elif test "${withval}" = "no"; then EMACS=xemacs
else EMACS="${withval}"; fi])
-AC_ARG_WITH(xemacs,
- [ --with-xemacs@<:@=PATH@:>@ Use XEmacs to build (on PATH if given)],
- [if test "x${withval}" != xno
- then
- if test "x${with_emacs}" != xno -a "x${with_emacs}" != x
- then
- AC_MSG_ERROR([[cannot use both Emacs and XEmacs]])
- fi
- if test "x${withval}" = "xyes"
- then
- EMACS=xemacs
- else
- EMACS="${withval}"
- fi
- elif test "x${with_emacs}" = xno
- then
- AC_MSG_ERROR([[need to use either Emacs or XEmacs]])
- fi])
-
# "${prefix}/bin" is for Windows users
-AC_PATH_PROGS(EMACS, ${EMACS} emacs xemacs, "", ${PATH} "${prefix}/bin" )
+AC_PATH_PROGS(EMACS, ${EMACS} emacs, "", ${PATH} "${prefix}/bin" )
if test -z "${EMACS}"; then
- AC_MSG_ERROR([(X)Emacs not found! Aborting!])
+ AC_MSG_ERROR([Emacs not found! Aborting!])
fi
-AC_MSG_CHECKING([if ${EMACS} is XEmacs])
-EMACS_LISP(XEMACS,
- [[(if (featurep (quote xemacs)) \"yes\" \"no\")]],[[-no-site-file]])
-if test "${XEMACS}" = "yes"; then
- EMACS_FLAVOR=xemacs
- EMACS_NAME="XEmacs"
-elif test "${XEMACS}" = "no"; then
EMACS_FLAVOR=emacs
EMACS_NAME="Emacs"
-else
- AC_MSG_ERROR([Unable to run ${EMACS}! Aborting!])
-fi
- AC_MSG_RESULT(${XEMACS})
- AC_SUBST(XEMACS)
AC_SUBST(EMACS_FLAVOR)
AC_MSG_CHECKING([for ${EMACS_NAME} prefix])
EMACS_PATH_PREFIX([[emacsprefix]],[["${EMACS}"]])
@@ -189,31 +157,6 @@ AC_DEFUN(EMACS_EXAMINE_INSTALLATION_DIR,
[prefix expanded $6],["${currentprefix}" "${expprefix}" $7])
if test "[$]$1" != NONE; then break; fi; done])
-AC_DEFUN(EMACS_PATH_PACKAGEDIR,
- [AC_ARG_WITH(packagedir,
- [ --with-packagedir=DIR package DIR for XEmacs],
- [packagedir="`echo ${withval} | sed 's/^~\//${HOME}\//;s/[[\/\\]]$//'`"],
- [if test ${EMACS_FLAVOR} = xemacs; then
- AC_MSG_CHECKING([for XEmacs package directory])
- EMACS_EXAMINE_INSTALLATION_DIR(packagedir,
- [['${datadir}/xemacs/xemacs-packages' \
- '${libdir}/xemacs/xemacs-packages' \
- '${datadir}' '${libdir}' "${emacsprefix}"]],
- [[(list \"xemacs/site-packages\" \"xemacs/xemacs-packages\"
- \"site-packages\" \"xemacs-packages\")]],
- [[(if (boundp 'late-packages)
- (append late-packages last-packages early-packages)
- (append late-package-hierarchies last-package-hierarchies
- early-package-hierarchies))]])
- if test "x${packagedir}" = xNONE -o -z "${packagedir}"; then
- AC_MSG_ERROR([not found, exiting!])
- fi
- AC_MSG_RESULT(${packagedir})
- else
- packagedir=no
- fi])
- AC_SUBST(packagedir)])
-
AC_DEFUN(EMACS_PATH_LISPDIR, [
AC_MSG_CHECKING([where lisp files go])
AC_ARG_WITH(lispdir,
@@ -221,24 +164,19 @@ AC_DEFUN(EMACS_PATH_LISPDIR, [
files will be place in a subdirectory.],
[[lispdir="${withval}"]])
if test "X${lispdir}" = X; then
- if test "X${packagedir}" = Xno; then
- # Test paths relative to prefixes
- EMACS_EXAMINE_INSTALLATION_DIR(lispdir,
- [['${datadir}/'${EMACS_FLAVOR} '${libdir}/'${EMACS_FLAVOR} \
- "${emacsprefix}/share/${EMACS_FLAVOR}" \
- '${datadir}' '${libdir}' "${emacsprefix}"]],
- [[(list \"${EMACS_FLAVOR}/site-lisp\" \"${EMACS_FLAVOR}/site-packages\"
- \"site-lisp\" \"site-packages\")]], load-path)
- if test "${lispdir}" = "NONE"; then
- # No? notify user.
- AC_MSG_ERROR([Cannot locate lisp directory,
+ # Test paths relative to prefixes
+ EMACS_EXAMINE_INSTALLATION_DIR(lispdir,
+ [['${datadir}/'${EMACS_FLAVOR} '${libdir}/'${EMACS_FLAVOR} \
+ "${emacsprefix}/share/${EMACS_FLAVOR}" \
+ '${datadir}' '${libdir}' "${emacsprefix}"]],
+ [[(list \"${EMACS_FLAVOR}/site-lisp\" \"${EMACS_FLAVOR}/site-packages\"
+ \"site-lisp\" \"site-packages\")]], load-path)
+ if test "${lispdir}" = "NONE"; then
+ # No? notify user.
+ AC_MSG_ERROR([Cannot locate lisp directory,
use --with-lispdir, --datadir, or possibly --prefix to rectify this])
- fi
- else
- # XEmacs
- lispdir="${packagedir}/lisp"
- fi
fi
+ fi
AC_MSG_RESULT([[${lispdir}]])
AC_SUBST(lispdir)
])
@@ -511,28 +449,6 @@ AC_SUBST(auctexdir)
])
dnl
-dnl Check if (X)Emacs supports international characters,
-dnl i.e. provides MULE libraries and runs in multibyte mode.
-dnl
-AC_DEFUN(EMACS_CHECK_MULE, [
-AC_MSG_CHECKING(for MULE support)
-EMACS_CHECK_REQUIRE(mule,silent)
-if test "${HAVE_mule}" = "yes" && test "X${EMACS_UNIBYTE}" = X; then
- MULESRC="tex-jp.el"
- MULEELC="tex-jp.elc"
- AC_MSG_RESULT(yes)
-else
- AC_MSG_RESULT(no)
- if test "X${EMACS_UNIBYTE}" != X; then
- AC_MSG_WARN([[EMACS_UNIBYTE environment variable set.
-Disabling features requiring international character support.]])
- fi
-fi
-AC_SUBST(MULESRC)
-AC_SUBST(MULEELC)
-])
-
-dnl
dnl MAKEINFO_CHECK_MACRO( MACRO, [ACTION-IF-FOUND
dnl [, ACTION-IF-NOT-FOUND]])
dnl
diff --git a/configure.ac b/configure.ac
index fe7fef6..4ba8b57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,14 +37,7 @@ AC_SUBST(PREVIEWVERSION)
EMACS_PROG_EMACS
-if test ${EMACS_FLAVOR} = xemacs
-then
- EMACS_CHECK_VERSION(21,4)
-else
- EMACS_CHECK_VERSION(21,1)
-fi
-
-EMACS_CHECK_MULE
+EMACS_CHECK_VERSION(24,1)
# The Debian package uses `--disable-build-dir-test'; normal users should
# never need to modify the default behavior.
@@ -62,59 +55,40 @@ AC_ARG_ENABLE(preview,
[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
+PLAT_LISP=prv-emacs.el
-if test "X${packagedir}" = Xno
+EMACS_PATH_LISPDIR
+AC_MSG_CHECKING(what file to use for auctex startup)
+AC_ARG_WITH(auctexstartfile,
+[[ --with-auctexstartfile=FILE What file to use for auctex startup.]],
+[[ auctexstartfile="${withval}" ]],
+[ _tmpdir_="${lispdir}"
+AC_FULL_EXPAND(_tmpdir_)
+if test -d "${_tmpdir_}/site-start.d"
then
- EMACS_PATH_LISPDIR
- AC_MSG_CHECKING(what file to use for auctex startup)
- AC_ARG_WITH(auctexstartfile,
- [[ --with-auctexstartfile=FILE What file to use for auctex startup.]],
- [[ auctexstartfile="${withval}" ]],
- [ _tmpdir_="${lispdir}"
- AC_FULL_EXPAND(_tmpdir_)
- if test -d "${_tmpdir_}/site-start.d"
- then
- auctexstartfile="${lispdir}/site-start.d/auctex.el"
- else
- 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}"
+auctexstartfile="${lispdir}/site-start.d/auctex.el"
else
- #lispdir is only used for determining relative files.
- lispdir="${packagedir}"
- 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
+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}"
AC_SUBST(auctexstartfile)
AC_SUBST(previewstartfile)
@@ -140,14 +114,6 @@
AC_LISPIFY_DIR(texsite,[["${auctexstartfile}"]],tex-site.el)
AC_MSG_CHECKING(where the info files go)
AC_MSG_RESULT([[${infodir}]])
-AC_SUBST(packagedir)
-
-if test $EMACS_FLAVOR = "xemacs" -a "$infodir" = '${prefix}/info'; then
- if test $packagedir != 'no'; then
- infodir='${packagedir}/info'
- fi
-fi
-
AUCTEX_AUTO_DIR
AC_LISPIFY_DIR(autodir,"${texsitedir}/tex-site.el")
@@ -278,7 +244,7 @@ AC_PATH_PROG(TEXI2HTML, texi2html, :)
AC_PATH_PROG(TEXI2DVI, texi2dvi, :)
AC_PATH_PROG(TEXI2PDF, texi2pdf, :)
-AC_ARG_VAR(INSTALL_INFO, [install-info executable. Set to : to skip making a
dir file. This is the default when installing into an XEmacs package.])
+AC_ARG_VAR(INSTALL_INFO, [install-info executable. Set to : to skip making a
dir file.])
if test "X${INSTALL_INFO}" = X
then
@@ -287,7 +253,6 @@ fi
AC_SHELL_QUOTIFY(prefix)
AC_SHELL_QUOTIFY(localstatedir)
-AC_SHELL_QUOTIFY(packagedir)
AC_SHELL_QUOTIFY(packagelispdir)
AC_SHELL_QUOTIFY(packagedatadir)
AC_SHELL_QUOTIFY(lispdir)
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 6a37541..6f40d82 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -2,7 +2,7 @@
# Maintainer: address@hidden
-# Copyright (C) 2003-2008, 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2008, 2013-2015, 2018 Free Software Foundation, Inc.
# This file is part of AUCTeX.
@@ -24,7 +24,6 @@
address@hidden@$(null)
address@hidden@$(null)
address@hidden@$(null)
address@hidden@$(null)
address@hidden@$(null)
address@hidden@$(null)
address@hidden@
@@ -76,21 +75,12 @@ dvi: auctex.dvi tex-ref.dvi preview-latex.dvi
install: install-auctex install-preview
-install-man:
- test x$(packagedir) != xno && \
- { $(MKINSTALLDIRS) $(DESTDIR)$(packagedir)/man/auctex ; \
- for i in $(AUCTEXTEXIFILES) $(PREVIEWTEXIFILES) tex-ref.tex ; \
- do echo $(INSTALL_DATA) $$i $(DESTDIR)$(packagedir)/man/auctex; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(packagedir)/man/auctex; \
- done ; \
- }
-
dist: $(DISTTEXTS) preview-latex.info auctex.info tex-ref.pdf
extradist: html/$(TEXI2HTML_TOC) auctex.ps auctex.pdf tex-ref.ps tex-ref.pdf
.PHONY: all info dvi dist install-auctex disttexts clean distclean \
- maintainer-clean install-preview install-man uninstall html-docs \
+ maintainer-clean install-preview uninstall html-docs \
extradist
# AUCTeX
@@ -136,11 +126,9 @@ install-auctex: auctex.info tex-ref.pdf
fi; \
done
-$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) auctex.info
- test X$(packagedir) != Xno || { \
- $(MKINSTALLDIRS) $(DESTDIR)$(docdir); \
- rm -f $(DESTDIR)$(docdir)/tex-ref.pdf; \
- $(INSTALL_DATA) tex-ref.pdf $(DESTDIR)$(docdir); \
- }
+ $(MKINSTALLDIRS) $(DESTDIR)$(docdir)
+ rm -f $(DESTDIR)$(docdir)/tex-ref.pdf
+ $(INSTALL_DATA) tex-ref.pdf $(DESTDIR)$(docdir)
# preview
@@ -208,7 +196,7 @@ uninstall:
done
rm -f $(DESTDIR)$(infodir)/auctex.info
$(DESTDIR)$(infodir)/auctex.info-* \
$(DESTDIR)$(infodir)/preview-latex.info*
- test X$(packagedir) != Xno || rm -rf -f $(DESTDIR)$(docdir)
+ rm -rf -f $(DESTDIR)$(docdir)
clean:
rm -f *.dvi *.ps *.pdf *.aux *.cp *.fn *.ky *.log *~ \#*\# \
diff --git a/prv-install.el b/prv-install.el
deleted file mode 100644
index 158be5a..0000000
--- a/prv-install.el
+++ /dev/null
@@ -1,114 +0,0 @@
-;;; prv-install.el --- Complicated install-time magic for preview-latex.
-
-;; Copyright (C) 2002, 2005, 2014 Free Software Foundation, Inc.
-
-;; Author: David Kastrup
-;; Keywords: convenience, tex, wp
-
-;; This file 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.
-
-;; This file 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 GNU Emacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;; This contains package-building stuff and other install-time magic.
-;; It may well contain Emacs-version-specific code, but certain
-;; functions here should be *callable* from any Emacs version.
-
-;;; Code:
-
-(defun preview-make-package ()
- "Do anything required to make a package in this version of Emacs,
-other than actually copying the Lisp files.
-
-Takes arguments on the comamnd line: the package directory and any
-number of Lisp files to generate autoloads from.
-
-Does nothing in Emacsen that do not support a package system."
- (if (featurep 'xemacs)
- (preview-make-package-xemacs))
- (setq command-line-args-left nil))
-
-(defun preview-make-package-xemacs ()
- "Do anything required to make a package in XEmacs,
-other than actually copying the Lisp files.
-
-Generates auto-autoloads, custom-loads, and package metadata file
-in the right locations. Takes from the command line the package directory,
-package name, and version (to be evaluated), followed by a file to append."
- (let* ((package-dir (pop command-line-args-left))
- (package-name (pop command-line-args-left))
- (release-version (eval (read (pop command-line-args-left))))
- (author-version (eval (read (pop command-line-args-left))))
- append-file
- (lisp-dir (expand-file-name (format "lisp/%s/" package-name)
- package-dir))
- (metadata (expand-file-name "_pkg.el" lisp-dir))
- (custom-load (expand-file-name "custom-load.el" lisp-dir))
- (generated-autoload-file (expand-file-name "auto-autoloads.el"
- lisp-dir))
- (si:message (symbol-function 'message))
- make-backup-files noninteractive)
- ;; Delete and regenerate the custom-load file.
- (when (file-exists-p custom-load)
- (delete-file custom-load))
- (when (file-exists-p (concat custom-load "c"))
- (delete-file (concat custom-load "c")))
- (Custom-make-dependencies lisp-dir)
- (when (file-exists-p custom-load)
- (require 'cus-load)
- (byte-compile-file custom-load))
- ; Delete and regenerate the package metadata file.
- ; There is no compiled form of this file.
- (message "Updating metadata for the directory %s..." lisp-dir)
- (with-temp-file metadata
- (insert
- (concat ";;;###autoload\n"
- "(package-provide '" package-name "\n"
- " :version "
- release-version "\n"
- " :author-version "
- "\"" author-version "\"\n"
- " :type 'regular)\n")))
- ; Delete and regenerate the auto-autoloads file.
- (message "Updating autoloads for the directory %s..." lisp-dir)
- (when (file-exists-p generated-autoload-file)
- (delete-file generated-autoload-file))
- (when (file-exists-p (concat generated-autoload-file "c"))
- (delete-file (concat generated-autoload-file "c")))
- (defun message (fmt &rest args)
- "Ignore useless messages while generating autoloads."
- (cond ((and (string-equal "Generating autoloads for %s..." fmt)
- (file-exists-p (file-name-nondirectory (car args))))
- (funcall si:message
- fmt (file-name-nondirectory (car args))))
- ((string-equal "No autoloads found in %s" fmt))
- ((string-equal "Generating autoloads for %s...done" fmt))
- (t (apply si:message fmt args))))
- (unwind-protect
- (cond ((fboundp 'update-autoloads-from-directory)
- (update-autoloads-from-directory lisp-dir))
- ((fboundp 'update-autoload-files)
- (update-autoload-files (list lisp-dir) "auctex"))
- (t (error "Failed to generate autoloads.")))
- (fset 'message si:message))
- (while (setq append-file (pop command-line-args-left))
- (when (file-exists-p generated-autoload-file)
- (with-temp-buffer (insert-file-contents append-file)
- (append-to-file (point-min) (point-max)
- generated-autoload-file))))
- (byte-compile-file generated-autoload-file)))
-
-
-;;; prv-install.el ends here
- [elpa] externals/auctex 9d8369a 39/67: ; Silence the compiler in styles for `font-latex-update-font-lock', (continued)
- [elpa] externals/auctex 9d8369a 39/67: ; Silence the compiler in styles for `font-latex-update-font-lock', Tassilo Horn, 2019/02/08
- [elpa] externals/auctex 5827aeb 34/67: Remove TeX-mark-active, Tassilo Horn, 2019/02/08
- [elpa] externals/auctex c893152 50/67: Redefine support for \url in hyperref, Tassilo Horn, 2019/02/08
- [elpa] externals/auctex 3ce90db 36/67: Remove compatibility code for older emacsen, Tassilo Horn, 2019/02/08
- [elpa] externals/auctex 4cfd116 65/67: Add support for w and W column specifiers, Tassilo Horn, 2019/02/08
- [elpa] externals/auctex 49720ce 62/67: Remove compatibility code for older emacsen, Tassilo Horn, 2019/02/08
- [elpa] externals/auctex 3aef308 58/67: Skip macros and environments from pythontex, Tassilo Horn, 2019/02/08
- [elpa] externals/auctex 088e10c 45/67: ; Silence the compiler in styles for various functions and variables, Tassilo Horn, 2019/02/08
- [elpa] externals/auctex 40ba5b6 37/67: Improve handling of `TeX-insert-macro-default-style' in styles, Tassilo Horn, 2019/02/08
- [elpa] externals/auctex 906ac31 55/67: Add new style/pythontex.el, Tassilo Horn, 2019/02/08
- [elpa] externals/auctex 88b381c 54/67: Drop xemacs support and mule check from configure and Makefile,
Tassilo Horn <=
- [elpa] externals/auctex 45ad237 35/67: Remove TeX-maybe-remove-help, TeX-menu-with-help, Tassilo Horn, 2019/02/08
- [elpa] externals/auctex dcfdd69 61/67: Fix test conditions on w32, Tassilo Horn, 2019/02/08
- [elpa] externals/auctex 34eab00 66/67: Improve indenting and filling in "Form" environments, Tassilo Horn, 2019/02/08
- [elpa] externals/auctex 38f9d72 63/67: Remove compatibility code for older emacsen, Tassilo Horn, 2019/02/08
- [elpa] externals/auctex 235f93c 46/67: ; Silence the compiler in styles for pstricks, Tassilo Horn, 2019/02/08
- [elpa] externals/auctex 3d0c445 38/67: ; Silence the compiler in styles for `font-latex-add-keywords'., Tassilo Horn, 2019/02/08
- [elpa] externals/auctex f34ce5a 67/67: Merge remote-tracking branch 'origin/master' into externals/auctex, Tassilo Horn, 2019/02/08