From debbugs-submit-bounces@debbugs.gnu.org Fri May 25 03:53:28 2012 Received: (at submit) by debbugs.gnu.org; 25 May 2012 07:53:28 +0000 Received: from localhost ([127.0.0.1]:42902 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SXpKx-0005uL-O5 for submit@debbugs.gnu.org; Fri, 25 May 2012 03:53:28 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53766) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SXpKc-0005tg-LJ for submit@debbugs.gnu.org; Fri, 25 May 2012 03:53:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SXpJR-0007K7-2q for submit@debbugs.gnu.org; Fri, 25 May 2012 03:51:59 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.2 Received: from lists.gnu.org ([208.118.235.17]:49782) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXpJQ-0007K1-W0 for submit@debbugs.gnu.org; Fri, 25 May 2012 03:51:53 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXpJO-0001Cr-U3 for bug-gnu-emacs@gnu.org; Fri, 25 May 2012 03:51:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SXpJK-0007JW-Jf for bug-gnu-emacs@gnu.org; Fri, 25 May 2012 03:51:50 -0400 Received: from smtp.cs.ucla.edu ([131.179.128.62]:39433) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXpJK-0007JP-BH for bug-gnu-emacs@gnu.org; Fri, 25 May 2012 03:51:46 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id E465239E800D for ; Fri, 25 May 2012 00:51:44 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7VOXG+vPAtEW for ; Fri, 25 May 2012 00:51:43 -0700 (PDT) Received: from [192.168.1.10] (pool-71-189-109-235.lsanca.fios.verizon.net [71.189.109.235]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 4095D39E8006 for ; Fri, 25 May 2012 00:51:43 -0700 (PDT) Message-ID: <4FBF3A11.9090504@cs.ucla.edu> Date: Fri, 25 May 2012 00:51:45 -0700 From: Paul Eggert Organization: UCLA Computer Science Department User-Agent: Mozilla/5.0 (X11; Linux i686; rv:12.0) Gecko/20120430 Thunderbird/12.0.1 MIME-Version: 1.0 To: bug-gnu-emacs@gnu.org Subject: Remove the --disable-maintainer-mode option from 'configure' Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 208.118.235.17 X-Spam-Score: -6.2 (------) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.2 (------) 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 + + Remove the --disable-maintainer-mode option from 'configure'. + It is confusingly named and rarely useful. See, for example, + . + * 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 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 + + Remove the --disable-maintainer-mode option from 'configure'. + * make-tarball.txt: Don't worry about maintainer mode. + 2012-05-22 Paul Eggert 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 + + Remove the --disable-maintainer-mode option from 'configure'. + * NEWS: Mention this. + 2012-05-07 Glenn Morris * 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. From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 01 14:29:45 2012 Received: (at 11555-done) by debbugs.gnu.org; 1 Jun 2012 18:29:45 +0000 Received: from localhost ([127.0.0.1]:53457 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SaWbY-0001tS-Jf for submit@debbugs.gnu.org; Fri, 01 Jun 2012 14:29:44 -0400 Received: from smtp.cs.ucla.edu ([131.179.128.62]:38256) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SaWbD-0001sv-Gh for 11555-done@debbugs.gnu.org; Fri, 01 Jun 2012 14:29:42 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 7B120A60013 for <11555-done@debbugs.gnu.org>; Fri, 1 Jun 2012 11:27:36 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Xz+am3T4LhWa for <11555-done@debbugs.gnu.org>; Fri, 1 Jun 2012 11:27:36 -0700 (PDT) Received: from penguin.cs.ucla.edu (Penguin.CS.UCLA.EDU [131.179.64.200]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 3A1E8A6000E for <11555-done@debbugs.gnu.org>; Fri, 1 Jun 2012 11:27:36 -0700 (PDT) Message-ID: <4FC90998.4020508@cs.ucla.edu> Date: Fri, 01 Jun 2012 11:27:36 -0700 From: Paul Eggert Organization: UCLA Computer Science Department User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:12.0) Gecko/20120430 Thunderbird/12.0.1 MIME-Version: 1.0 To: 11555-done@debbugs.gnu.org Subject: Re: Remove the --disable-maintainer-mode option from 'configure' References: <4FBF3A11.9090504@cs.ucla.edu> In-Reply-To: <4FBF3A11.9090504@cs.ucla.edu> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 11555-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -1.9 (-) I installed this as bzr 108446 on the trunk and am marking the bug as done. From unknown Mon Sep 08 03:01:34 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 30 Jun 2012 11:24:03 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator