Commit 335142f9 authored by Glenn Morris's avatar Glenn Morris
Browse files

Rename configure's --without-compress-info to --without-compress-install

* configure.ac (--without-compress-install):
Rename from --without-compress-info. 

(GZIP_INFO): Remove.
(GZIP_PROG): Allow --without-compress-install to disable it.
* Makefile.in (GZIP_INFO): Remove all references.

* etc/NEWS: Mention this.

Fixes: debbugs:9789
parent 7dc61a66
2013-09-08 Glenn Morris <rgm@gnu.org> 2013-09-08 Glenn Morris <rgm@gnu.org>
* configure.ac (--without-compress-install):
Rename from --without-compress-info. (Bug#9789)
(GZIP_INFO): Remove.
(GZIP_PROG): Allow --without-compress-install to disable it.
* Makefile.in (GZIP_INFO): Remove all references.
* info/dir: Tweak emacs-gnutls entry. * info/dir: Tweak emacs-gnutls entry.
2013-09-07 Paul Eggert <eggert@cs.ucla.edu> 2013-09-07 Paul Eggert <eggert@cs.ucla.edu>
......
...@@ -259,8 +259,6 @@ LN_S_FILEONLY = @LN_S_FILEONLY@ ...@@ -259,8 +259,6 @@ LN_S_FILEONLY = @LN_S_FILEONLY@
# We use gzip to compress installed .el files. # We use gzip to compress installed .el files.
GZIP_PROG = @GZIP_PROG@ GZIP_PROG = @GZIP_PROG@
# If non-nil, gzip the installed Info and man pages.
GZIP_INFO = @GZIP_INFO@
# ============================= Targets ============================== # ============================= Targets ==============================
...@@ -662,7 +660,7 @@ install-info: info ...@@ -662,7 +660,7 @@ install-info: info
for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \ for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
(cd $${thisdir}; \ (cd $${thisdir}; \
${INSTALL_DATA} ${srcdir}/info/$$f $(DESTDIR)${infodir}/$$f); \ ${INSTALL_DATA} ${srcdir}/info/$$f $(DESTDIR)${infodir}/$$f); \
( [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ] ) || continue ; \ [ -n "${GZIP_PROG}" ] || continue ; \
rm -f $(DESTDIR)${infodir}/$$f.gz; \ rm -f $(DESTDIR)${infodir}/$$f.gz; \
${GZIP_PROG} -9n $(DESTDIR)${infodir}/$$f; \ ${GZIP_PROG} -9n $(DESTDIR)${infodir}/$$f; \
done; \ done; \
...@@ -684,7 +682,7 @@ install-man: ...@@ -684,7 +682,7 @@ install-man:
dest=`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1; \ dest=`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1; \
(cd $${thisdir}; \ (cd $${thisdir}; \
${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${dest}); \ ${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${dest}); \
( [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ] ) || continue ; \ [ -n "${GZIP_PROG}" ] || continue ; \
rm -f $(DESTDIR)${man1dir}/$${dest}.gz; \ rm -f $(DESTDIR)${man1dir}/$${dest}.gz; \
${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${dest} || true; \ ${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${dest} || true; \
done done
...@@ -754,12 +752,12 @@ uninstall: uninstall-$(NTDIR) uninstall-doc ...@@ -754,12 +752,12 @@ uninstall: uninstall-$(NTDIR) uninstall-doc
for elt in ${INFO_NONMISC} $${info_misc}; do \ for elt in ${INFO_NONMISC} $${info_misc}; do \
(cd $${thisdir}; \ (cd $${thisdir}; \
$(INSTALL_INFO) --remove --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \ $(INSTALL_INFO) --remove --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \ if [ -n "${GZIP_PROG}" ]; then \
ext=.gz; else ext=; fi; \ ext=.gz; else ext=; fi; \
rm -f $$elt$$ext $$elt-[1-9]$$ext $$elt-[1-9][0-9]$$ext; \ rm -f $$elt$$ext $$elt-[1-9]$$ext $$elt-[1-9][0-9]$$ext; \
done; \ done; \
fi) fi)
(if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \ (if [ -n "${GZIP_PROG}" ]; then \
ext=.gz; else ext=; fi; \ ext=.gz; else ext=; fi; \
if cd ${mansrcdir}; then \ if cd ${mansrcdir}; then \
for page in *.1; do \ for page in *.1; do \
......
...@@ -266,13 +266,9 @@ AC_SUBST(cache_file) ...@@ -266,13 +266,9 @@ AC_SUBST(cache_file)
## This is an option because I do not know if all info/man support ## This is an option because I do not know if all info/man support
## compressed files, nor how to test if they do so. ## compressed files, nor how to test if they do so.
OPTION_DEFAULT_ON([compress-info],[don't compress the installed Info pages]) OPTION_DEFAULT_ON([compress-install],
if test $with_compress_info = yes; then [don't compress some files (.el, .info, etc.) when installing. Equivalent to:
GZIP_INFO=yes make GZIP_PROG= install])
else
GZIP_INFO=
fi
AC_SUBST(GZIP_INFO)
AC_ARG_WITH([pkg-config-prog],dnl AC_ARG_WITH([pkg-config-prog],dnl
[AS_HELP_STRING([--with-pkg-config-prog=FILENAME], [AS_HELP_STRING([--with-pkg-config-prog=FILENAME],
...@@ -950,6 +946,9 @@ AC_PATH_PROG(INSTALL_INFO, install-info, :, ...@@ -950,6 +946,9 @@ AC_PATH_PROG(INSTALL_INFO, install-info, :,
dnl Don't use GZIP, which is used by gzip for additional parameters. dnl Don't use GZIP, which is used by gzip for additional parameters.
AC_PATH_PROG(GZIP_PROG, gzip) AC_PATH_PROG(GZIP_PROG, gzip)
test $with_compress_install != yes && \
GZIP_PROG=" # $GZIP_PROG # (disabled by configure --without-compress-install)"
if test $opsys = gnu-linux; then if test $opsys = gnu-linux; then
AC_PATH_PROG(PAXCTL, paxctl,, AC_PATH_PROG(PAXCTL, paxctl,,
[$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/sbin]) [$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/sbin])
......
...@@ -34,6 +34,10 @@ build time. To prevent this, use the configure option ...@@ -34,6 +34,10 @@ build time. To prevent this, use the configure option
`--with-file-notification-no'. See below for file-notify features. `--with-file-notification-no'. See below for file-notify features.
FIXME? This feature is not available for the Nextstep port. (?) FIXME? This feature is not available for the Nextstep port. (?)
** The configure option `without-compress-info' has been generalized,
and renamed to `without-compress-install'. It now prevents compression
of _any_ files during installation.
** The configure option --with-crt-dir has been removed. ** The configure option --with-crt-dir has been removed.
It is no longer needed, as the crt*.o files are no longer linked It is no longer needed, as the crt*.o files are no longer linked
specially. specially.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment