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

2142 commits

Author SHA1 Message Date
Paul Eggert
61febcb6e3 Revert recent libpng changes.
They fix only bugs that aren't being reported, so it may be better
to do them on the trunk.
* configure.ac (PNG_CFLAGS): Remove.  All uses removed.
(LIBPNG): Don't be consistent about -lpng16 versus -lpng.
Ignore libpng-config's exit status.  Always append -lz -lm.
* src/Makefile.in (PNG_CFLAGS): Remove; all uses removed.
* src/image.c [HAVE_LIBPNG_PNG_H]: Include <libpng/png.h>, not <png.h>.

Fixes: debbugs:17339
2014-05-04 11:51:32 -07:00
Paul Eggert
ec5f5b309d * configure.ac (LIBPNG): Add -lz -lm on platforms where they're needed
but libpng-config --libs omits them.  Problem reported by Glenn
Morris.
2014-05-03 23:34:04 -07:00
Paul Eggert
7e00998fbc Require ImageMagick >= 6.3.5, due to PixelSetMagickColor.
* configure.ac (IMAGEMAGICK_MODULE): Bump prereq from 6.2.8 to 6.3.5.
A more-complicated fix would be to remove uses of PixelSetMagickColor,
introduced in ImageMagick 6.3.5 (Sept. 2007).

Fixes: debbugs:17339
2014-05-03 14:06:04 -07:00
Paul Eggert
6f074205d3 Consult libpng-config more consistently.
* configure.ac (edit_cflags): Move this up and to the top level,
so that PNG_CFLAGS can use it too.
(PNG_CFLAGS): New var.
(png_longjmp): Use PNG_CFLAGS when checking.
(LIBPNG): Be consistent about -lpng16 etc; e.g., don't use -lpng16
in some places and -lpng in others.  Test libpng-config's exit
status.  If it succeeds, use its output rather than appending -lz -lm.
* src/Makefile.in (PNG_CFLAGS): New var.
(ALL_CFLAGS): Use it.
* src/image.c [HAVE_PNG]: Don't worry about <libpng/png.h>, as
CFLAGS now handles this.

Fixes: debbugs:17339
2014-05-02 12:34:03 -07:00
Glenn Morris
969aabf250 * configure.ac (LIBPNG): Consult libpng-config
for the precise form of "-lpng" to use.

Fixes: debbugs:17339
2014-05-01 17:57:27 -04:00
Glenn Morris
ca489750c2 * configure.ac: Treat MirBSD as OpenBSD.
Fixes: debbugs:17339
2014-04-29 07:49:11 -07:00
Eli Zaretskii
bf6b4923f7 Fix the MSDOS build.
src/unexcoff.c [MSDOS]: Include libc/atexit.h.
 (copy_text_and_data): Zero out the atexit chain pointer before
 dumping Emacs.
 src/termhooks.h (encode_terminal_code): Update prototype.
 src/term.c (encode_terminal_code) [DOS_NT]: Make it externally
 visible for all DOS_NT ports, not just WINDOWSNT.
 (syms_of_term) [!MSDOS]: Don't define 'tty-menu-*' symbols on MSDOS.
 src/sysdep.c (emacs_sigaction_init, init_signals): Don't use SIGCHLD
 unless it is defined.
 (emacs_pipe) [MSDOS]: Redirect to 'pipe'.
 src/process.c (close_on_exec, accept4, process_socket): Move into
 the "ifdef subprocesses" part.
 (catch_child_signal): Condition by "ifdef subprocesses".
 (syms_of_process) <Qinternal_default_process_sentinel>
 <Qinternal_default_process_filter>: Condition by "ifdef subprocesses".
 src/msdos.h: Add prototypes for new functions.
 (EINPROGRESS): Define.
 (O_CLOEXEC): Define to zero.
 src/msdos.c (check_window_system): Remove unnecessary an
 incompatible duplicate function.
 (sys_opendir, readlinkat, faccessat, fstatat, unsetenv): New
 functions in support of new functionality.
 src/menu.c (single_menu_item): Add visual indication  of submenu
 also for menus on MSDOS frames.
 (Fx_popup_menu) [!MSDOS]: Do not call tty_menu_show on MSDOS.
 src/lisp.h (CHECK_PROCESS) [!subprocesses]: Do not define
 when async subprocesses aren't supported.
 src/font.h (FONT_WIDTH) [MSDOS]: MSDOS-specific definition.
 src/emacs.c (close_output_streams): Zero out errno before calling
 close_stream.
 src/dired.c [MSDOS]: Include msdos.h.
 src/conf_post.h (opendir) [MSDOS]: Redirect to sys_opendir.
 (DATA_START) [MSDOS]: Define.
 (SYSTEM_PURESIZE_EXTRA) [MSDOS]: Enlarge by 25K.
 src/callproc.c (block_child_signal, unblock_child_signal) [MSDOS]:
 Ifdef away for MSDOS.
 (record_kill_process) [MSDOS]: Ifdef away the entire body for MSDOS.
 (call_process_cleanup) [MSDOS]: Ifdef away portions not relevant
 for MSDOS.
 (call_process) [MSDOS]: Fix call sequence of dostounix_filename.
 Use temporary file template that is compatible with mkostemp.
 Move vfork-related portions under #ifndef MSDOS.
 (syms_of_callproc): Unify templates of MSDOS and WINDOWSNT.

 lisp/term/pc-win.el (x-list-fonts, x-get-selection-value): Provide
 doc strings, as required by snarf-documentation.

 msdos/sedlisp.inp:
 msdos/sedlibmk.inp:
 msdos/sedleim.inp:
 msdos/sed3v2.inp:
 msdos/sed2v2.inp:
 msdos/sed1v2.inp: Update Sed scripts for Emacs 24.4.
 msdos/inttypes.h: Add PRIdMAX.
 msdos/INSTALL: Update for Emacs 24.4.
 msdos/sedadmin.inp: New file.
2014-04-16 16:27:28 +03:00
Paul Eggert
13a5993b31 Port to IRIX 6.5.
This port requires IRIX cc, as I did not have time to get
undump working with the old GCC on the system I had access to,
but that's better than nothing.
* configure.ac (gl_GCC_VERSION_IFELSE): Remove unused macro
that wouldn't have worked anyway, with IRIX cc.
(emacs_cv_clang, emacs_cv_sanitize_address)
(ns_osx_have_104, ns_osx_have_105):
Don't assume '#error' makes the compiler fail,
as this doesn't work with IRIX cc.
(CFLAGS, LIBS): Don't let the GnuTLS results infect later 'configure'
checks.  This runs afoul of an IRIX configuration where GnuTLS is
in an optional library that also contains getdelim, and causes
a later 'configure' to incorrectly think getdelim is supported.
* src/alloc.c (TAGGABLE_NULL): New constant,
for porting to hosts with nontrivial DATA_SEG_BITS settings.
(next_vector, set_next_vector): Use it.
* src/conf_post.h (INET6) [IRIX6_5]: Define.
(HAVE_GETADDRINFO) [IRIX6_5]: Undef.
* src/data.c (BITS_PER_ULL): Don't assume ULLONG_MAX is defined.
* src/lisp.h (lisp_h_XPNTR): Don't OR in bits that aren't masked out,
for consistency with how TAGGABLE_NULL is computed.

Fixes: debbugs:9684
2014-04-13 15:51:08 -07:00
Eli Zaretskii
aa1f3497ed Fix creation of emacs.exe hardlink at "make install" time on MS-Windows.
configure.ac (LN_S_FILEONLY, LN_S): Use "/bin/ln" on MinGW, to
 ensure the MSYS ln.exe is invoked.
2014-04-13 09:44:22 +03:00
Glenn Morris
9b1ac3be88 * make-dist: Distribute lib-src/update-game-score.exe.manifest. 2014-04-10 23:39:11 -07:00
Glenn Morris
235b3c7920 * make-dist: Do not distribute generated admin/grammars/Makefile. 2014-04-10 23:25:25 -07:00
Ken Brown
0cccc183d7 Revert most of the recent change involving manifests on Cygwin. (Bug#17176)
* configure.ac (EMACS_MANIFEST): Revert last change (but leave
UPDATE_MANIFEST empty).
* nt/emacs.rc: Revert last change.
* src/Makefile.in (EMACS_MANIFEST): Revert last change.
2014-04-09 17:16:37 -04:00
Ken Brown
ebe8e0765c Don't use manifest on Cygwin. (Bug#17176)
* nt/emacs.rc: Don't use manifest on Cygwin.
* configure.ac (EMACS_MANIFEST, UPDATE_MANIFEST): Leave these
variables empty on Cygwin. 
* src/Makefile.in (EMACS_MANIFEST): Update comment.
2014-04-03 15:10:35 -04:00
Glenn Morris
63adc15691 * configure.ac: Make the final "Does Emacs use Gsettings" message
consistent with src/config.h.
2014-03-31 09:22:32 -07:00
Jan Djärv
dcb4c4d753 * configure.ac: Fix errors from previous checkin (GSettings check).
Backport from trunk.
2014-03-31 08:08:29 +02:00
Daniel Colascione
8e86e380dc * configure.ac: Include GFILENOTIFY objects in glib check (backport from trunk)
Fixes: debbugs:17069
2014-03-30 16:59:19 -07:00
Jan Djärv
4e6c9f7b2e * configure.ac: Add check that GSettings is in libgio. Backport from trunk.
Fixes: debbugs:17118
2014-03-30 12:44:33 +02:00
Paul Eggert
cefcfbcc1b Merge from gnulib.
This incorporates:
2014-03-26 strftime: wrap macros in "do {...} while(0)"
* lib/strftime.c, doc/misc/texinfo.tex: Update from gnulib.
2014-03-25 21:16:13 -07:00
Paul Eggert
0d18109565 Merge from gnulib.
This incorporates:
2014-03-04 stdint: fix missing SIZE_MAX on Android
2013-03-02 sys_types: avoid autoconf warning about gl_SYS_TYPES_H
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib/stdint.in.h, lib/sys_types.in.h, m4/sys_types_h.m4:
Update from gnulib.

Fix oversight preventing lib/sys/types.h from being generated.
* admin/merge-gnulib (GNULIB_TOOL_FLAGS): Don't avoid sys_types.
2014-03-07 10:57:11 -08:00
Glenn Morris
bdd85f3177 * configure.ac: Tweak the "unported" error message.
"Has not been ported to" usually isn't quite correct these days.
Eg it could be an old platform that we dropped support for.
2014-03-05 14:57:36 -05:00
Glenn Morris
f889ebcefa Fix ChangeLog bug# typo 2014-03-05 14:04:44 -05:00
Paul Eggert
59587ee455 Fix configuration bug on Solaris 2.5.1.
* configure.ac: Fix a bug in shell pattern matching that caused
'configure' to treat Solaris 2.5.1 as if it were Solaris 10 or later.

Fixes: debbugs:16896
2014-03-04 18:39:05 -08:00
Juanma Barranquero
35e951cd4b */ChangeLog: Trivial fixes. 2014-03-03 05:57:26 +01:00
Paul Eggert
cc58740405 Merge from gnulib.
2014-02-25 unistd: port readlink to Mac OS X 10.3.9

Fixes: debbugs:16825
2014-02-25 11:21:05 -08:00
Paul Eggert
f1037d0b8b Merge from gnulib.
2014-02-21 timer: fix uClibc detection of threading
2014-02-21 maintainer-makefiles: provide AC_PROG_SED for older autoconf
* texinfo.tex: Update from gnulib.
2014-02-23 23:12:42 -08:00
Mirek Kaim
526e126f79 * configure.ac [HAVE_W32]: Test for ImageMagick.
Fixes: debbugs:16754
2014-02-17 17:47:35 -08:00
Paul Eggert
96fbe2b900 * Makefile.in (install-arch-indep): Allow ' ' in destdir.
This fixes a bug in the previous change.  Also, use $(SHELL)
rather than sh, as that's more likely to be portable.

Fixes: debbugs:16717
2014-02-14 00:05:18 -08:00
Paul Eggert
89a9712915 * Makefile.in (install-arch-indep): Simplify.
This should make it more reliable, and hopefully more portable to
non-GNU 'make' implementations such as HP-UX 'make'.

Fixes: debbugs:16717
2014-02-13 10:59:24 -08:00
Juanma Barranquero
1a4c95f664 Copy README.W32 when installing Windows build (bug#14757).
* Makefile.in (install-nt): Also pass datadir.

* nt/Makefile.in (datarootdir, datadir, INSTALL_DATA): Declare.
(install): Copy README.W32 to $(datadir)/emacs/$(version).
(uninstall): Remove README.W32.
2014-02-13 04:19:57 +01:00
Paul Eggert
06c2ec4946 Merge from gnulib.
This incorporates:

2014-01-23 pthread: work around winpthread header pollution on mingw
* lib/time.in.h: Update from gnulib.

* doc/misc/texinfo.tex: Update from texinfo.
2014-02-05 11:41:03 -08:00
Paul Eggert
51fb39ec63 Merge from gnulib.
This incorporates:
2014-01-22 qacl: check for fchmod
* m4/acl.m4: Update from gnulib.
2014-01-22 18:48:44 -08:00
Paul Eggert
dc217d0180 Fix miscellaneous update-game-score bugs.
* configure.ac (difftime): Remove.
* lib/update-game-score.c (difftime) [!HAVE_DIFFTIME]: Remove.
(read_score) [HAVE_GETDELIM]: Don't access uninitialized storage.
(read_scores, write_scores): Check for fclose failure.
(write_scores): Use fchmod, not chmod, to avoid a race.
(lock_file): Fix test for out-of-date lock file; it was reversed.
Use ordinary subtraction rather than difftime; since we're already
assuming POSIX we don't need to worry about the possibility of
time_t being a magic cookie.
2014-01-22 11:02:41 -08:00
Glenn Morris
1bf6ecf2b3 ChangeLog fixes 2014-01-21 20:43:37 -05:00
Glenn Morris
38942b9cf5 ChangeLog fixes 2014-01-21 00:49:46 -08:00
Glenn Morris
2fb6d9c6d6 ChangeLog fixes 2014-01-20 17:39:59 -05:00
Paul Eggert
cec62009bb Merge from gnulib.
This incorporates:
2014-01-20 stdalign: port to HP-UX compilers
2014-01-16 strtoimax: port to platforms lacking 'long long'
2014-01-16 update from texinfo
* doc/misc/texinfo.tex, lib/stdalign.in.h, lib/strtoimax.c:
Update from gnulib.
2014-01-20 12:48:14 -08:00
Eli Zaretskii
b30dee657d Remove ChangeLog entry of a reverted commit in Makefile.in. 2014-01-12 20:11:49 +02:00
Eli Zaretskii
cbe02c1fe9 Revert part of 2014-01-12T14:54:50Z!esr@thyrsus.com and fix the VCSWITNESS thingy.
Makefile.in (src): Fix the computation of $vcswitness.
2014-01-12 19:27:17 +02:00
Eli Zaretskii
3cc9b1e268 Revert last commit. 2014-01-12 18:37:42 +02:00
Eric S. Raymond
ff7210fef5 Remove more references unnecessarily specific to VCS. 2014-01-12 10:37:23 -05:00
Eric S. Raymond
841a6d0cb8 Remove broken VCSWITNESS code, and explain the problem. 2014-01-12 09:54:50 -05:00
Glenn Morris
4efa3f1e0e Replace doc references to deleted etc/ files
* README: Replace reference to etc/MAILINGLISTS.

* doc/man/emacs.1: Replace reference to etc/MAILINGLISTS.

* doc/misc/efaq.texi (Guidelines for newsgroup postings)
(Informational files for Emacs):
Remove references to etc/MAILINGLISTS, etc/INTERVIEW.
2014-01-11 17:35:51 -08:00
Eric S. Raymond
5d1a288857 /etc cleanup
* COOKIES, copying.paper, INTERVIEW, MAILINGLISTS, MOTIVATION,
	publicsuffix.txt SERVICE: More deletions suggested by RMS.
2014-01-11 09:27:38 -05:00
Eric S. Raymond
9685190b46 /etc cleanup: Removal of joke man pages and associated Lisp file.
* etc/celibacy.1, etc/sex.6, etc/condom.1, etc/echo.msg:
	Deleted at RMS's suggestion. Not lost to posterity as they are
	part of the widely distributed funny-manpages collection.

	* lisp/play/meese.el: It's 2014 and Ed Meese is justly forgotten. Goes
	with removal of the joke manpages from /etc.
2014-01-11 09:15:17 -05:00
Fabrice Popineau
e05d3a05bf Fix minor build problems related to MinGW64.
configure.ac: Read $srcdir/nt/mingw-cfg.site when $MSYSTEM is
 "MINGW64" as well.

 nt/inc/ms-w32.h (pthread_sigmask): Undefine if defined, for MinGW64.

 src/unexw32.c (_start) [__MINGW64__]: Define to __start.
2014-01-11 15:36:06 +02:00
Paul Eggert
bada50fc50 Merge from gnulib.
This incorporates:
2014-01-07 update from texinfo
2014-01-06 md5, sha1, sha256, sha512: support older autoconf
2014-01-10 23:01:30 -08:00
Eric S. Raymond
314668368c Clean up unnecessary references to Bazaar. Documentation changes only. 2014-01-08 19:10:07 -05:00
Eric S. Raymond
ac4c50ad33 Rename INSTALL.BZR to UNSTALL.REPOm and carry that through in other files. 2014-01-08 18:24:54 -05:00
Paul Eggert
81da295eeb Port to GNU/Linux with recent grsecurity/PaX patches (Bug#16343).
Problem and proposed patch reported by Ulrich Mueller;
this patch uses a somewhat-different approach.
* configure.ac (SETFATTR): New variable.
* src/Makefile.in (SETFATTR): New macro.
(temacs$(EXEEXT)): Use it.
2014-01-04 16:55:29 -08:00
Paul Eggert
3d81471038 Merge from gnulib.
This incorporates:
2014-01-02 manywarnings: remove -Wmudflap
This ports better to GCC 4.9-to-be.
2014-01-02 17:59:58 -08:00