Subject: Remove the --disable-maintainer-mode option from 'configure'

From: Paul Eggert <[email-masked]>
Date: Fri, 25 May 2012 00:51:45 -0700

Tags: patch

This follows up on our two conversations last year on this topic.

=== modified file 'ChangeLog'
--- ChangeLog	2012-05-22 16:20:27 +0000
+++ ChangeLog	2012-05-25 07:14:25 +0000
@@ -1,3 +1,13 @@
+2012-05-25  Paul Eggert  <[email-masked]>
+
+	Remove the --disable-maintainer-mode option from 'configure'.
+	It is confusingly named and rarely useful.  See, for example,
+	<http://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00089.html>.
+	* INSTALL.BZR: Don't mention --disable-maintainer-mode.
+	* Makefile.in (MAINTAINER_MODE_FLAG): Remove; all uses removed.
+	* configure.in: Remove --disable-maintainer-mode.
+	(USE_MAINTAINER_MODE, MAINT): Remove.
+
 2012-05-22  Paul Eggert  <[email-masked]>
 
 	Remove src/m/*.

=== modified file 'INSTALL.BZR'
--- INSTALL.BZR	2012-01-19 07:21:25 +0000
+++ INSTALL.BZR	2012-05-25 07:14:25 +0000
@@ -30,7 +30,7 @@
 
 If you want later builds to go faster, at the expense of sometimes
 doing the wrong thing if you update the build procedure, you can
-invoke "./configure -C --disable-maintainer-mode" instead.
+invoke "./configure -C" instead.
 
 Some of the files that are included in the Emacs tarball, such as
 byte-compiled Lisp files, are not stored in Bazaar.  Therefore, to

=== modified file 'Makefile.in'
--- Makefile.in	2012-05-22 01:19:43 +0000
+++ Makefile.in	2012-05-25 07:14:25 +0000
@@ -66,10 +66,8 @@
 
 # ==================== Things `configure' Might Edit ====================
 
-MAINTAINER_MODE_FLAG = --disable-maintainer-mode
-@MAINT@MAINTAINER_MODE_FLAG = --enable-maintainer-mode
 cache_file = @cache_file@
-CONFIGURE_FLAGS = --cache-file=$(cache_file) $(MAINTAINER_MODE_FLAG)
+CONFIGURE_FLAGS = --cache-file=$(cache_file)
 
 CC=@CC@
 CFLAGS=@CFLAGS@
@@ -360,16 +358,17 @@
 	    ./configure $(CONFIGURE_FLAGS); \
 	fi
 
-AUTOCONF_INPUTS = @MAINT@ $(srcdir)/configure.in $(srcdir)/aclocal.m4
+AUTOCONF_INPUTS = $(srcdir)/configure.in $(srcdir)/aclocal.m4
 
 $(srcdir)/configure: $(AUTOCONF_INPUTS)
 	cd ${srcdir} && autoconf
 
-ACLOCAL_INPUTS = @MAINT@ $(srcdir)/m4/gnulib-comp.m4
+ACLOCAL_INPUTS = $(srcdir)/m4/gnulib-comp.m4
 $(srcdir)/aclocal.m4: $(ACLOCAL_INPUTS)
 	cd $(srcdir) && aclocal -I m4
 
-AUTOMAKE_INPUTS = @MAINT@ $(srcdir)/aclocal.m4 $(srcdir)/lib/Makefile.am $(srcdir)/lib/gnulib.mk
+AUTOMAKE_INPUTS = $(srcdir)/aclocal.m4 $(srcdir)/lib/Makefile.am \
+  $(srcdir)/lib/gnulib.mk
 $(srcdir)/lib/Makefile.in: $(AUTOMAKE_INPUTS)
 	cd $(srcdir) && automake --gnu -a -c lib/Makefile
 am--refresh: $(srcdir)/aclocal.m4 $(srcdir)/configure $(srcdir)/src/config.in

=== modified file 'admin/ChangeLog'
--- admin/ChangeLog	2012-05-22 16:20:27 +0000
+++ admin/ChangeLog	2012-05-25 07:14:25 +0000
@@ -1,3 +1,8 @@
+2012-05-25  Paul Eggert  <[email-masked]>
+
+	Remove the --disable-maintainer-mode option from 'configure'.
+	* make-tarball.txt: Don't worry about maintainer mode.
+
 2012-05-22  Paul Eggert  <[email-masked]>
 
 	Remove src/m/*.

=== modified file 'admin/make-tarball.txt'
--- admin/make-tarball.txt	2012-02-04 22:12:14 +0000
+++ admin/make-tarball.txt	2012-05-25 07:14:25 +0000
@@ -28,13 +28,7 @@
     refer to a newer release of Emacs.  (This is probably needed only
     when preparing a major Emacs release, or branching for it.)
 
-5.  Edit configure.in so that maintainer-mode is off by default.
-    (FIXME - need to find a better way of dealing with this.
-     Or maybe it's fine and indeed correct to leave it on?
-     See http://lists.gnu.org/archive/html/emacs-devel/2011-03/msg00859.html
-     and subsequent.)
-
-     autoreconf -i -I m4 --force
+5.   autoreconf -i -I m4 --force
      make bootstrap
 
 6.  Commit etc/AUTHORS, all the files changed by M-x set-version, and

=== modified file 'configure.in'
--- configure.in	2012-05-22 16:20:27 +0000
+++ configure.in	2012-05-25 07:14:25 +0000
@@ -235,19 +235,6 @@
       USE_XASSERTS=$enableval,
       USE_XASSERTS=no)
 
-AC_ARG_ENABLE(maintainer-mode,
-[AS_HELP_STRING([--disable-maintainer-mode],
-                [disable make rules and dependencies not useful (and sometimes
-		 confusing) to the casual installer])],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=yes)
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINT=
-else
-  MAINT=#
-fi
-AC_SUBST(MAINT)
-
 AC_ARG_ENABLE(locallisppath,
 [AS_HELP_STRING([--enable-locallisppath=PATH],
                 [directories Emacs should search for lisp files specific

=== modified file 'etc/ChangeLog'
--- etc/ChangeLog	2012-05-07 22:53:17 +0000
+++ etc/ChangeLog	2012-05-25 07:14:25 +0000
@@ -1,3 +1,8 @@
+2012-05-25  Paul Eggert  <[email-masked]>
+
+	Remove the --disable-maintainer-mode option from 'configure'.
+	* NEWS: Mention this.
+
 2012-05-07  Glenn Morris  <[email-masked]>
 
 	* forms/forms-d2.el, forms/forms-pass.el: Move here from ../lisp.

=== modified file 'etc/NEWS'
--- etc/NEWS	2012-05-25 00:55:40 +0000
+++ etc/NEWS	2012-05-25 07:14:25 +0000
@@ -29,6 +29,9 @@
 no warnings; on older and on non-GNU systems the generated warnings
 may be useful.
 
+** The configure option '--disable-maintainer-mode' has been removed,
+as it was confusingly-named and rarely useful.
+
 ---
 ** Emacs uses libtinfo in preference to libncurses, if available.