Commit 501390c5 authored by Paul Eggert's avatar Paul Eggert

Remove --disable-maintainer-mode option from 'configure'. (Bug#11555)

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.
* admin/make-tarball.txt: Don't worry about maintainer mode.
* etc/NEWS: Mention this.
parent bd56924f
2012-06-01 Paul Eggert <eggert@cs.ucla.edu>
Remove --disable-maintainer-mode option from 'configure'. (Bug#11555)
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-28 Paul Eggert <eggert@cs.ucla.edu> 2012-05-28 Paul Eggert <eggert@cs.ucla.edu>
Make 'configure' a bit smaller and faster. Make 'configure' a bit smaller and faster.
......
...@@ -30,7 +30,7 @@ options you can set): ...@@ -30,7 +30,7 @@ options you can set):
If you want later builds to go faster, at the expense of sometimes 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 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 Some of the files that are included in the Emacs tarball, such as
byte-compiled Lisp files, are not stored in Bazaar. Therefore, to byte-compiled Lisp files, are not stored in Bazaar. Therefore, to
......
...@@ -66,10 +66,8 @@ CDPATH= ...@@ -66,10 +66,8 @@ CDPATH=
# ==================== Things `configure' Might Edit ==================== # ==================== Things `configure' Might Edit ====================
MAINTAINER_MODE_FLAG = --disable-maintainer-mode
@MAINT@MAINTAINER_MODE_FLAG = --enable-maintainer-mode
cache_file = @cache_file@ cache_file = @cache_file@
CONFIGURE_FLAGS = --cache-file=$(cache_file) $(MAINTAINER_MODE_FLAG) CONFIGURE_FLAGS = --cache-file=$(cache_file)
CC=@CC@ CC=@CC@
CFLAGS=@CFLAGS@ CFLAGS=@CFLAGS@
...@@ -360,16 +358,17 @@ config.status: ${srcdir}/configure ${srcdir}/lisp/version.el ...@@ -360,16 +358,17 @@ config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
./configure $(CONFIGURE_FLAGS); \ ./configure $(CONFIGURE_FLAGS); \
fi fi
AUTOCONF_INPUTS = @MAINT@ $(srcdir)/configure.in $(srcdir)/aclocal.m4 AUTOCONF_INPUTS = $(srcdir)/configure.in $(srcdir)/aclocal.m4
$(srcdir)/configure: $(AUTOCONF_INPUTS) $(srcdir)/configure: $(AUTOCONF_INPUTS)
cd ${srcdir} && autoconf cd ${srcdir} && autoconf
ACLOCAL_INPUTS = @MAINT@ $(srcdir)/m4/gnulib-comp.m4 ACLOCAL_INPUTS = $(srcdir)/m4/gnulib-comp.m4
$(srcdir)/aclocal.m4: $(ACLOCAL_INPUTS) $(srcdir)/aclocal.m4: $(ACLOCAL_INPUTS)
cd $(srcdir) && aclocal -I m4 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) $(srcdir)/lib/Makefile.in: $(AUTOMAKE_INPUTS)
cd $(srcdir) && automake --gnu -a -c lib/Makefile cd $(srcdir) && automake --gnu -a -c lib/Makefile
am--refresh: $(srcdir)/aclocal.m4 $(srcdir)/configure $(srcdir)/src/config.in am--refresh: $(srcdir)/aclocal.m4 $(srcdir)/configure $(srcdir)/src/config.in
......
2012-06-01 Paul Eggert <eggert@cs.ucla.edu>
Remove --disable-maintainer-mode option from 'configure'. (Bug#11555)
* make-tarball.txt: Don't worry about maintainer mode.
2012-05-28 Paul Eggert <eggert@cs.ucla.edu> 2012-05-28 Paul Eggert <eggert@cs.ucla.edu>
* CPP-DEFINES: Remove HAVE_SYSINFO. * CPP-DEFINES: Remove HAVE_SYSINFO.
......
...@@ -28,13 +28,7 @@ For each step, check for possible errors. ...@@ -28,13 +28,7 @@ For each step, check for possible errors.
refer to a newer release of Emacs. (This is probably needed only refer to a newer release of Emacs. (This is probably needed only
when preparing a major Emacs release, or branching for it.) when preparing a major Emacs release, or branching for it.)
5. Edit configure.in so that maintainer-mode is off by default. 5. autoreconf -i -I m4 --force
(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
make bootstrap make bootstrap
6. Commit etc/AUTHORS, all the files changed by M-x set-version, and 6. Commit etc/AUTHORS, all the files changed by M-x set-version, and
......
...@@ -235,19 +235,6 @@ AC_ARG_ENABLE(asserts, ...@@ -235,19 +235,6 @@ AC_ARG_ENABLE(asserts,
USE_XASSERTS=$enableval, USE_XASSERTS=$enableval,
USE_XASSERTS=no) 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, AC_ARG_ENABLE(locallisppath,
[AS_HELP_STRING([--enable-locallisppath=PATH], [AS_HELP_STRING([--enable-locallisppath=PATH],
[directories Emacs should search for lisp files specific [directories Emacs should search for lisp files specific
......
2012-06-01 Paul Eggert <eggert@cs.ucla.edu>
Remove --disable-maintainer-mode option from 'configure'. (Bug#11555)
* NEWS: Mention this.
2012-06-01 Andrew Beals <andrew.beals@gmail.com> (tiny change) 2012-06-01 Andrew Beals <andrew.beals@gmail.com> (tiny change)
* spook.lines: Additions. (Bug#11598) * spook.lines: Additions. (Bug#11598)
......
...@@ -29,6 +29,9 @@ possibly-questionable C code. On a recent GNU system there should be ...@@ -29,6 +29,9 @@ possibly-questionable C code. On a recent GNU system there should be
no warnings; on older and on non-GNU systems the generated warnings no warnings; on older and on non-GNU systems the generated warnings
may be useful. 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. ** Emacs uses libtinfo in preference to libncurses, if available.
......
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