1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-07 20:30:32 -08:00
Commit graph

1551 commits

Author SHA1 Message Date
Paul Eggert
501390c597 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.
2012-06-01 11:26:21 -07:00
Paul Eggert
0e7a053e6d Make 'configure' a bit smaller and faster.
* configure.in (INSTALL_INFO): Set it with one call to
AC_PATH_PROG, not three.
(PKG_CONFIG): Hoist this out of PKG_CHECK_MODULES, since it's
so likely that it'll be needed.
(AC_CHECK_HEADERS_ONCE): Prefer to AC_CHECK_HEADERS where either works.
(AC_PROG_MAKE_SET): Remove; Automake does this.
(sysinfo): Do not check for this function, as it's never used.
(tzset): Check for this function just once.
* admin/CPP-DEFINES: Remove HAVE_SYSINFO.
* m4/manywarnings.m4: Sync from gnulib, incorporating the following:
2012-05-27 manywarnings: remove duplicate -Wmultichar entry
2012-05-27 17:46:33 -07:00
Eli Zaretskii
42a53d84f6 Fix the MSDOS build following gnulib update.
config.bat (lib): Create/update lib/stdalign.in-h and
 lib/sys_types.in-h.
 msods/sedlibmk.inp (GNULIB_GL_UNISTD_H_GETOPT, GNULIB_POSIX_OPENPT)
 (GNULIB_ISATTY, GNULIB_PTSNAME_R, GNULIB_RANDOM)
 (GNULIB_SETHOSTNAME, HAVE_POSIX_OPENPT, HAVE_PTSNAME_R)
 (HAVE_RANDOM, HAVE_SETHOSTNAME, NEXT_SYS_TYPES_H)
 (NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H, REPLACE_FTRUNCATE)
 (REPLACE_ISATTY, REPLACE_PTSNAME_R, REPLACE_RANDOM_R)
 (REPLACE_STRTOIMAX, STDALIGN_H, WINDOWS_64_BIT_OFF_T)
 (WINDOWS_64_BIT_ST_SIZE, GL_GENERATE_STDALIGN_H_TRUE)
 (GL_GENERATE_STDALIGN_H_FALSE): Edit as appropriate for DJGPP.
 (cat FOO): Edit into "sed -e '' FOO >>".
2012-05-27 16:42:13 +03:00
Eli Zaretskii
cd37650917 Fix the MS-Windows build broken by 1995-02-25T20:57:45Z!rms@gnu.org.
lib/makefile.w32-in ($(BLD)/md5.$(O)): 
 ($(BLD)/sha1.$(O)): 
 ($(BLD)/sha256.$(O)): 
 ($(BLD)/sha512.$(O)): Depend on $(EMACS_ROOT)/nt/inc/stdalign.h.
 Suggested by Christoph Scholtes <cschol2112@googlemail.com>.
 lib/getopt_.h: Regenerate.
 nt/inc/stdalign.h: New file.

Fixes: debbugs:11527
2012-05-27 15:11:23 +03:00
Paul Eggert
50c4645e2c Assume gnulib does largefile.
Gnulib does the largefile configuration anyway, so when configure.in
invokes AC_SYS_LARGEFILE, that bloats 'configure' unnecessarily.
* admin/merge-gnulib (GNULIB_MODULES): Add largefile.
* configure.in (AC_SYS_LARGEFILE): Remove.
* lib/gnulib.mk: Autoupdate.
2012-05-27 02:12:09 -07:00
Paul Eggert
caf8a9b2b3 Merge from gnulib.
Fixes: debbugs:11527
2012-05-26 16:14:36 -07:00
Paul Eggert
3437465030 Remove src/m/*.
* configure.in: Remove all mention of src/m/*.
(machine, machfile, M_FILE, config_machfile, and_machfile): Remove.
All uses removed.
(BITS_PER_CHAR, BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG)
(BITS_PER_LONG_LONG): Move to src/lisp.h.
* lib/makefile.w32-in: Remove dependencies on
$(EMACS_ROOT)/src/m/intel386.h.
* make-dist: Don't make links to src/m.
* admin/CPP-DEFINES: Do not mention src/m/*.h.
(BITS_PER_EMACS_INT, BITS_PER_LONG, BITS_PER_CHAR)
(BITS_PER_SHORT, BITS_PER_INT): Remove.
* admin/MAINTAINERS: Remove src/m/.
* lib-src/makefile.w32-in: Remove dependencies on
$(EMACS_ROOT)/src/m/intel386.h.
* msdos/mainmake.v2 (TAGS tags): Don't look at $(CURDIR)/src/m/intel386.h.
* nt/config.nt: Do not include "m/intel386.h"; file was removed.
(BITS_PER_CHAR, BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Move to src/lisp.h.
(EMACS_INT_MAX): New macro.
This directory predates autoconf and is no longer needed nowadays.
Move its few remaining bits of functionality to where they're needed.
* src/m/README, src/m/alpha.h, src/m/amdx86-64.h, src/m/ia64.h, src/m/ibmrs6000.h:
* src/m/ibms390x.h, src/m/intel386.h, src/m/m68k.h, src/m/macppc.h:
* src/m/sparc.h, src/m/template.h: Remove.
* src/Makefile.in (M_FILE): Remove.  All uses removed.
* src/alloc.c (POINTERS_MIGHT_HIDE_IN_OBJECTS):
* src/lisp.h (USE_LSB_TAG):
* src/mem-limits.h (EXCEEDS_LISP_PTR):
Use VAL_MAX, not VALBITS, in #if.
* src/lisp.h (EMACS_INT_MAX): New macro, useful in #if.
(EMACS_UINT): Define unconditionally now.
(BITS_PER_CHAR, BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG)
(BITS_PER_EMACS_INT): New constants, replacing
what used to be in config.h, but not useful in #if.
(GCTYPEBITS, VALBITS): Define unconditionally, since m/* files don't
define them any more.
(VAL_MAX): New macro.
(VALMASK): Use it.
* src/puresize.h (PURESIZE_RATIO): Use EMACS_INT_MAX, not
BITS_PER_EMACS_INT, in #if.
* src/s/aix4-2.h (BROKEN_FIONREAD, BROKEN_SIGAIO, BROKEN_SIGPTY)
(BROKEN_SIGPOLL): Move here from m/ibmrs6000.h, which was removed.
* src/s/gnu-linux.h (ULIMIT_BREAK_VALUE) [__i386__]:
* src/s/ms-w32.h (DATA_START):
Move here from removed file m/intel386.h.
* src/s/gnu.h (NLIST_STRUCT): Remove undef; 'configure' does this.
* src/s/irix6-5.h (_LP64): Remove; lisp.h no longer needs this.
2012-05-22 09:20:27 -07:00
Paul Eggert
ec21c7f8ee * Makefile.in (ACLOCAL_INPUTS): Fix up gnulib-comp.m4 name. (Bug#11529)
Without this further fix, aclocal was being invoked unnecessarily.
2012-05-21 18:19:43 -07:00
Glenn Morris
39078e4aed More small tweaks for Makefile.in
* Makefile.in (blessmail, install-arch-dep, uninstall):
Check cd lib-src works.
(install-arch-dep, uninstall): Remove unneeded subshells.
2012-05-21 21:10:05 -04:00
Glenn Morris
ff0c3cfb2f * update-subdirs: Move to build-aux/.
* make-dist:
* Makefile.in (install-arch-indep):
* lisp/Makefile.in (update-subdirs):
* lisp/makefile.w32-in (update-subdirs-SH):
Update for this change.
2012-05-21 16:40:55 -04:00
Glenn Morris
d10cfddd07 Let the top-level Makefile install leim
* Makefile.in (leimdir): New, set by configure.
(COPYDIR, COPYDESTS): Add leim directories.
(install-leim): Remove.
(install-arch-indep): Handle leim installation directly.

* leim/Makefile.in (install): Remove, let top-level do it.
(version, prefix, datarootdir, datadir, ns_appresdir, leimdir):
(MKDIR_P, GZIP_PROG): Remove, no longer used.
2012-05-21 16:13:49 -04:00
Glenn Morris
be17565ba2 Remove vpath.sed; unused for literally decades AFAICS
* vpath.sed: Remove unused file.
* make-dist: No more vpath.sed.
2012-05-21 15:16:27 -04:00
Paul Eggert
fb77d37e48 Use full name for m4/gnulib-comp.m4. (Bug#11529)
Previously the file was named m4/gl-comp.m4 due to DOS 8+3 restrictions,
even though the file's name in gnulib is m4/gnulib-comp.m4.
This had a problem when merging from gnulib, as the code temporarily
renamed it to the full name, causing problems when interrupted.
Now the file has its full name, with the idea that we will find
a solution for MS-DOS that does not affect the rest of Emacs.
* m4/gnulib-comp.m4: Rename from m4/gl-comp.m4.
* admin/merge-gnulib: Leave m4/gnulib-comp.m4's name alone.
2012-05-21 12:04:11 -07:00
Paul Eggert
261cb4bb75 Assume C89 or later.
* configure.in (AC_C_PROTOTYPES, AC_C_VOLATILE, AC_C_CONST)
(POINTER_TYPE, PROTOTYPES): Remove.
* admin/CPP-DEFINES: Remove NULL, const.
* lib-src/etags.c (static, const): Remove macros.
(PTR): Remove; all uses replaced with void *.  Omit needless casts.
* src/alloc.c, src/buffer.c, lisp.h: Replace POINTER_TYPE with void.
* alloc.c (overrun_check_malloc, overrun_check_realloc, xmalloc)
(xrealloc):
* buffer.c (mmap_free_1, mmap_enlarge): Omit needless casts.
* editfns.c, fns.c, gmalloc.c, insdel.c, sysdep.c, termcap.c (NULL):
* textprop.c, tparam.c (NULL): Remove.
* ralloc.c, vm-limit.c (POINTER): Assume void * works.
* regex.c (SIGN_EXTEND_CHAR): Assume signed char works.
* regex.h (_RE_ARGS): Remove.  All uses rewritten to use prototypes.
* unexelf.c (ElfBitsW): Assume c89 preprocessor or better.
* xterm.c (input_signal_count): Assume volatile works.
2012-05-21 08:36:54 -07:00
Glenn Morris
d71dfe7555 Rename LEIM_INSTALLDIR to leimdir, treat consistently with lispdir
* configure.in (LEIM_INSTALLDIR): Rename to leimdir, treat like lispdir.

* leim/Makefile.in (install_prefix): Remove.
(LEIM_INSTALLDIR): Rename to leimdir.
(install): Update for this change.
2012-05-21 00:30:23 -07:00
Paul Eggert
9b4ee6166f Make merging from gnulib a script, not a makefile action.
Putting it in a makefile has some problems with reflection, as
merging from gnulib updates 'configure', which can update the makefile.
Putting it in a standalone script breaks this loop.
* Makefile.in (gnulib_srcdir, $(gnulib_srcdir), DOS_gnulib_comp.m4)
(GNULIB_MODULES, GNULIB_TOOL_FLAGS, sync-from-gnulib):
Remove, moving the actions to the script admin/merge-gnulib.
* admin/merge-gnulib: New script, with actions moved here from
../Makefile.in.
2012-05-20 19:33:13 -07:00
Glenn Morris
b847032c75 Command substitution already runs in a subshell
* Makefile.in (install-arch-indep, install-doc, install-info, uninstall):
* leim/Makefile.in (leim-list.el, install):
* lib-src/Makefile.in (insrcdir, $(DESTDIR)${archlibdir}):
* lisp/Makefile.in (setwins, setwins_almost, setwins_for_subdirs):
* test/automated/Makefile.in (setwins):
Scrap superfluous subshells.
2012-05-20 17:44:34 -07:00
Ulrich Mueller
af006ad50e * Makefile.in (install-etc): Respect DESTDIR.
Fixes: debbugs:11518
2012-05-19 11:57:10 -07:00
Glenn Morris
afdc347740 Undo part of previous change, in case it makes command line too long 2012-05-19 11:47:39 -07:00
Paul Eggert
9232a6d9a7 Remove unused HAVE_* symbols for functions.
* configure.in (AC_CHECK_FUNCS): Remove XSetWMProtocols,
getdomainname, mblen (twice), mbrlen (twice), mbsinit, ualarm,
getsockopt, setsockopt, mremap, mempcpy.
* admin/CPP-DEFINES (HAVE_GETDOMAINNAME): Remove.
* msdos/sed2v2.inp (HAVE_MBLEN): Remove.
* msdos/sed2x.inp (HAVE_XSETWMPROTOCOLS): Remove.
* nt/config.nt (HAVE_GETDOMAINNAME, HAVE_XSETWMPROTOCOLS)
(HAVE_GETSOCKOPT, HAVE_SETSOCKOPT): Remove; not needed.
* src/s/ms-w32.h (HAVE_GETDOMAINNAME): Remove; not needed.
2012-05-19 11:04:49 -07:00
Paul Eggert
003fdae201 Remove no-longer-used macro HAVE_FTIME.
* configure.in (machine): Do not set to 'vax', since src/m/vax.h
is being removed.
(AC_CHECK_FUNCS): Remove ftime.
* admin/CPP-DEFINES (HAVE_FTIME): Remove.
* nt/config.nt (HAVE_FTIME): Remove undef; not needed.
* src/m/vax.h: Remove; no longer needed since HAVE_FTIME is being removed.
* src/s/ms-w32.h (HAVE_FTIME): Remove; not needed.
2012-05-19 01:49:08 -07:00
Glenn Morris
e39b980633 * Makefile.in (install-arch-indep): Remove unneeded subshell.
Combine some rm commands.
2012-05-19 00:20:16 -07:00
Glenn Morris
42d5aa3efc * Makefile.in (install-arch-indep): Remove unneeded chmod.
Set permissions of lisp/subdirs.el.
2012-05-18 23:45:24 -07:00
Glenn Morris
9192d37dc5 * Makefile.in (SUBDIR): Add leim. Update users. 2012-05-18 23:42:26 -07:00
Glenn Morris
2e5d41e4a7 * Makefile.in (lib, lib-src, lisp): Check cd return value. 2012-05-18 23:36:25 -07:00
Glenn Morris
e7333757bf * Makefile.in (leim): No need to set PARALLEL.
This predates the use of changed.misc etc to serialize the leim build.
The leim Makefile used to set .NO_PARALLEL/.NOTPARALLEL for the same
reason, but has not done so for many years.
2012-05-18 23:34:59 -07:00
Glenn Morris
6d1a623ec4 Further small Makefile install simplifications
* Makefile.in (install-arch-indep, install-info, install-man):
Simplify some one-sided ifs.
2012-05-18 19:15:11 -04:00
Glenn Morris
2947339364 * Makefile.in: Install only the relevant DOC file.
This only affects in-tree builds where you have several versions
emacs-24.1.50.1, .2, etc lying around.

* Makefile.in: (install-arch-indep): Delete etc/DOC*.
(install-doc): No more need to delete etc/DOC.
2012-05-18 14:40:19 -04:00
Glenn Morris
660c8c1e9a * Makefile.in (install-arch-indep): Split into several rules.
(install-doc, innstall-info, install-man): New rules.
2012-05-18 13:56:08 -04:00
Glenn Morris
37f36bcb56 * configure.in (mandir): May as well include it in the NS app bundle. 2012-05-18 13:49:24 -04:00
Glenn Morris
0629a797a1 Avoid installation followed by immediate deletion for self-contained ns
* configure.in (INSTALL_ARCH_INDEP_EXTRA): New output variable.
* Makefile.in (INSTALL_ARCH_INDEP_EXTRA): New, set by configure.
(install-arch-indep): Don't install-etc for self-contained ns builds.
2012-05-18 00:41:13 -07:00
Glenn Morris
136c45eee7 Stop adding Fink directories to search path on OS X
* configure.in (GCC_TEST_OPTIONS, NON_GCC_TEST_OPTIONS) <darwin>:
No longer unconditonally add /sw directories. 

* etc/NEWS: Mention this.

Fixes: debbugs:2280
2012-05-18 00:14:45 -07:00
Glenn Morris
ed0ba302d3 Tweak dependencies in top-level install rules
* Makefile.in (install-arch-dep): Depend on install-arch-indep.
(install-arch-indep): Depend on install-leim.
(install): Remove explicit install-leim dependence.
2012-05-18 00:00:09 -07:00
Glenn Morris
62061397bf Remove the mkdir rule from the top-level Makefile
* Makefile.in (install-arch-indep): Move last element of mkdir rule here.
(mkdir): Remove rule.
2012-05-17 23:54:28 -07:00
Glenn Morris
37baa3c829 * Makefile.in (install-arch-indep): Remove unneeded chmods.
INSTALL_DATA does this for us.
2012-05-17 23:48:14 -07:00
Glenn Morris
b533f05ef5 Makefile simplifications related to creating installation directories
A separate mkdir rule is not needed, since MKDIR_P is thread-safe.

* Makefile.in (install-arch-dep): Ensure bindir exists.
Drop mkdir dependency.
(install-arch-indep): Ensure docdir, infodir, mandir exist.
(install-leim): Drop mkdir dependency.
(mkdir): Remove most directories, now made in relevant rules.
2012-05-17 23:46:05 -07:00
Glenn Morris
7606c36016 * Makefile.in (install-arch-indep): Combine adjacent loops. 2012-05-17 23:39:52 -07:00
Glenn Morris
d9a1e2c25f Simplify install-etc rule
* Makefile.in (install-etc, mkdir):
Make relevant directories in install-etc rather than mkdir.
2012-05-17 15:13:02 -04:00
Glenn Morris
4c54abe198 More simplification for installation of site-lisp directories
* Makefile.in (write_subdir): Create the directory if needed.
(install-arch-dep, mkdir): No need to make site-lisp directories.
2012-05-17 14:47:52 -04:00
Glenn Morris
05f3d308da Further simplify install-arch-dep for self-contained NS builds
* Makefile.in (install-arch-dep): Use $write_subdir.
2012-05-17 14:28:24 -04:00
Glenn Morris
9f1ea7dcd9 Reduce some code duplication in Makefile.in
* Makefile.in (write_subdir): New.
(install-arch-indep): Use $write_subdir.
2012-05-17 14:26:51 -04:00
Glenn Morris
40c117e7ad Minor optimization for install of self-contained NS info files
* configure.in (etcdir): For a self-contained ns build,
set it to the appropriate values.
* Makefile.in (install-arch-dep): No need to move info/ any more.
2012-05-16 23:07:26 -07:00
Glenn Morris
b42c720d56 Set more installation directories for self-contained ns builds
* configure.in (docdir, etcdir, lispdir):
For a self-contained ns build, set these to the appropriate values.
2012-05-16 22:55:29 -07:00
Glenn Morris
b4a3620021 Fix previous change, for NS builds that are not self-contained
* configure.in (ns_self_contained): New output variable.
* Makefile.in (ns_self_contained): New, set by configure.
(install-arch-dep): Use $ns_self_contained.
2012-05-16 22:32:37 -07:00
Glenn Morris
96182ae697 Minor optimization for install-arch-dep with self-contained ns build
* Makefile.in (install-arch-dep): For a self-contained ns build,
don't bother installing binaries then immediately deleting them.
2012-05-16 22:14:50 -07:00
Glenn Morris
3a4155de66 Install a self-contained NS build's libexec directly into the right place
This is rather than installing it in one place then moving it.

* configure.in (archlibdir): Set it for self-contained ns builds.
(libexecdir): Don't expand it now (this is mainly cosmetic).

* Makefile.in (ns_appbindir, ns_appresdir):
Move them before things that may refer to them.
(install-arch-dep): No need to relocate self-contained ns libexec.

* lib-src/Makefile.in (ns_appbindir): New, set by configure.
2012-05-16 21:23:03 -04:00
Paul Eggert
f04940ae9d * configure.in: Simplify by removing CPP etc.
(CPP_TEST_OPTIONS, NON_GNU_CPP, cc_specified, SPECIFIED_CFLAGS)
(SPECIFED_CPP, CPP, NON_GNU_CC, AC_PROG_CPP): Remove; not needed.
In particular we no longer need to fiddle with CPP, since we don't
use CPP specially any more.
(gl_EARLY): Invoke this after adjusting CC, so that it uses the
adjusted compiler.
(AC_PROG_INSTALL, AC_PROG_MKDIR_P, AC_PROG_RANLIB): Comment out,
since gl_EARLY and/or Autoconf already does these.
2012-05-16 02:01:55 -07:00
Glenn Morris
27cb7be27d Try to fix building with gcc >= 4.6 on Darwin.
Eg, hydra builds have been failing for some time because (?) of this.
In gcc < 4.6, unrecognized -no-fo options just cause a warning.
In 4.6 and later, they cause an error.

* configure.in: (CPP): Do not unconditionally set it on Darwin.
Instead, try to test if -no-cpp-precomp is accepted.
(CPP_TEST_OPTIONS, SPECIFIED_CPP): New.

Fixes: debbugs:9755
2012-05-15 23:15:52 -07:00
Glenn Morris
4e7d487c44 * Makefile.in (install-arch-dep): Replace last user of MV_DIRS. 2012-05-15 15:13:17 -04:00
Glenn Morris
c184265d03 * Makefile.in (install-arch-dep): Replace use of MV_DIRS with libexec. 2012-05-15 13:55:39 -04:00