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

4 files changed, 20 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 0111f18ce70..03a04c6367c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 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.
 
 2013-09-07  Paul Eggert  <eggert@cs.ucla.edu>
diff --git a/Makefile.in b/Makefile.in
index 204099cc202..c6254fd6098 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -259,8 +259,6 @@ LN_S_FILEONLY = @LN_S_FILEONLY@
 
 # We use gzip to compress installed .el files.
 GZIP_PROG = @GZIP_PROG@
-# If non-nil, gzip the installed Info and man pages.
-GZIP_INFO = @GZIP_INFO@
 
 # ============================= Targets ==============================
 
@@ -662,7 +660,7 @@ install-info: info
               for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
                (cd $${thisdir}; \
                 ${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; \
                 ${GZIP_PROG} -9n $(DESTDIR)${infodir}/$$f; \
               done; \
@@ -684,7 +682,7 @@ install-man:
           dest=`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1; \
           (cd $${thisdir}; \
            ${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${dest}); \
-          ( [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ] ) || continue ; \
+          [ -n "${GZIP_PROG}" ] || continue ; \
           rm -f $(DESTDIR)${man1dir}/$${dest}.gz; \
           ${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${dest} || true; \
         done
@@ -754,12 +752,12 @@ uninstall: uninstall-$(NTDIR) uninstall-doc
            for elt in ${INFO_NONMISC} $${info_misc}; do \
              (cd $${thisdir}; \
               $(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; \
              rm -f $$elt$$ext $$elt-[1-9]$$ext $$elt-[1-9][0-9]$$ext; \
            done; \
          fi)
-        (if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \
+        (if [ -n "${GZIP_PROG}" ]; then \
             ext=.gz; else ext=; fi; \
          if cd ${mansrcdir}; then \
            for page in *.1; do \
diff --git a/configure.ac b/configure.ac
index c7cdc01e3e7..ba5e9d2fb08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -266,13 +266,9 @@ AC_SUBST(cache_file)
 
 ## This is an option because I do not know if all info/man support
 ## compressed files, nor how to test if they do so.
-OPTION_DEFAULT_ON([compress-info],[don't compress the installed Info pages])
-if test $with_compress_info = yes; then
-   GZIP_INFO=yes
-else
-   GZIP_INFO=
-fi
-AC_SUBST(GZIP_INFO)
+OPTION_DEFAULT_ON([compress-install],
+  [don't compress some files (.el, .info, etc.) when installing.  Equivalent to:
+make GZIP_PROG= install])
 
 AC_ARG_WITH([pkg-config-prog],dnl
 [AS_HELP_STRING([--with-pkg-config-prog=FILENAME],
@@ -950,6 +946,9 @@ AC_PATH_PROG(INSTALL_INFO, install-info, :,
 dnl Don't use GZIP, which is used by gzip for additional parameters.
 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
   AC_PATH_PROG(PAXCTL, paxctl,,
     [$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/sbin])
diff --git a/etc/NEWS b/etc/NEWS
index cd69a8e09a0..7da67efeadd 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -34,6 +34,10 @@ build time.  To prevent this, use the configure option
 `--with-file-notification-no'.  See below for file-notify features.
 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.
 It is no longer needed, as the crt*.o files are no longer linked
 specially.