2010-12-03 14:45:09 +00:00
|
|
|
dnl Autoconf script for GNU Emacs
|
|
|
|
dnl To rebuild the `configure' script from this, execute the command
|
|
|
|
dnl autoconf
|
|
|
|
dnl in the directory containing this script.
|
|
|
|
dnl If you changed any AC_DEFINES, also run autoheader.
|
|
|
|
dnl
|
2014-01-01 07:43:34 +00:00
|
|
|
dnl Copyright (C) 1994-1996, 1999-2014 Free Software Foundation, Inc.
|
2010-12-03 14:45:09 +00:00
|
|
|
dnl
|
|
|
|
dnl This file is part of GNU Emacs.
|
|
|
|
dnl
|
|
|
|
dnl GNU Emacs is free software: you can redistribute it and/or modify
|
|
|
|
dnl it under the terms of the GNU General Public License as published by
|
|
|
|
dnl the Free Software Foundation, either version 3 of the License, or
|
|
|
|
dnl (at your option) any later version.
|
|
|
|
dnl
|
|
|
|
dnl GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
dnl GNU General Public License for more details.
|
|
|
|
dnl
|
|
|
|
dnl You should have received a copy of the GNU General Public License
|
|
|
|
dnl along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
AC_PREREQ(2.65)
|
2014-04-01 16:17:19 +00:00
|
|
|
dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el.
|
2014-09-29 19:49:44 +00:00
|
|
|
AC_INIT(GNU Emacs, 25.0.50, bug-gnu-emacs@gnu.org)
|
2013-02-11 00:54:48 +00:00
|
|
|
|
2013-08-22 17:35:00 +00:00
|
|
|
dnl Set emacs_config_options to the options of 'configure', quoted for the shell,
|
|
|
|
dnl and then quoted again for a C string. Separate options with spaces.
|
|
|
|
dnl Add some environment variables, if they were passed via the environment
|
|
|
|
dnl rather than on the command-line.
|
|
|
|
emacs_config_options=
|
|
|
|
optsep=
|
2012-12-27 17:59:21 +00:00
|
|
|
dnl This is the documented way to record the args passed to configure,
|
|
|
|
dnl rather than $ac_configure_args.
|
2013-08-22 17:35:00 +00:00
|
|
|
for opt in ${1+"$@"} CFLAGS CPPFLAGS LDFLAGS; do
|
|
|
|
case $opt in
|
|
|
|
-n | --no-create | --no-recursion)
|
|
|
|
continue ;;
|
|
|
|
CFLAGS | CPPFLAGS | LDFLAGS)
|
|
|
|
eval 'test "${'$opt'+set}" = set' || continue
|
|
|
|
case " $*" in
|
|
|
|
*" $opt="*) continue ;;
|
|
|
|
esac
|
|
|
|
eval opt=$opt=\$$opt ;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
emacs_shell_specials=$IFS\''"#$&()*;<>?@<:@\\`{|~'
|
|
|
|
case $opt in
|
|
|
|
*[["$emacs_shell_specials"]]*)
|
|
|
|
case $opt in
|
|
|
|
*\'*)
|
|
|
|
emacs_quote_apostrophes="s/'/'\\\\''/g"
|
|
|
|
opt=`AS_ECHO(["$opt"]) | sed "$emacs_quote_apostrophes"` ;;
|
|
|
|
esac
|
|
|
|
opt="'$opt'"
|
|
|
|
case $opt in
|
|
|
|
*[['"\\']]*)
|
|
|
|
emacs_quote_for_c='s/[["\\]]/\\&/g; $!s/$/\\n\\/'
|
|
|
|
opt=`AS_ECHO(["$opt"]) | sed "$emacs_quote_for_c"` ;;
|
|
|
|
esac ;;
|
|
|
|
esac
|
|
|
|
AS_VAR_APPEND([emacs_config_options], ["$optsep$opt"])
|
|
|
|
optsep=' '
|
2013-02-11 00:54:48 +00:00
|
|
|
done
|
|
|
|
|
2013-12-23 15:13:14 +00:00
|
|
|
AC_CONFIG_HEADERS(src/config.h:src/config.in)
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_CONFIG_SRCDIR(src/lisp.h)
|
Merge from gnulib, using build-aux to remove clutter.
* m4/largefile.m4: New file, so that Emacs does not mess up when
accessing files with large inode numbers in MacOS X 10.5 and later.
* m4/nocrash.m4: New file, to avoid triggering background debugger
and/or create core dumps during 'configure'.
* build-aux/move-if-change: Renamed from move-if-change.
* build-aux/snippet/arg-nonnull.h: Renamed from arg-nonnull.h.
* build-aux/snippet/c++defs.h: Renamed from c++defs.h.
* build-aux/snippet/warn-on-use.h: Renamed from warn-on-use.h.
* build-aux/snippet/_Noreturn.h: New file, for draft C1X _Noreturn.
* .bzrignore: The autogenerated files compile, config.guess,
config.sub, depcomp, install-sh, and missing are now in build-aux.
* Makefile.in (epaths-force, sync-from-gnulib):
move-if-change is now in build-aux.
(GNULIB_TOOL_FLAGS): Avoid threadlib; this is now a prerequisite
of gnulib's pthread_sigmask module, but Emacs doesn't need it.
(mkdir): install-sh is now in build-aux.
* config.bat: c++defs.h is now in build-aux/snippets.
* configure.in: Specify AC_CONFIG_AUX_DIR with build-aux (the
usual parameter).
* lib/gnulib.mk, m4/gl-comp.m4: Regenerate.
* lib/makefile.w32-in (ARG_NONNULL_H): arg-nonnull.h moved
to build-aux/snippet.
* lib/pthread_sigmask.c, lib/stdlib.in.h, m4/extensions.m4:
* m4/getopt.m4, m4/gnulib-common.m4, m4/pthread_sigmask.m4:
Merge from gnuilib. This fixes porting bugs on Cygwin, Irix, and
Solaris, enables MacOS extensions, and enables nocrash during
'configure'.
* make-dist: Adjust to new build-aux and build-aux/snippit dirs.
* admin/notes/copyright: The files compile, config.guess, config.sub,
depcomp, install-sh, missing, and move-if-change are now in the
new build-aux subdirectory. The files arg-nonnull.h, c++defs.h,
and warn-on-use.h are now in build-aux/snippets. New file
build-aux/snippets/_Noreturn.h.
* leim/Makefile.in (install): install-sh is now in build-aux.
* lib-src/Makefile.in ($(DESTDIR)${archlibdir}): install-sh moved
to build-aux.
* msdos/sedlibmk.inp (CONFIG_CLEAN_VPATH_FILES): Adjust to snippet moves
from top level to build-aux/snippet.
* src/Makefile.in (gl-stamp): move-if-change is now in build-aux.
2011-07-24 22:15:47 +00:00
|
|
|
AC_CONFIG_AUX_DIR(build-aux)
|
2014-05-02 21:57:58 +00:00
|
|
|
dnl automake 1.13 and later understand this, making -I m4 unnecessary.
|
2014-05-06 20:36:40 +00:00
|
|
|
dnl With older versions this is a no-op.
|
2014-05-02 21:57:58 +00:00
|
|
|
AC_CONFIG_MACRO_DIR(m4)
|
2013-12-27 19:14:10 +00:00
|
|
|
|
|
|
|
xcsdkdir=
|
|
|
|
AC_CHECK_PROGS(XCRUN, [xcrun])
|
|
|
|
if test -n "$XCRUN"; then
|
2013-12-28 00:40:58 +00:00
|
|
|
if test -z "$MAKE"; then
|
|
|
|
dnl Call the variable MAKE_PROG, not MAKE, to avoid confusion with
|
2014-06-05 08:03:22 +00:00
|
|
|
dnl the usual MAKE variable that 'make' itself uses.
|
2013-12-28 00:40:58 +00:00
|
|
|
AC_CHECK_PROG([MAKE_PROG], [make], [yes])
|
|
|
|
if test -z "$MAKE_PROG"; then
|
|
|
|
MAKE="$XCRUN MAKE"
|
|
|
|
export MAKE
|
2013-12-29 13:17:09 +00:00
|
|
|
xcsdkdir=`$XCRUN --show-sdk-path 2>/dev/null`
|
2013-12-28 00:40:58 +00:00
|
|
|
fi
|
|
|
|
fi
|
2013-12-27 19:14:10 +00:00
|
|
|
fi
|
|
|
|
|
2014-06-05 08:03:22 +00:00
|
|
|
dnl GNU Make is required, so don't test for its individual features.
|
|
|
|
am_cv_make_support_nested_variables=yes
|
|
|
|
AC_DEFUN([AC_PROG_MAKE_SET],
|
|
|
|
[SET_MAKE=
|
|
|
|
AC_SUBST([SET_MAKE])])
|
|
|
|
|
|
|
|
dnl Check for GNU Make and possibly set MAKE before running AM_INIT_AUTOMAKE.
|
2014-06-11 17:51:27 +00:00
|
|
|
[emacs_check_gnu_make ()
|
|
|
|
{
|
|
|
|
emacs_makeout=`($1 --version) 2>/dev/null` &&
|
|
|
|
case $emacs_makeout in
|
|
|
|
'GNU Make '3.8[1-9]* | 'GNU Make '3.9[0-9]* | \
|
|
|
|
'GNU Make '3.[1-9][0-9][0-9]* | 'GNU Make '[4-9]* | 'GNU Make '[1-9][0-9]* )
|
|
|
|
ac_path_MAKE_found=:;;
|
|
|
|
esac
|
|
|
|
}]
|
2014-06-05 08:03:22 +00:00
|
|
|
AC_CACHE_CHECK([for GNU Make], [ac_cv_path_MAKE],
|
|
|
|
[ac_path_MAKE_found=false
|
|
|
|
if test -n "$MAKE"; then
|
2014-06-11 17:51:27 +00:00
|
|
|
emacs_check_gnu_make "$MAKE"
|
2014-06-05 08:03:22 +00:00
|
|
|
ac_cv_path_MAKE=$MAKE
|
|
|
|
else
|
|
|
|
emacs_tried_make=false
|
|
|
|
emacs_tried_gmake=false
|
|
|
|
emacs_tried_gnumake=false
|
|
|
|
AC_PATH_PROGS_FEATURE_CHECK([MAKE], [make gmake gnumake],
|
2014-06-11 17:51:27 +00:00
|
|
|
[[emacs_check_gnu_make "$ac_path_MAKE"
|
|
|
|
if $ac_path_MAKE_found; then
|
|
|
|
# Use the fully-qualified program name only if the basename
|
|
|
|
# would not resolve to it.
|
|
|
|
if eval \$emacs_tried_$ac_prog; then
|
|
|
|
ac_cv_path_MAKE=$ac_path_MAKE
|
|
|
|
else
|
|
|
|
ac_cv_path_MAKE=$ac_prog
|
|
|
|
fi
|
|
|
|
fi
|
2014-06-05 08:03:22 +00:00
|
|
|
eval emacs_tried_$ac_prog=:]])
|
|
|
|
fi])
|
2014-06-11 03:03:40 +00:00
|
|
|
$ac_path_MAKE_found || {
|
|
|
|
AC_MSG_ERROR([[Building Emacs requires GNU Make, at least version 3.81.
|
2014-06-05 08:03:22 +00:00
|
|
|
If you have it installed under another name, configure with 'MAKE=...'.
|
|
|
|
For example, run '$0 MAKE=gnu-make'.]])
|
|
|
|
}
|
|
|
|
MAKE=$ac_cv_path_MAKE
|
2014-08-31 02:34:31 +00:00
|
|
|
export MAKE
|
2014-06-05 08:03:22 +00:00
|
|
|
|
2012-08-07 01:03:44 +00:00
|
|
|
dnl Fairly arbitrary, older versions might work too.
|
|
|
|
AM_INIT_AUTOMAKE(1.11)
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2014-06-10 19:43:13 +00:00
|
|
|
dnl Canonicalize the configuration name.
|
|
|
|
AC_CANONICAL_HOST
|
|
|
|
canonical=$host
|
|
|
|
configuration=${host_alias-${build_alias-$host}}
|
|
|
|
|
2014-08-23 09:14:13 +00:00
|
|
|
dnl We get MINGW64 with MSYS2, MINGW32 with MSYS.
|
2014-06-10 19:43:13 +00:00
|
|
|
case $canonical in
|
|
|
|
*-mingw*)
|
|
|
|
. $srcdir/nt/mingw-cfg.site
|
|
|
|
|
|
|
|
case $srcdir in
|
|
|
|
/* | ?:*)
|
|
|
|
# srcdir is an absolute path. In this case, force the format
|
|
|
|
# "/c/foo/bar", to simplify later conversions to native Windows
|
|
|
|
# format ("c:/foo/bar").
|
|
|
|
srcdir=`cd "${srcdir}" && pwd -W`
|
2014-10-03 15:44:46 +00:00
|
|
|
# 'eval' pacifies strict POSIX non-MinGW shells (Bug#18612).
|
|
|
|
eval 'srcdir="/${srcdir:0:1}${srcdir:2}"'
|
2014-06-10 19:43:13 +00:00
|
|
|
;;
|
|
|
|
esac;;
|
|
|
|
esac
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
dnl Support for --program-prefix, --program-suffix and
|
|
|
|
dnl --program-transform-name options
|
|
|
|
AC_ARG_PROGRAM
|
|
|
|
|
|
|
|
dnl It is important that variables on the RHS not be expanded here,
|
|
|
|
dnl hence the single quotes. This is per the GNU coding standards, see
|
|
|
|
dnl (autoconf) Installation Directory Variables
|
|
|
|
dnl See also epaths.h below.
|
|
|
|
lispdir='${datadir}/emacs/${version}/lisp'
|
Move runtime leim lisp files to lisp/leim directory
This allows us to reuse much of the lisp build and installation machinery,
rather than duplicating it.
* Makefile.in (abs_builddir, leimdir): Remove.
(buildlisppath, SUBDIR, COPYDIR, COPYDESTS): No more leim directory.
(epaths-force-w32): No longer set BLD.
(leim): Remove.
(install-arch-indep): No longer run or install leim.
(mostlyclean, clean): No longer run leim rule.
(bootstrap-clean): Change leim target.
(maintainer-clean): Add leim.
(check-declare): Remove leim.
* README: Update for leim changes.
* configure.ac (leimdir): Remove.
(standardlisppath): No more leimdir.
* make-dist: Update for files from leim/ now being in lisp/leim/.
* doc/lispref/loading.texi (Library Search):
* doc/lispref/os.texi (Startup Summary): No more leim directory.
* leim/Makefile.in (leimdir): New variable.
(TIT_GB, TIT_BIG5, MISC, changed.tit, changed.misc)
(${leimdir}/leim-list.el, ${leimdir}/ja-dic/ja-dic.el):
Generate in $leimdir.
(all): Remove compilation, add ja-dic.
(leim-list.el): Now PHONY.
(setwins, compile-targets, compile-main, clean, mostlyclean)
(extraclean): Remove.
(bootstrap-clean): Delete all generated files.
* leim/README: Update for moved leim/ directory.
* leim/leim-ext.el (ucs-input-activate, hangul-input-method-activate):
Remove manual autoloads; now in loaddefs.el.
Disable byte-compile, version-control, autoloads in the output.
* lisp/Makefile.in (setwins_for_subdirs): Skip leim/ directory.
(compile-main): Depend on lisp/leim rule.
(leim): New rule.
* lisp/loadup.el: Move leim-list.el to leim/ subdirectory.
* lisp/startup.el (normal-top-level): No more leim directory.
* lisp/international/ja-dic-cnv.el (skkdic-convert):
Disable version-control and autoloads in output files.
* lisp/international/titdic-cnv.el (titdic-convert, miscdic-convert):
Disable version-control and autoloads in output files.
* lisp/leim/quail: Move here from ../leim.
* lisp/leim/quail/hangul.el (hangul-input-method-activate):
Add autoload cookie.
(generated-autoload-load-name): Set file-local value.
* lisp/leim/quail/uni-input.el (ucs-input-activate): Add autoload cookie.
(generated-autoload-load-name): Set file-local value.
* nt/README.W32:
* nt/addpm.c (env_vars):
* nt/epaths.nt (PATH_LOADSEARCH, PATH_DUMPLOADSEARCH):
* nt/paths.h (PATH_LOADSEARCH): No more leim directory.
* src/Makefile.in (leimdir): Now in lisp source directory.
($(leimdir)/leim-list.el): Just use ../leim .
* src/epaths.in (PATH_DUMPLOADSEARCH):
* src/lread.c (load_path_default):
* src/nsterm.m (ns_load_path): No more leim directory.
* .bzrignore: Update for relocated leim files.
2013-11-27 06:15:06 +00:00
|
|
|
standardlisppath='${lispdir}'
|
2010-12-03 14:45:09 +00:00
|
|
|
locallisppath='${datadir}/emacs/${version}/site-lisp:'\
|
|
|
|
'${datadir}/emacs/site-lisp'
|
2012-06-30 21:10:50 +00:00
|
|
|
lisppath='${locallisppath}:${standardlisppath}'
|
2010-12-03 14:45:09 +00:00
|
|
|
etcdir='${datadir}/emacs/${version}/etc'
|
|
|
|
archlibdir='${libexecdir}/emacs/${version}/${configuration}'
|
Add build, install, uninstall rules for all dvi, html, pdf, ps manuals
* configure.ac (etcdocdir): Rename from docdir, to avoid confusion
with configure's standard --docdir argument. All uses updated.
* Makefile.in (etcdocdir): Rename from docdir. All uses updated.
(install-etcdoc): Rename from install-doc. All uses updated.
(uninstall): Run uninstall-doc.
(PSS): Add misc-ps.
(INSTALL_DVI, INSTALL_HTML, INSTALL_PDF, INSTALL_PS)
(INSTALL_DOC, UNINSTALL_DVI, UNINSTALL_HTML, UNINSTALL_PDF)
(UNINSTALL_PS, UNINSTALL_DOC): New variables.
($(INSTALL_DOC), install-doc, install-dvi, install-html, install-pdf)
(install-ps, $(UNINSTALL_DOC), uninstall-doc, uninstall-dvi)
(uninstall-html, uninstall-pdf, uninstall-ps): New .PHONY rules.
* doc/emacs/Makefile.in (prefix, datarootdir, datadir, PACKAGE_TARNAME)
(docdir, dvidir, htmldir, pdfdir, psdir, GZIP_PROG, INSTALL)
(INSTALL_DATA): New, set by configure.
(HTML_OPTS, DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS):
New variables.
(.SUFFIXES): Add .ps and .dvi.
(.dvi.ps): New suffix rule.
(dvi, html, pdf, ps): Use *_TARGETS variables.
(emacs.ps, emacs-xtra.ps): Remove explicit rules.
(emacs.html): Use HTML_OPTS.
(clean): Use DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS.
(.PHONY): install-dvi, install-html, install-pdf, install-ps
,install-doc, uninstall-dvi, uninstall-html, uninstall-pdf,
uninstall-ps, and uninstall-doc.
(install-dvi, install-html, install-pdf, install-ps, install-doc)
(uninstall-dvi, uninstall-html, uninstall-ps, uninstall-pdf)
(uninstall-doc): New rules.
* doc/lispintro/Makefile.in (prefix, datarootdir, datadir, PACKAGE_TARNAME)
(docdir, dvidir, htmldir, pdfdir, psdir, GZIP_PROG, INSTALL)
(INSTALL_DATA): New, set by configure.
(HTML_OPTS, DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS):
New variables.
(.SUFFIXES): Add .ps and .dvi.
(.dvi.ps): New suffix rule.
(dvi, html, pdf, ps): Use *_TARGETS variables.
(emacs-lisp-intro.ps): Remove explicit rule.
(emacs-lisp-intro.html): Use HTML_OPTS.
(clean): Use DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS.
(.PHONY): install-dvi, install-html, install-pdf, install-ps
,install-doc, uninstall-dvi, uninstall-html, uninstall-pdf,
uninstall-ps, and uninstall-doc.
(install-dvi, install-html, install-pdf, install-ps, install-doc)
(uninstall-dvi, uninstall-html, uninstall-ps, uninstall-pdf)
(uninstall-doc): New rules.
* doc/lispref/Makefile.in (prefix, datarootdir, datadir, PACKAGE_TARNAME)
(docdir, dvidir, htmldir, pdfdir, psdir, GZIP_PROG, INSTALL)
(INSTALL_DATA): New, set by configure.
(HTML_OPTS, DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS):
New variables.
(.SUFFIXES): Add .ps and .dvi.
(.dvi.ps): New suffix rule.
(dvi, html, pdf, ps): Use *_TARGETS variables.
(elisp.html): Use HTML_OPTS.
(elisp.ps): Remove explicit rule.
(.PHONY): install-dvi, install-html, install-pdf, install-ps
,install-doc, uninstall-dvi, uninstall-html, uninstall-pdf,
uninstall-ps, and uninstall-doc.
(install-dvi, install-html, install-pdf, install-ps, install-doc)
(uninstall-dvi, uninstall-html, uninstall-ps, uninstall-pdf)
(uninstall-doc): New rules.
(clean): Use DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS.
* doc/misc/Makefile.in (prefix, datarootdir, datadir, PACKAGE_TARNAME)
(docdir, dvidir, htmldir, pdfdir, psdir, GZIP_PROG, INSTALL)
(INSTALL_DATA): New, set by configure.
(HTML_OPTS, HTML_TARGETS, PS_TARGETS, DVIPS): New variables.
(.PHONY): Add html, ps, install-dvi, install-html, install-pdf,
install-ps ,install-doc, uninstall-dvi, uninstall-html, uninstall-pdf,
uninstall-ps, and uninstall-doc.
(.SUFFIXES): Add .ps and .dvi.
(.dvi.ps): New suffix rule.
(html, ps, ada-mode.html, auth.html, autotype.html, bovine.html)
(calc.html, cc-mode.html, cl.html, dbus.html, dired-x.html)
(ebrowse.html, ede.html, ediff.html, edt.html, eieio.html)
(emacs-gnutls.html, emacs-mime.html, epa.html, erc.html)
(ert.html, eshell.html, eudc.html, faq.html, flymake.html)
(forms.html, gnus.html, htmlfontify.html, idlwave.html)
(ido.html, mairix-el.html, message.html, mh-e.html)
(newsticker.html, nxml-mode.html, org.html, pgg.html)
(rcirc.html, reftex.html, remember.html, sasl.html, sc.html)
(semantic.html, sieve.html, smtpmail.html, speedbar.html)
(srecode.html, todo-mode.html, tramp.html, url.html, vip.html)
(viper.html, widget.html, wisent.html, woman.html, install-dvi)
(install-html, install-pdf, install-ps, install-doc, uninstall-dvi)
(uninstall-html, uninstall-ps, uninstall-pdf, uninstall-doc):
New rules.
(clean): Remove HTML_TARGETS and PS_TARGETS.
2013-08-12 00:04:15 +00:00
|
|
|
etcdocdir='${datadir}/emacs/${version}/etc'
|
2010-12-03 14:45:09 +00:00
|
|
|
gamedir='${localstatedir}/games/emacs'
|
|
|
|
|
2012-08-08 16:17:15 +00:00
|
|
|
dnl Special option to disable the most of other options.
|
|
|
|
AC_ARG_WITH(all,
|
|
|
|
[AS_HELP_STRING([--without-all],
|
2012-08-07 04:16:47 +00:00
|
|
|
[omit almost all features and build
|
|
|
|
small executable with minimal dependencies])],
|
2013-12-11 05:37:30 +00:00
|
|
|
[with_features=$withval],
|
Use libcrypto's checksum implementations if available, for speed.
On commonly used platform libcrypto uses architecture-specific
assembly code, which is significantly faster than the C code we
were using. See Pádraig Brady's note in
<http://lists.gnu.org/archive/html/bug-gnulib/2013-12/msg00000.html>.
Merge from gnulib, incorporating:
2013-12-07 md5, sha1, sha256, sha512: add gl_SET_CRYPTO_CHECK_DEFAULT
2013-12-07 md5, sha1, sha256, sha512: add 'auto', and set-default method
2013-12-04 include_next: minimize code duplication
2013-12-03 md5, sha1, sha256, sha512: support mandating use of openssl
2013-12-02 md5, sha1, sha256, sha512: use openssl routines if available
* configure.ac (--without-all): Set with_openssl_default too.
Use gl_SET_CRYPTO_CHECK_DEFAULT to default to 'auto'.
(HAVE_LIB_CRYPTO): New var.
Say whether Emacs is configured to use a crypto library.
* lib/gl_openssl.h, m4/absolute-header.m4, m4/gl-openssl.m4:
New files, copied from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib/md5.c, lib/md5.h, lib/sha1.c, lib/sha1.h:
* lib/sha256.c, lib/sha256.h, lib/sha512.c, lib/sha512.h:
* m4/include_next.m4, m4/md5.m4, m4/sha1.m4, m4/sha256.m4, m4/sha512.m4:
Update from gnulib.
* src/Makefile.in (LIB_CRYPTO): New macro.
(LIBES): Use it.
2013-12-08 08:05:36 +00:00
|
|
|
[with_features=yes])
|
2012-08-07 04:16:47 +00:00
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
dnl OPTION_DEFAULT_OFF(NAME, HELP-STRING)
|
|
|
|
dnl Create a new --with option that defaults to being disabled.
|
|
|
|
dnl NAME is the base name of the option. The shell variable with_NAME
|
|
|
|
dnl will be set to either the user's value (if the option is
|
|
|
|
dnl specified; 'yes' for a plain --with-NAME) or to 'no' (if the
|
|
|
|
dnl option is not specified). Note that the shell variable name is
|
|
|
|
dnl constructed as autoconf does, by replacing non-alphanumeric
|
|
|
|
dnl characters with "_".
|
|
|
|
dnl HELP-STRING is the help text for the option.
|
|
|
|
AC_DEFUN([OPTION_DEFAULT_OFF], [dnl
|
|
|
|
AC_ARG_WITH([$1],[AS_HELP_STRING([--with-$1],[$2])],[],[dnl
|
|
|
|
m4_bpatsubst([with_$1], [[^0-9a-z]], [_])=no])dnl
|
|
|
|
])dnl
|
|
|
|
|
|
|
|
dnl OPTION_DEFAULT_ON(NAME, HELP-STRING)
|
2013-06-13 06:28:05 +00:00
|
|
|
dnl Create a new --with option that defaults to $with_features.
|
2012-08-07 04:16:47 +00:00
|
|
|
dnl NAME is the base name of the option. The shell variable with_NAME
|
2010-12-03 14:45:09 +00:00
|
|
|
dnl will be set either to 'no' (for a plain --without-NAME) or to
|
|
|
|
dnl 'yes' (if the option is not specified). Note that the shell
|
|
|
|
dnl variable name is constructed as autoconf does, by replacing
|
|
|
|
dnl non-alphanumeric characters with "_".
|
|
|
|
dnl HELP-STRING is the help text for the option.
|
|
|
|
AC_DEFUN([OPTION_DEFAULT_ON], [dnl
|
|
|
|
AC_ARG_WITH([$1],[AS_HELP_STRING([--without-$1],[$2])],[],[dnl
|
2012-08-08 16:17:15 +00:00
|
|
|
m4_bpatsubst([with_$1], [[^0-9a-z]], [_])=$with_features])dnl
|
2010-12-03 14:45:09 +00:00
|
|
|
])dnl
|
|
|
|
|
|
|
|
OPTION_DEFAULT_ON([pop],[don't support POP mail retrieval with movemail])
|
|
|
|
if test "$with_pop" = yes; then
|
|
|
|
AC_DEFINE(MAIL_USE_POP)
|
|
|
|
fi
|
|
|
|
AH_TEMPLATE(MAIL_USE_POP, [Define to support POP mail retrieval.])dnl
|
|
|
|
|
|
|
|
OPTION_DEFAULT_OFF([kerberos],[support Kerberos-authenticated POP])
|
|
|
|
if test "$with_kerberos" != no; then
|
|
|
|
AC_DEFINE(KERBEROS)
|
|
|
|
fi
|
|
|
|
AH_TEMPLATE(KERBEROS,
|
|
|
|
[Define to support Kerberos-authenticated POP mail retrieval.])dnl
|
|
|
|
|
|
|
|
OPTION_DEFAULT_OFF([kerberos5],[support Kerberos version 5 authenticated POP])
|
|
|
|
if test "${with_kerberos5}" != no; then
|
|
|
|
if test "${with_kerberos}" = no; then
|
|
|
|
with_kerberos=yes
|
|
|
|
AC_DEFINE(KERBEROS)
|
|
|
|
fi
|
|
|
|
AC_DEFINE(KERBEROS5, 1, [Define to use Kerberos 5 instead of Kerberos 4.])
|
|
|
|
fi
|
|
|
|
|
|
|
|
OPTION_DEFAULT_OFF([hesiod],[support Hesiod to get the POP server host])
|
|
|
|
dnl FIXME hesiod support may not be present, so it seems like an error
|
|
|
|
dnl to define, or at least use, this unconditionally.
|
|
|
|
if test "$with_hesiod" != no; then
|
|
|
|
AC_DEFINE(HESIOD, 1, [Define to support using a Hesiod database to find the POP server.])
|
|
|
|
fi
|
|
|
|
|
|
|
|
OPTION_DEFAULT_OFF([mmdf],[support MMDF mailboxes])
|
|
|
|
if test "$with_mmdf" != no; then
|
|
|
|
AC_DEFINE(MAIL_USE_MMDF, 1, [Define to support MMDF mailboxes in movemail.])
|
|
|
|
fi
|
|
|
|
|
|
|
|
OPTION_DEFAULT_OFF([mail-unlink],[unlink, rather than empty, mail spool after reading])
|
|
|
|
if test "$with_mail_unlink" != no; then
|
|
|
|
AC_DEFINE(MAIL_UNLINK_SPOOL, 1, [Define to unlink, rather than empty, mail spool after reading.])
|
|
|
|
fi
|
|
|
|
|
|
|
|
AC_ARG_WITH([mailhost],[AS_HELP_STRING([--with-mailhost=HOSTNAME],
|
|
|
|
[string giving default POP mail host])],
|
|
|
|
AC_DEFINE_UNQUOTED(MAILHOST, ["$withval"], [String giving fallback POP mail host.]))
|
|
|
|
|
2013-07-27 01:18:21 +00:00
|
|
|
AC_ARG_WITH([sound],[AS_HELP_STRING([--with-sound=VALUE],
|
2013-08-31 20:00:22 +00:00
|
|
|
[compile with sound support (VALUE one of: yes, alsa, oss, bsd-ossaudio, no;
|
2014-09-27 23:35:50 +00:00
|
|
|
default yes). Only for GNU/Linux, FreeBSD, NetBSD, MinGW, Cygwin.])],
|
2013-07-27 01:18:21 +00:00
|
|
|
[ case "${withval}" in
|
2013-08-31 20:00:22 +00:00
|
|
|
yes|no|alsa|oss|bsd-ossaudio) val=$withval ;;
|
2013-07-27 01:18:21 +00:00
|
|
|
*) AC_MSG_ERROR([`--with-sound=$withval' is invalid;
|
2013-08-31 20:00:22 +00:00
|
|
|
this option's value should be `yes', `no', `alsa', `oss', or `bsd-ossaudio'.])
|
2013-07-27 01:18:21 +00:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
with_sound=$val
|
|
|
|
],
|
|
|
|
[with_sound=$with_features])
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
dnl FIXME currently it is not the last.
|
|
|
|
dnl This should be the last --with option, because --with-x is
|
2012-12-09 02:22:39 +00:00
|
|
|
dnl added later on when we find the file name of X, and it's best to
|
2010-12-03 14:45:09 +00:00
|
|
|
dnl keep them together visually.
|
|
|
|
AC_ARG_WITH([x-toolkit],[AS_HELP_STRING([--with-x-toolkit=KIT],
|
2012-09-12 20:21:39 +00:00
|
|
|
[use an X toolkit (KIT one of: yes or gtk, gtk2, gtk3, lucid or athena, motif, no)])],
|
2010-12-03 14:45:09 +00:00
|
|
|
[ case "${withval}" in
|
|
|
|
y | ye | yes ) val=gtk ;;
|
|
|
|
n | no ) val=no ;;
|
|
|
|
l | lu | luc | luci | lucid ) val=lucid ;;
|
|
|
|
a | at | ath | athe | athen | athena ) val=athena ;;
|
|
|
|
m | mo | mot | moti | motif ) val=motif ;;
|
|
|
|
g | gt | gtk ) val=gtk ;;
|
2012-09-12 20:21:39 +00:00
|
|
|
gtk2 ) val=gtk2 ;;
|
2010-12-03 14:45:09 +00:00
|
|
|
gtk3 ) val=gtk3 ;;
|
|
|
|
* )
|
|
|
|
AC_MSG_ERROR([`--with-x-toolkit=$withval' is invalid;
|
2012-09-12 20:21:39 +00:00
|
|
|
this option's value should be `yes', `no', `lucid', `athena', `motif', `gtk',
|
|
|
|
`gtk2' or `gtk3'. `yes' and `gtk' are synonyms.
|
|
|
|
`athena' and `lucid' are synonyms.])
|
2010-12-03 14:45:09 +00:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
with_x_toolkit=$val
|
|
|
|
])
|
|
|
|
|
2011-06-07 04:16:37 +00:00
|
|
|
OPTION_DEFAULT_OFF([wide-int], [prefer wide Emacs integers (typically 62-bit)])
|
|
|
|
if test "$with_wide_int" = yes; then
|
|
|
|
AC_DEFINE([WIDE_EMACS_INT], 1, [Use long long for EMACS_INT if available.])
|
|
|
|
fi
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
dnl _ON results in a '--without' option in the --help output, so
|
|
|
|
dnl the help text should refer to "don't compile", etc.
|
2014-06-07 06:10:39 +00:00
|
|
|
with_xpm_set=${with_xpm+set}
|
2010-12-03 14:45:09 +00:00
|
|
|
OPTION_DEFAULT_ON([xpm],[don't compile with XPM image support])
|
|
|
|
OPTION_DEFAULT_ON([jpeg],[don't compile with JPEG image support])
|
|
|
|
OPTION_DEFAULT_ON([tiff],[don't compile with TIFF image support])
|
|
|
|
OPTION_DEFAULT_ON([gif],[don't compile with GIF image support])
|
|
|
|
OPTION_DEFAULT_ON([png],[don't compile with PNG image support])
|
|
|
|
OPTION_DEFAULT_ON([rsvg],[don't compile with SVG image support])
|
|
|
|
OPTION_DEFAULT_ON([xml2],[don't compile with XML parsing support])
|
|
|
|
OPTION_DEFAULT_ON([imagemagick],[don't compile with ImageMagick image support])
|
|
|
|
|
|
|
|
OPTION_DEFAULT_ON([xft],[don't use XFT for anti aliased fonts])
|
|
|
|
OPTION_DEFAULT_ON([libotf],[don't use libotf for OpenType font support])
|
|
|
|
OPTION_DEFAULT_ON([m17n-flt],[don't use m17n-flt for text shaping])
|
|
|
|
|
|
|
|
OPTION_DEFAULT_ON([toolkit-scroll-bars],[don't use Motif or Xaw3d scroll bars])
|
|
|
|
OPTION_DEFAULT_ON([xaw3d],[don't use Xaw3d])
|
|
|
|
OPTION_DEFAULT_ON([xim],[don't use X11 XIM])
|
2011-03-03 08:03:01 +00:00
|
|
|
OPTION_DEFAULT_OFF([ns],[use NeXTstep (Cocoa or GNUstep) windowing system])
|
2012-11-22 17:32:57 +00:00
|
|
|
OPTION_DEFAULT_OFF([w32], [use native MS Windows GUI in a Cygwin build])
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
OPTION_DEFAULT_ON([gpm],[don't use -lgpm for mouse support on a GNU/Linux console])
|
|
|
|
OPTION_DEFAULT_ON([dbus],[don't compile with D-Bus support])
|
|
|
|
OPTION_DEFAULT_ON([gconf],[don't compile with GConf support])
|
2011-06-30 14:00:26 +00:00
|
|
|
OPTION_DEFAULT_ON([gsettings],[don't compile with GSettings support])
|
2010-12-03 14:45:09 +00:00
|
|
|
OPTION_DEFAULT_ON([selinux],[don't compile with SELinux support])
|
|
|
|
OPTION_DEFAULT_ON([gnutls],[don't use -lgnutls for SSL/TLS support])
|
2013-08-11 22:58:47 +00:00
|
|
|
OPTION_DEFAULT_ON([zlib],[don't compile with zlib decompression support])
|
2013-06-03 13:03:05 +00:00
|
|
|
|
|
|
|
AC_ARG_WITH([file-notification],[AS_HELP_STRING([--with-file-notification=LIB],
|
|
|
|
[use a file notification library (LIB one of: yes, gfile, inotify, w32, no)])],
|
|
|
|
[ case "${withval}" in
|
|
|
|
y | ye | yes ) val=yes ;;
|
|
|
|
n | no ) val=no ;;
|
|
|
|
g | gf | gfi | gfil | gfile ) val=gfile ;;
|
|
|
|
i | in | ino | inot | inoti | inotif | inotify ) val=inotify ;;
|
|
|
|
w | w3 | w32 ) val=w32 ;;
|
|
|
|
* ) AC_MSG_ERROR([`--with-file-notification=$withval' is invalid;
|
|
|
|
this option's value should be `yes', `no', `gfile', `inotify' or `w32'.
|
2013-07-12 17:36:42 +00:00
|
|
|
`yes' is a synonym for `w32' on MS-Windows, for `no' on Nextstep,
|
|
|
|
otherwise for the first of `gfile' or `inotify' that is usable.])
|
2013-06-03 13:03:05 +00:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
with_file_notification=$val
|
|
|
|
],
|
2013-06-11 18:05:05 +00:00
|
|
|
[with_file_notification=$with_features])
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
## For the times when you want to build Emacs but don't have
|
|
|
|
## a suitable makeinfo, and can live without the manuals.
|
|
|
|
dnl http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg01844.html
|
|
|
|
OPTION_DEFAULT_ON([makeinfo],[don't require makeinfo for building manuals])
|
|
|
|
|
2014-05-16 15:49:13 +00:00
|
|
|
## This might be a 'configure' arg.
|
2014-05-03 16:27:17 +00:00
|
|
|
AC_SUBST([ACLOCAL_PATH])
|
|
|
|
|
2011-12-03 20:19:03 +00:00
|
|
|
## Makefile.in needs the cache file name.
|
|
|
|
AC_SUBST(cache_file)
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
## This is an option because I do not know if all info/man support
|
|
|
|
## compressed files, nor how to test if they do so.
|
2013-09-08 23:50:23 +00:00
|
|
|
OPTION_DEFAULT_ON([compress-install],
|
|
|
|
[don't compress some files (.el, .info, etc.) when installing. Equivalent to:
|
|
|
|
make GZIP_PROG= install])
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2010-12-29 11:11:25 +00:00
|
|
|
AC_ARG_WITH(gameuser,dnl
|
|
|
|
[AS_HELP_STRING([--with-gameuser=USER],[user for shared game score files])])
|
|
|
|
test "X${with_gameuser}" != X && test "${with_gameuser}" != yes \
|
|
|
|
&& gameuser="${with_gameuser}"
|
|
|
|
test "X$gameuser" = X && gameuser=games
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_ARG_WITH([gnustep-conf],dnl
|
2012-12-09 02:22:39 +00:00
|
|
|
[AS_HELP_STRING([--with-gnustep-conf=FILENAME],
|
|
|
|
[name of GNUstep.conf; default $GNUSTEP_CONFIG_FILE, or /etc/GNUstep/GNUstep.conf])])
|
2010-12-03 14:45:09 +00:00
|
|
|
test "X${with_gnustep_conf}" != X && test "${with_gnustep_conf}" != yes && \
|
|
|
|
GNUSTEP_CONFIG_FILE="${with_gnustep_conf}"
|
|
|
|
test "X$GNUSTEP_CONFIG_FILE" = "X" && \
|
|
|
|
GNUSTEP_CONFIG_FILE=/etc/GNUstep/GNUstep.conf
|
|
|
|
|
|
|
|
AC_ARG_ENABLE(ns-self-contained,
|
|
|
|
[AS_HELP_STRING([--disable-ns-self-contained],
|
|
|
|
[disable self contained build under NeXTstep])],
|
|
|
|
EN_NS_SELF_CONTAINED=$enableval,
|
|
|
|
EN_NS_SELF_CONTAINED=yes)
|
|
|
|
|
|
|
|
AC_ARG_ENABLE(locallisppath,
|
|
|
|
[AS_HELP_STRING([--enable-locallisppath=PATH],
|
|
|
|
[directories Emacs should search for lisp files specific
|
|
|
|
to this site])],
|
|
|
|
if test "${enableval}" = "no"; then
|
|
|
|
locallisppath=
|
|
|
|
elif test "${enableval}" != "yes"; then
|
|
|
|
locallisppath=${enableval}
|
|
|
|
fi)
|
|
|
|
|
|
|
|
AC_ARG_ENABLE(checking,
|
|
|
|
[AS_HELP_STRING([--enable-checking@<:@=LIST@:>@],
|
|
|
|
[enable expensive run-time checks. With LIST,
|
|
|
|
enable only specific categories of checks.
|
|
|
|
Categories are: all,yes,no.
|
|
|
|
Flags are: stringbytes, stringoverrun, stringfreelist,
|
2012-06-28 07:50:50 +00:00
|
|
|
xmallocoverrun, conslist, glyphs])],
|
2010-12-03 14:45:09 +00:00
|
|
|
[ac_checking_flags="${enableval}"],[])
|
|
|
|
IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="$IFS,"
|
|
|
|
for check in $ac_checking_flags
|
|
|
|
do
|
|
|
|
case $check in
|
|
|
|
# these set all the flags to specific states
|
|
|
|
yes) ac_enable_checking=1 ;;
|
|
|
|
no) ac_enable_checking= ;
|
|
|
|
ac_gc_check_stringbytes= ;
|
|
|
|
ac_gc_check_string_overrun= ;
|
|
|
|
ac_gc_check_string_free_list= ;
|
|
|
|
ac_xmalloc_overrun= ;
|
2012-06-28 07:50:50 +00:00
|
|
|
ac_gc_check_cons_list= ;
|
2012-06-28 16:34:05 +00:00
|
|
|
ac_glyphs_debug= ;;
|
2010-12-03 14:45:09 +00:00
|
|
|
all) ac_enable_checking=1 ;
|
|
|
|
ac_gc_check_stringbytes=1 ;
|
|
|
|
ac_gc_check_string_overrun=1 ;
|
|
|
|
ac_gc_check_string_free_list=1 ;
|
|
|
|
ac_xmalloc_overrun=1 ;
|
2012-06-28 07:50:50 +00:00
|
|
|
ac_gc_check_cons_list=1 ;
|
2012-06-28 16:34:05 +00:00
|
|
|
ac_glyphs_debug=1 ;;
|
2010-12-03 14:45:09 +00:00
|
|
|
# these enable particular checks
|
|
|
|
stringbytes) ac_gc_check_stringbytes=1 ;;
|
|
|
|
stringoverrun) ac_gc_check_string_overrun=1 ;;
|
|
|
|
stringfreelist) ac_gc_check_string_free_list=1 ;;
|
|
|
|
xmallocoverrun) ac_xmalloc_overrun=1 ;;
|
|
|
|
conslist) ac_gc_check_cons_list=1 ;;
|
2012-06-28 16:34:05 +00:00
|
|
|
glyphs) ac_glyphs_debug=1 ;;
|
2010-12-03 14:45:09 +00:00
|
|
|
*) AC_MSG_ERROR(unknown check category $check) ;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
IFS="$ac_save_IFS"
|
|
|
|
|
|
|
|
if test x$ac_enable_checking != x ; then
|
|
|
|
AC_DEFINE(ENABLE_CHECKING, 1,
|
2012-06-28 07:50:27 +00:00
|
|
|
[Define to 1 if expensive run-time data type and consistency checks are enabled.])
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
if test x$ac_gc_check_stringbytes != x ; then
|
|
|
|
AC_DEFINE(GC_CHECK_STRING_BYTES, 1,
|
|
|
|
[Define this temporarily to hunt a bug. If defined, the size of
|
|
|
|
strings is redundantly recorded in sdata structures so that it can
|
|
|
|
be compared to the sizes recorded in Lisp strings.])
|
|
|
|
fi
|
2011-04-27 02:17:44 +00:00
|
|
|
if test x$ac_gc_check_string_overrun != x ; then
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_DEFINE(GC_CHECK_STRING_OVERRUN, 1,
|
|
|
|
[Define this to check for short string overrun.])
|
|
|
|
fi
|
|
|
|
if test x$ac_gc_check_string_free_list != x ; then
|
|
|
|
AC_DEFINE(GC_CHECK_STRING_FREE_LIST, 1,
|
|
|
|
[Define this to check the string free list.])
|
|
|
|
fi
|
|
|
|
if test x$ac_xmalloc_overrun != x ; then
|
|
|
|
AC_DEFINE(XMALLOC_OVERRUN_CHECK, 1,
|
|
|
|
[Define this to check for malloc buffer overrun.])
|
|
|
|
fi
|
|
|
|
if test x$ac_gc_check_cons_list != x ; then
|
|
|
|
AC_DEFINE(GC_CHECK_CONS_LIST, 1,
|
|
|
|
[Define this to check for errors in cons list.])
|
|
|
|
fi
|
2012-06-28 16:34:05 +00:00
|
|
|
if test x$ac_glyphs_debug != x ; then
|
2012-06-28 07:50:50 +00:00
|
|
|
AC_DEFINE(GLYPH_DEBUG, 1,
|
|
|
|
[Define this to enable glyphs debugging code.])
|
|
|
|
fi
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2012-06-13 13:40:48 +00:00
|
|
|
AC_ARG_ENABLE(check-lisp-object-type,
|
|
|
|
[AS_HELP_STRING([--enable-check-lisp-object-type],
|
|
|
|
[enable compile time checks for the Lisp_Object data type.
|
|
|
|
This is useful for development for catching certain types of bugs.])],
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "${enableval}" != "no"; then
|
2012-06-13 13:40:48 +00:00
|
|
|
AC_DEFINE(CHECK_LISP_OBJECT_TYPE, 1,
|
|
|
|
[Define this to enable compile time checks for the Lisp_Object data type.])
|
2010-12-03 14:45:09 +00:00
|
|
|
fi)
|
|
|
|
|
|
|
|
|
2012-11-24 16:16:33 +00:00
|
|
|
dnl The name of this option is unfortunate. It predates, and has no
|
|
|
|
dnl relation to, the "sampling-based elisp profiler" added in 24.3.
|
|
|
|
dnl Actually, it stops it working.
|
|
|
|
dnl http://lists.gnu.org/archive/html/emacs-devel/2012-11/msg00393.html
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_ARG_ENABLE(profiling,
|
|
|
|
[AS_HELP_STRING([--enable-profiling],
|
2012-11-24 16:16:33 +00:00
|
|
|
[build emacs with low-level, gprof profiling support.
|
|
|
|
Mainly useful for debugging Emacs itself. May not work on
|
|
|
|
all platforms. Stops profiler.el working.])],
|
2010-12-03 14:45:09 +00:00
|
|
|
[ac_enable_profiling="${enableval}"],[])
|
|
|
|
if test x$ac_enable_profiling != x ; then
|
|
|
|
PROFILING_CFLAGS="-DPROFILING=1 -pg"
|
|
|
|
else
|
|
|
|
PROFILING_CFLAGS=
|
|
|
|
fi
|
|
|
|
AC_SUBST(PROFILING_CFLAGS)
|
|
|
|
|
|
|
|
AC_ARG_ENABLE(autodepend,
|
|
|
|
[AS_HELP_STRING([--enable-autodepend],
|
|
|
|
[automatically generate dependencies to .h-files.
|
2014-03-27 19:41:57 +00:00
|
|
|
Requires gcc, enabled if found.])],
|
2010-12-03 14:45:09 +00:00
|
|
|
[ac_enable_autodepend="${enableval}"],[ac_enable_autodepend=yes])
|
|
|
|
|
2012-12-30 19:34:25 +00:00
|
|
|
AC_ARG_ENABLE(gtk-deprecation-warnings,
|
|
|
|
[AS_HELP_STRING([--enable-gtk-deprecation-warnings],
|
|
|
|
[Show Gtk+/Gdk deprecation warnings for Gtk+ >= 3.0])],
|
|
|
|
[ac_enable_gtk_deprecation_warnings="${enableval}"],[])
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
dnl This used to use changequote, but, apart from `changequote is evil'
|
|
|
|
dnl per the autoconf manual, we can speed up autoconf somewhat by quoting
|
|
|
|
dnl the great gob of text. Thus it's not processed for possible expansion.
|
|
|
|
dnl Just make sure the brackets remain balanced.
|
|
|
|
dnl
|
|
|
|
dnl Since Emacs can't find matching pairs of quotes, boundaries are
|
|
|
|
dnl indicated by comments.
|
|
|
|
dnl quotation begins
|
|
|
|
[
|
|
|
|
|
|
|
|
### If you add support for a new configuration, add code to this
|
|
|
|
### switch statement to recognize your configuration name and select
|
2014-02-25 18:28:59 +00:00
|
|
|
### the appropriate opsys.
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
### As far as handling version numbers on operating systems is
|
|
|
|
### concerned, make sure things will fail in a fixable way. If
|
|
|
|
### /etc/MACHINES doesn't say anything about version numbers, be
|
|
|
|
### prepared to handle anything reasonably. If version numbers
|
|
|
|
### matter, be sure /etc/MACHINES says something about it.
|
|
|
|
|
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 16:20:27 +00:00
|
|
|
opsys='' unported=no
|
2010-12-03 14:45:09 +00:00
|
|
|
case "${canonical}" in
|
|
|
|
|
2011-08-30 20:41:54 +00:00
|
|
|
## GNU/Linux and similar ports
|
|
|
|
*-*-linux* )
|
2010-12-04 19:50:39 +00:00
|
|
|
opsys=gnu-linux
|
|
|
|
;;
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
## FreeBSD ports
|
|
|
|
*-*-freebsd* )
|
|
|
|
opsys=freebsd
|
|
|
|
;;
|
|
|
|
|
2013-04-18 17:12:21 +00:00
|
|
|
## DragonFly ports
|
|
|
|
*-*-dragonfly* )
|
|
|
|
opsys=dragonfly
|
|
|
|
;;
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
## FreeBSD kernel + glibc based userland
|
|
|
|
*-*-kfreebsd*gnu* )
|
|
|
|
opsys=gnu-kfreebsd
|
|
|
|
;;
|
|
|
|
|
|
|
|
## NetBSD ports
|
|
|
|
*-*-netbsd* )
|
|
|
|
opsys=netbsd
|
|
|
|
;;
|
|
|
|
|
|
|
|
## OpenBSD ports
|
2014-04-29 14:49:11 +00:00
|
|
|
*-*-openbsd* | *-*-mirbsd* )
|
2010-12-03 14:45:09 +00:00
|
|
|
opsys=openbsd
|
|
|
|
;;
|
|
|
|
|
|
|
|
## Apple Darwin / Mac OS X
|
|
|
|
*-apple-darwin* )
|
|
|
|
case "${canonical}" in
|
2014-10-15 17:42:05 +00:00
|
|
|
*-apple-darwin[0-9].*) unported=yes ;;
|
2014-10-17 18:05:48 +00:00
|
|
|
i[3456]86-* | x86_64-* ) ;;
|
|
|
|
* ) unported=yes ;;
|
2014-10-15 17:42:05 +00:00
|
|
|
esac
|
2010-12-03 14:45:09 +00:00
|
|
|
opsys=darwin
|
2012-05-18 07:14:45 +00:00
|
|
|
## Use fink packages if available.
|
|
|
|
## FIXME find a better way to do this: http://debbugs.gnu.org/11507
|
|
|
|
## if test -d /sw/include && test -d /sw/lib; then
|
|
|
|
## GCC_TEST_OPTIONS="-I/sw/include -L/sw/lib"
|
|
|
|
## NON_GCC_TEST_OPTIONS=${GCC_TEST_OPTIONS}
|
|
|
|
## fi
|
2010-12-03 14:45:09 +00:00
|
|
|
;;
|
|
|
|
|
2013-04-12 13:00:57 +00:00
|
|
|
## Cygwin ports
|
|
|
|
*-*-cygwin )
|
|
|
|
opsys=cygwin
|
|
|
|
;;
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
## HP 9000 series 700 and 800, running HP/UX
|
|
|
|
hppa*-hp-hpux10.2* )
|
2010-12-04 19:50:39 +00:00
|
|
|
opsys=hpux10-20
|
2010-12-03 14:45:09 +00:00
|
|
|
;;
|
|
|
|
hppa*-hp-hpux1[1-9]* )
|
2010-12-04 19:50:39 +00:00
|
|
|
opsys=hpux11
|
2010-12-03 14:45:09 +00:00
|
|
|
CFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CFLAGS"
|
|
|
|
;;
|
|
|
|
|
|
|
|
## IBM machines
|
|
|
|
rs6000-ibm-aix4.[23]* )
|
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 16:20:27 +00:00
|
|
|
opsys=aix4-2
|
2010-12-03 14:45:09 +00:00
|
|
|
;;
|
|
|
|
powerpc-ibm-aix4.[23]* )
|
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 16:20:27 +00:00
|
|
|
opsys=aix4-2
|
2010-12-03 14:45:09 +00:00
|
|
|
;;
|
|
|
|
rs6000-ibm-aix[56]* )
|
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 16:20:27 +00:00
|
|
|
opsys=aix4-2
|
2010-12-03 14:45:09 +00:00
|
|
|
;;
|
2014-05-22 05:00:39 +00:00
|
|
|
powerpc-ibm-aix[5-9]* | powerpc-ibm-aix[1-9][0-9]* )
|
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 16:20:27 +00:00
|
|
|
opsys=aix4-2
|
2010-12-03 14:45:09 +00:00
|
|
|
;;
|
|
|
|
|
|
|
|
## Silicon Graphics machines
|
|
|
|
## Iris 4D
|
|
|
|
mips-sgi-irix6.5 )
|
2011-07-07 03:24:33 +00:00
|
|
|
opsys=irix6-5
|
2010-12-03 14:45:09 +00:00
|
|
|
# Without defining _LANGUAGE_C, things get masked out in the headers
|
|
|
|
# so that, for instance, grepping for `free' in stdlib.h fails and
|
|
|
|
# AC_HEADER_STD_C fails. (MIPSPro 7.2.1.2m compilers, Irix 6.5.3m).
|
|
|
|
NON_GCC_TEST_OPTIONS="-D_LANGUAGE_C"
|
|
|
|
;;
|
|
|
|
|
|
|
|
## Suns
|
|
|
|
*-sun-solaris* \
|
|
|
|
| i[3456]86-*-solaris2* | i[3456]86-*-sunos5* \
|
|
|
|
| x86_64-*-solaris2* | x86_64-*-sunos5*)
|
|
|
|
case "${canonical}" in
|
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 16:20:27 +00:00
|
|
|
i[3456]86-*-* ) ;;
|
|
|
|
amd64-*-*|x86_64-*-*) ;;
|
|
|
|
sparc* ) ;;
|
2010-12-03 14:45:09 +00:00
|
|
|
* ) unported=yes ;;
|
|
|
|
esac
|
|
|
|
case "${canonical}" in
|
2014-03-05 02:39:05 +00:00
|
|
|
*-sunos5.[1-9][0-9]* | *-solaris2.[1-9][0-9]* )
|
|
|
|
opsys=sol2-10
|
|
|
|
emacs_check_sunpro_c=yes
|
|
|
|
;;
|
2014-05-29 01:36:44 +00:00
|
|
|
*-sunos5.[1-5]* | *-solaris2.[1-5]* ) unported=yes ;;
|
|
|
|
## Note that Emacs 23.1's NEWS said the following would be dropped.
|
2010-12-03 14:45:09 +00:00
|
|
|
*-sunos5.6* | *-solaris2.6* )
|
|
|
|
opsys=sol2-6
|
|
|
|
RANLIB="ar -ts"
|
|
|
|
;;
|
2014-05-29 01:36:44 +00:00
|
|
|
## 5.7 EOL Aug 2008, 5.8 EOL Mar 2012.
|
2010-12-03 14:45:09 +00:00
|
|
|
*-sunos5.[7-9]* | *-solaris2.[7-9]* )
|
|
|
|
opsys=sol2-6
|
|
|
|
emacs_check_sunpro_c=yes
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
## Watch out for a compiler that we know will not work.
|
|
|
|
case "${canonical}" in
|
|
|
|
*-solaris* | *-sunos5* )
|
|
|
|
if [ "x$CC" = x/usr/ucb/cc ]; then
|
|
|
|
## /usr/ucb/cc doesn't work;
|
|
|
|
## we should find some other compiler that does work.
|
|
|
|
unset CC
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
*) ;;
|
|
|
|
esac
|
|
|
|
;;
|
|
|
|
|
|
|
|
## Intel 386 machines where we don't care about the manufacturer.
|
|
|
|
i[3456]86-*-* )
|
|
|
|
case "${canonical}" in
|
2012-05-16 06:15:52 +00:00
|
|
|
*-darwin* ) opsys=darwin ;;
|
2014-08-23 08:48:30 +00:00
|
|
|
*-mingw* )
|
2012-11-23 15:22:47 +00:00
|
|
|
opsys=mingw32
|
2012-11-24 16:02:07 +00:00
|
|
|
# MinGW overrides and adds some system headers in nt/inc.
|
2013-03-28 19:19:19 +00:00
|
|
|
GCC_TEST_OPTIONS="-I $srcdir/nt/inc"
|
2012-11-23 15:22:47 +00:00
|
|
|
;;
|
* 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 09:01:55 +00:00
|
|
|
*-sysv4.2uw* ) opsys=unixware ;;
|
|
|
|
*-sysv5uw* ) opsys=unixware ;;
|
|
|
|
*-sysv5OpenUNIX* ) opsys=unixware ;;
|
2010-12-03 14:45:09 +00:00
|
|
|
## Otherwise, we'll fall through to the generic opsys code at the bottom.
|
|
|
|
esac
|
|
|
|
;;
|
|
|
|
|
2013-12-31 16:01:34 +00:00
|
|
|
# MinGW64
|
|
|
|
x86_64-*-* )
|
|
|
|
case "${canonical}" in
|
2014-08-23 08:48:30 +00:00
|
|
|
*-mingw* )
|
2013-12-31 16:01:34 +00:00
|
|
|
opsys=mingw32
|
|
|
|
# MinGW overrides and adds some system headers in nt/inc.
|
|
|
|
GCC_TEST_OPTIONS="-I $srcdir/nt/inc"
|
|
|
|
;;
|
|
|
|
## Otherwise, we'll fall through to the generic opsys code at the bottom.
|
|
|
|
esac
|
|
|
|
;;
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
* )
|
|
|
|
unported=yes
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
### If the code above didn't choose an operating system, just choose
|
|
|
|
### an operating system based on the configuration name. You really
|
|
|
|
### only want to use this when you have no idea what the right
|
|
|
|
### operating system is; if you know what operating systems a machine
|
|
|
|
### runs, it's cleaner to make it explicit in the case statement
|
|
|
|
### above.
|
|
|
|
if test x"${opsys}" = x; then
|
|
|
|
case "${canonical}" in
|
|
|
|
*-gnu* ) opsys=gnu ;;
|
|
|
|
* )
|
|
|
|
unported=yes
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
|
|
|
|
]
|
|
|
|
dnl quotation ends
|
|
|
|
|
|
|
|
if test $unported = yes; then
|
2014-03-05 20:35:38 +00:00
|
|
|
AC_MSG_ERROR([Emacs does not support `${canonical}' systems.
|
2014-03-28 23:11:39 +00:00
|
|
|
If you think it should, please send a report to ${PACKAGE_BUGREPORT}.
|
2010-12-03 14:45:09 +00:00
|
|
|
Check `etc/MACHINES' for recognized configuration names.])
|
|
|
|
fi
|
|
|
|
|
|
|
|
#### Choose a compiler.
|
2012-05-16 06:15:52 +00:00
|
|
|
|
2014-05-17 08:11:31 +00:00
|
|
|
dnl Don't bother to test for C89.
|
|
|
|
AC_DEFUN([_AC_PROG_CC_C89], [$2])
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
dnl Sets GCC=yes if using gcc.
|
2013-12-28 10:37:53 +00:00
|
|
|
AC_PROG_CC([gcc cc cl clang "$XCRUN gcc" "$XCRUN clang"])
|
2013-12-27 19:14:10 +00:00
|
|
|
if test -n "$XCRUN"; then
|
2013-12-27 16:57:52 +00:00
|
|
|
AC_CHECK_PROGS(AR, [ar "$XCRUN ar"])
|
2013-12-27 19:14:10 +00:00
|
|
|
test -n "$AR" && export AR
|
2013-12-27 16:57:52 +00:00
|
|
|
fi
|
2013-12-28 10:37:53 +00:00
|
|
|
|
2014-05-17 08:11:31 +00:00
|
|
|
dnl Emacs needs C99 or later.
|
|
|
|
gl_PROG_CC_C99
|
|
|
|
|
2011-01-08 21:02:38 +00:00
|
|
|
AM_PROG_CC_C_O
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
if test x$GCC = xyes; then
|
|
|
|
test "x$GCC_TEST_OPTIONS" != x && CC="$CC $GCC_TEST_OPTIONS"
|
|
|
|
else
|
|
|
|
test "x$NON_GCC_TEST_OPTIONS" != x && CC="$CC $NON_GCC_TEST_OPTIONS"
|
|
|
|
fi
|
|
|
|
|
2013-03-31 14:04:49 +00:00
|
|
|
dnl This is used in lib/Makefile.am to use nt/gnulib.mk, the
|
|
|
|
dnl alternative to lib/gnulib.mk, so as to avoid generating header files
|
|
|
|
dnl that clash with MinGW.
|
|
|
|
AM_CONDITIONAL([BUILDING_FOR_WINDOWSNT], [test "x$opsys" = "xmingw32"])
|
|
|
|
|
2013-12-11 05:37:30 +00:00
|
|
|
# Avoid gnulib's tests for -lcrypto, so that there's no static dependency on it.
|
|
|
|
AC_DEFUN([gl_CRYPTO_CHECK])
|
FILE's lock is now always .#FILE and may be a regular file.
* etc/NEWS: Document this.
* nt/inc/unistd.h (O_NOFOLLOW): New macro.
* src/filelock.c: Include <c-ctype.h>.
(MAX_LFINFO): New top-level constant.
(lock_info_type): Remove members pid, boot_time. Add members at,
dot, colon. Change user member to be the entire buffer, not a
pointer. This allows us to handle the case where a foreign
pid or boot time exceeds the local range. All uses changed.
(LINKS_MIGHT_NOT_WORK): New constant.
(FREE_LOCK_INFO): Remove, as the pieces no longer need freeing.
(defined_WINDOWSNT): Remove.
(MAKE_LOCK_NAME, file_in_lock_file_name):
Always use .#FILE (not .#-FILE) for the file lock,
even if it is a regular file.
(rename_lock_file): New function.
(create_lock_file): Use it.
(create_lock_file, read_lock_data):
Prefer a symbolic link for the lock file, falling back on a
regular file if symlinks don't work. Do not try to create
symlinks on MS-Windows, due to security hassles. Stick with
POSIXish functions (open, read, write, close, fchmod, readlink, symlink,
link, rename, unlink, mkstemp) when creating locks, as a GNUish
host may be using a Windowsish file system, and cannot use
MS-Windows-only system calls. Fall back on mktemp if mkstemp
doesn't work. Don't fail merely because of a symlink-contents
length limit in the current file system; fall back on regular
files. Increase the symlink contents length limit to 8 KiB, this
should be big enough for any real use and doesn't crunch the
stack.
(create_lock_file, lock_file_1, read_lock_data):
Simplify allocation of lock file buffers now that they fit in 8 KiB.
(lock_file_1): Return error number, not bool. All callers changed.
(ELOOP): New macro, if not already defined.
(read_lock_data): Return size of lock file contents, not Lisp object.
All callers changed. Handle a race condition if some other process
replaces a regular-file lock with a symlink lock or vice versa,
while we're trying to read the lock.
(current_lock_owner): Parse contents more carefully, to help avoid
confusing a regular-file lock with some other application's use
of the file. Check for lock file contents being too long, or
not parsing correctly.
(current_lock_owner, lock_file):
Allow foreign pid and boot times that exceed the local range.
(current_lock_owner, lock_if_free, lock_file):
Simplify allocation of lock file contents.
* src/w32.c (sys_rename_replace): New function, containing most of
the contents of the old sys_rename.
(sys_rename): Use it.
(fchmod): New dummy function.
* src/w32.h (sys_rename_replace, fchmod): New decls.
Fixes: debbugs:13807
2013-03-05 22:35:41 +00:00
|
|
|
# Avoid gnulib's tests for HAVE_WORKING_O_NOATIME and HAVE_WORKING_O_NOFOLLOW,
|
|
|
|
# as we don't use them.
|
Use faccessat, not access, when checking file permissions.
This fixes a bug that has been present in Emacs since its creation.
It was reported by Chris Torek in 1983 even before GNU Emacs existed,
which must set some sort of record. (Torek's bug report was against
a predecessor of GNU Emacs, but GNU Emacs happened to have the
same common flaw.) See Torek's Usenet posting
"setuid/setgid programs & Emacs" Article-I.D.: sri-arpa.858
Posted: Fri Apr 8 14:18:56 1983.
* .bzrignore: Add lib/fcntl.h.
* configure.ac (euidaccess): Remove check; gnulib does this for us now.
(gl_FCNTL_O_FLAGS): Define a dummy version.
* lib/at-func.c, lib/euidaccess.c, lib/faccessat.c, lib/fcntl.in.h:
* lib/getgroups.c, lib/group-member.c, lib/root-uid.h:
* lib/xalloc-oversized.h, m4/euidaccess.m4, m4/faccessat.m4:
* m4/fcntl_h.m4, m4/getgroups.m4, m4/group-member.m4:
New files, from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* admin/merge-gnulib (GNULIB_MODULES): Add faccessat.
(GNULIB_TOOL_FLAGS): Avoid at-internal, fchdir, malloc-posix,
openat-die, openat-h, save-cwd. Do not avoid fcntl-h.
Omit gnulib's m4/fcntl-o.m4.
* nt/inc/ms-w32.h (AT_FDCWD, AT_EACCESS): New symbols.
(access): Remove.
(faccessat): New macro.
* src/Makefile.in (LIB_EACCESS): New macro.
(LIBES): Use it.
* src/callproc.c (init_callproc):
* src/charset.c (init_charset):
* src/fileio.c (check_existing, check_executable, check_writable)
(Ffile_readable_p):
* src/lread.c (openp, load_path_check):
* src/process.c (allocate_pty):
* src/xrdb.c (file_p):
Use effective UID when checking permissions, not real UID.
* src/callproc.c (init_callproc):
* src/charset.c (init_charset):
* src/lread.c (load_path_check, init_lread):
Test whether directories are accessible, not merely whether they exist.
* src/conf_post.h (GNULIB_SUPPORT_ONLY_AT_FDCWD): New macro.
* src/fileio.c (check_existing, check_executable, check_writable)
(Ffile_readable_p):
Use symbolic names instead of integers for the flags, as they're
portable now.
(check_writable): New arg AMODE. All uses changed.
Set errno on failure.
(Ffile_readable_p): Use faccessat, not stat + open + close.
(Ffile_writable_p): No need to call check_existing + check_writable.
Just call check_writable and then look at errno. This saves a syscall.
dir should never be nil; replace an unnecessary runtime check
with an eassert. When checking the parent directory of a nonexistent
file, check that the directory is searchable as well as writable, as
we can't create files in unsearchable directories.
(file_directory_p): New function, which uses 'stat' on most platforms
but faccessat with D_OK (for efficiency) if WINDOWSNT.
(Ffile_directory_p, Fset_file_times): Use it.
(file_accessible_directory_p): New function, which uses a single
syscall for efficiency.
(Ffile_accessible_directory_p): Use it.
* src/xrdb.c (file_p): Use file_directory_p.
* src/lisp.h (file_directory_p, file_accessible_directory_p): New decls.
* src/lread.c (openp): When opening a file, use fstat rather than
stat, as that avoids a permissions race. When not opening a file,
use file_directory_p rather than stat.
(dir_warning): First arg is now a usage string, not a format.
Use errno. All uses changed.
* src/nsterm.m (ns_term_init): Remove unnecessary call to file-readable
that merely introduced a race.
* src/process.c, src/sysdep.c, src/term.c: All uses of '#ifdef O_NONBLOCK'
changed to '#if O_NONBLOCK', to accommodate gnulib O_* style,
and similarly for the other O_* flags.
* src/w32.c (sys_faccessat): Rename from sys_access and switch to
faccessat's API. All uses changed.
* src/xrdb.c: Do not include <sys/stat.h>; no longer needed.
(magic_db): Rename from magic_file_p.
(magic_db, search_magic_path): Return an XrmDatabase rather than a
char *, so that we don't have to test for file existence
separately from opening the file for reading. This removes a race
fixes a permission-checking problem, and simplifies the code.
All uses changed.
(file_p): Remove; no longer needed.
Fixes: debbugs:12632
2012-11-14 04:55:41 +00:00
|
|
|
AC_DEFUN([gl_FCNTL_O_FLAGS])
|
2012-09-27 01:06:23 +00:00
|
|
|
|
* 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 09:01:55 +00:00
|
|
|
# Initialize gnulib right after choosing the compiler.
|
2012-10-06 00:44:36 +00:00
|
|
|
dnl Amongst other things, this sets AR and ARFLAGS.
|
* 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 09:01:55 +00:00
|
|
|
gl_EARLY
|
|
|
|
|
2012-08-26 04:37:40 +00:00
|
|
|
if test "$ac_test_CFLAGS" != set; then
|
2013-04-26 19:31:09 +00:00
|
|
|
# It's helpful to have C macros available to GDB, so prefer -g3 to -g
|
|
|
|
# if -g3 works and the user does not specify CFLAGS.
|
|
|
|
# This test must follow gl_EARLY; otherwise AC_LINK_IFELSE complains.
|
2012-08-26 04:37:40 +00:00
|
|
|
case $CFLAGS in
|
|
|
|
'-g')
|
|
|
|
emacs_g3_CFLAGS='-g3';;
|
|
|
|
'-g -O2')
|
|
|
|
emacs_g3_CFLAGS='-g3 -O2';;
|
|
|
|
*)
|
|
|
|
emacs_g3_CFLAGS='';;
|
|
|
|
esac
|
|
|
|
if test -n "$emacs_g3_CFLAGS"; then
|
|
|
|
emacs_save_CFLAGS=$CFLAGS
|
|
|
|
CFLAGS=$emacs_g3_CFLAGS
|
|
|
|
AC_CACHE_CHECK([whether $CC accepts $emacs_g3_CFLAGS],
|
|
|
|
[emacs_cv_prog_cc_g3],
|
|
|
|
[AC_LINK_IFELSE([AC_LANG_PROGRAM()],
|
|
|
|
[emacs_cv_prog_cc_g3=yes],
|
2013-04-26 19:31:09 +00:00
|
|
|
[emacs_cv_prog_cc_g3=no])])
|
|
|
|
if test $emacs_cv_prog_cc_g3 != yes; then
|
2012-08-26 04:37:40 +00:00
|
|
|
CFLAGS=$emacs_save_CFLAGS
|
|
|
|
fi
|
2013-04-01 13:51:33 +00:00
|
|
|
if test $opsys = mingw32; then
|
|
|
|
CFLAGS="$CFLAGS -gdwarf-2"
|
|
|
|
fi
|
2012-08-26 04:37:40 +00:00
|
|
|
fi
|
2013-04-26 19:31:09 +00:00
|
|
|
|
|
|
|
case $CFLAGS in
|
|
|
|
*-O*) ;;
|
|
|
|
*)
|
|
|
|
# No optimization flag was inferred for this non-GCC compiler.
|
|
|
|
# Try -O. This is needed for xlc on AIX; see Bug#14258.
|
|
|
|
emacs_save_CFLAGS=$CFLAGS
|
|
|
|
test -z "$CFLAGS" || CFLAGS="$CFLAGS "
|
|
|
|
CFLAGS=${CFLAGS}-O
|
|
|
|
AC_CACHE_CHECK([whether $CC accepts -O],
|
|
|
|
[emacs_cv_prog_cc_o],
|
|
|
|
[AC_LINK_IFELSE([AC_LANG_PROGRAM()],
|
|
|
|
[emacs_cv_prog_cc_o=yes],
|
|
|
|
[emacs_cv_prog_cc_o=no])])
|
|
|
|
if test $emacs_cv_prog_cc_o != yes; then
|
|
|
|
CFLAGS=$emacs_save_CFLAGS
|
|
|
|
fi ;;
|
|
|
|
esac
|
2012-08-26 04:37:40 +00:00
|
|
|
fi
|
|
|
|
|
configure: new option --enable-gcc-warnings
I have been using this change for many months in my private copy
of Emacs, and have used it to find several bugs. It's mature
enough to publish now.
* Makefile.in (GNULIB_MODULES): Add warnings, manywarnings.
* configure.in: Support --enable-gcc-warnings, in the style of
other GNU packages such as coreutils.
(C_WARNINGS_SWITCH): Remove, replacing with...
(WARN_CFLAGS, GNULIB_WARN_CFLAGS): New variable.
(PKG_CHECK_MODULES, C_SWITCH_X_SITE): Use -isystem rather than -I,
when including system files with GCC.
* etc/NEWS: Mention --enable-gcc-warnings.
* lib/Makefile.am (AM_CFLAGS): New macro.
* m4/manywarnings.m4, m4/warnings.m4: New files, from gnulib.
* lib-src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(BASE_CFLAGS): Use new macros rather than old.
* lwlib/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* oldXMenu/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/process.c: Ignore -Wstrict-overflow to work around GCC bug 52904.
* src/regex.c: Ignore -Wstrict-overflow. If !emacs, also ignore
-Wunused-but-set-variable, -Wunused-function, -Wunused-macros,
-Wunused-result, -Wunused-variable. This should go away once
the Emacs and Gnulib regex code is merged.
(xmalloc, xrealloc): Now static.
2012-04-09 07:45:59 +00:00
|
|
|
AC_ARG_ENABLE([gcc-warnings],
|
|
|
|
[AS_HELP_STRING([--enable-gcc-warnings],
|
2013-01-16 06:04:58 +00:00
|
|
|
[turn on lots of GCC warnings/errors. This is intended for
|
2012-07-06 21:29:50 +00:00
|
|
|
developers, and may generate false alarms when used
|
|
|
|
with older or non-GNU development tools.])],
|
configure: new option --enable-gcc-warnings
I have been using this change for many months in my private copy
of Emacs, and have used it to find several bugs. It's mature
enough to publish now.
* Makefile.in (GNULIB_MODULES): Add warnings, manywarnings.
* configure.in: Support --enable-gcc-warnings, in the style of
other GNU packages such as coreutils.
(C_WARNINGS_SWITCH): Remove, replacing with...
(WARN_CFLAGS, GNULIB_WARN_CFLAGS): New variable.
(PKG_CHECK_MODULES, C_SWITCH_X_SITE): Use -isystem rather than -I,
when including system files with GCC.
* etc/NEWS: Mention --enable-gcc-warnings.
* lib/Makefile.am (AM_CFLAGS): New macro.
* m4/manywarnings.m4, m4/warnings.m4: New files, from gnulib.
* lib-src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(BASE_CFLAGS): Use new macros rather than old.
* lwlib/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* oldXMenu/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/process.c: Ignore -Wstrict-overflow to work around GCC bug 52904.
* src/regex.c: Ignore -Wstrict-overflow. If !emacs, also ignore
-Wunused-but-set-variable, -Wunused-function, -Wunused-macros,
-Wunused-result, -Wunused-variable. This should go away once
the Emacs and Gnulib regex code is merged.
(xmalloc, xrealloc): Now static.
2012-04-09 07:45:59 +00:00
|
|
|
[case $enableval in
|
|
|
|
yes|no) ;;
|
|
|
|
*) AC_MSG_ERROR([bad value $enableval for gcc-warnings option]) ;;
|
|
|
|
esac
|
|
|
|
gl_gcc_warnings=$enableval],
|
|
|
|
[gl_gcc_warnings=no]
|
|
|
|
)
|
|
|
|
|
2013-09-23 07:12:01 +00:00
|
|
|
# clang is unduly picky about some things.
|
|
|
|
AC_CACHE_CHECK([whether the compiler is clang], [emacs_cv_clang],
|
|
|
|
[AC_COMPILE_IFELSE(
|
|
|
|
[AC_LANG_PROGRAM([[
|
|
|
|
#ifndef __clang__
|
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 22:51:08 +00:00
|
|
|
error "not clang";
|
2013-09-23 07:12:01 +00:00
|
|
|
#endif
|
|
|
|
]])],
|
|
|
|
[emacs_cv_clang=yes],
|
|
|
|
[emacs_cv_clang=no])])
|
|
|
|
|
configure: new option --enable-gcc-warnings
I have been using this change for many months in my private copy
of Emacs, and have used it to find several bugs. It's mature
enough to publish now.
* Makefile.in (GNULIB_MODULES): Add warnings, manywarnings.
* configure.in: Support --enable-gcc-warnings, in the style of
other GNU packages such as coreutils.
(C_WARNINGS_SWITCH): Remove, replacing with...
(WARN_CFLAGS, GNULIB_WARN_CFLAGS): New variable.
(PKG_CHECK_MODULES, C_SWITCH_X_SITE): Use -isystem rather than -I,
when including system files with GCC.
* etc/NEWS: Mention --enable-gcc-warnings.
* lib/Makefile.am (AM_CFLAGS): New macro.
* m4/manywarnings.m4, m4/warnings.m4: New files, from gnulib.
* lib-src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(BASE_CFLAGS): Use new macros rather than old.
* lwlib/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* oldXMenu/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/process.c: Ignore -Wstrict-overflow to work around GCC bug 52904.
* src/regex.c: Ignore -Wstrict-overflow. If !emacs, also ignore
-Wunused-but-set-variable, -Wunused-function, -Wunused-macros,
-Wunused-result, -Wunused-variable. This should go away once
the Emacs and Gnulib regex code is merged.
(xmalloc, xrealloc): Now static.
2012-04-09 07:45:59 +00:00
|
|
|
# When compiling with GCC, prefer -isystem to -I when including system
|
|
|
|
# include files, to avoid generating useless diagnostics for the files.
|
|
|
|
if test "$gl_gcc_warnings" != yes; then
|
|
|
|
isystem='-I'
|
2013-09-23 07:12:01 +00:00
|
|
|
if test "$emacs_cv_clang" = yes
|
|
|
|
then
|
|
|
|
# Turn off some warnings if supported.
|
|
|
|
gl_WARN_ADD([-Wno-switch])
|
|
|
|
gl_WARN_ADD([-Wno-tautological-constant-out-of-range-compare])
|
|
|
|
gl_WARN_ADD([-Wno-pointer-sign])
|
2014-10-06 06:21:13 +00:00
|
|
|
gl_WARN_ADD([-Wno-string-plus-int])
|
2013-09-23 07:12:01 +00:00
|
|
|
fi
|
configure: new option --enable-gcc-warnings
I have been using this change for many months in my private copy
of Emacs, and have used it to find several bugs. It's mature
enough to publish now.
* Makefile.in (GNULIB_MODULES): Add warnings, manywarnings.
* configure.in: Support --enable-gcc-warnings, in the style of
other GNU packages such as coreutils.
(C_WARNINGS_SWITCH): Remove, replacing with...
(WARN_CFLAGS, GNULIB_WARN_CFLAGS): New variable.
(PKG_CHECK_MODULES, C_SWITCH_X_SITE): Use -isystem rather than -I,
when including system files with GCC.
* etc/NEWS: Mention --enable-gcc-warnings.
* lib/Makefile.am (AM_CFLAGS): New macro.
* m4/manywarnings.m4, m4/warnings.m4: New files, from gnulib.
* lib-src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(BASE_CFLAGS): Use new macros rather than old.
* lwlib/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* oldXMenu/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/process.c: Ignore -Wstrict-overflow to work around GCC bug 52904.
* src/regex.c: Ignore -Wstrict-overflow. If !emacs, also ignore
-Wunused-but-set-variable, -Wunused-function, -Wunused-macros,
-Wunused-result, -Wunused-variable. This should go away once
the Emacs and Gnulib regex code is merged.
(xmalloc, xrealloc): Now static.
2012-04-09 07:45:59 +00:00
|
|
|
else
|
|
|
|
isystem='-isystem '
|
|
|
|
|
|
|
|
# This, $nw, is the list of warnings we disable.
|
|
|
|
nw=
|
|
|
|
|
|
|
|
case $with_x_toolkit in
|
|
|
|
lucid | athena | motif)
|
|
|
|
# Old toolkits mishandle 'const'.
|
|
|
|
nw="$nw -Wwrite-strings"
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
gl_WARN_ADD([-Werror], [WERROR_CFLAGS])
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
AC_SUBST([WERROR_CFLAGS])
|
|
|
|
|
|
|
|
nw="$nw -Wsystem-headers" # Don't let system headers trigger warnings
|
|
|
|
nw="$nw -Woverlength-strings" # Not a problem these days
|
2012-07-07 19:23:41 +00:00
|
|
|
nw="$nw -Wformat-nonliteral" # we do this a lot
|
Clean up extern decls a bit.
* configure.ac (WERROR_CFLAGS): Don't disable -Wnested-externs.
While we're at it, don't disable -Wlogical-op either.
* src/bytecode.c: Include blockinput.h and keyboard.h rather
than rolling their APIs by hand.
* src/emacs.c: Include regex.h and rely on its and lisp.h's API
rather than rolling them by hand.
* src/lastfile.c: Include lisp.h, to check this file's API.
* src/lisp.h (lisp_eval_depth, my_edata, my_endbss, my_endbss_static):
New decls.
* src/regex.h (re_max_failures): New decl.
* src/unexcw.c, src/unexmacosx.c, src/unexw32.c:
Rely on lisp.h's API rather than rolling it by hand.
* src/vm-limit.c (__after_morecore_hook, __morecore, real_morecore):
Declare at top level, to pacify GCC -Wnested-externs.
2014-09-01 02:37:22 +00:00
|
|
|
nw="$nw -Wvla" # Emacs uses <vla.h>.
|
configure: new option --enable-gcc-warnings
I have been using this change for many months in my private copy
of Emacs, and have used it to find several bugs. It's mature
enough to publish now.
* Makefile.in (GNULIB_MODULES): Add warnings, manywarnings.
* configure.in: Support --enable-gcc-warnings, in the style of
other GNU packages such as coreutils.
(C_WARNINGS_SWITCH): Remove, replacing with...
(WARN_CFLAGS, GNULIB_WARN_CFLAGS): New variable.
(PKG_CHECK_MODULES, C_SWITCH_X_SITE): Use -isystem rather than -I,
when including system files with GCC.
* etc/NEWS: Mention --enable-gcc-warnings.
* lib/Makefile.am (AM_CFLAGS): New macro.
* m4/manywarnings.m4, m4/warnings.m4: New files, from gnulib.
* lib-src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(BASE_CFLAGS): Use new macros rather than old.
* lwlib/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* oldXMenu/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/process.c: Ignore -Wstrict-overflow to work around GCC bug 52904.
* src/regex.c: Ignore -Wstrict-overflow. If !emacs, also ignore
-Wunused-but-set-variable, -Wunused-function, -Wunused-macros,
-Wunused-result, -Wunused-variable. This should go away once
the Emacs and Gnulib regex code is merged.
(xmalloc, xrealloc): Now static.
2012-04-09 07:45:59 +00:00
|
|
|
nw="$nw -Wswitch-default" # Too many warnings for now
|
2012-07-07 19:23:41 +00:00
|
|
|
nw="$nw -Winline" # OK to ignore 'inline'
|
2012-09-03 19:34:49 +00:00
|
|
|
nw="$nw -Wjump-misses-init" # We sometimes safely jump over init.
|
2012-11-24 16:16:33 +00:00
|
|
|
nw="$nw -Wstrict-overflow" # OK to optimize assuming that
|
|
|
|
# signed overflow has undefined behavior
|
2012-07-07 19:23:41 +00:00
|
|
|
nw="$nw -Wsync-nand" # irrelevant here, and provokes ObjC warning
|
|
|
|
nw="$nw -Wunsafe-loop-optimizations" # OK to suppress unsafe optimizations
|
Use functions, not macros, for XINT etc.
In lisp.h, prefer functions to function-like macros, and
constants to object-like macros, when either will do. This:
. simplifies use, as there's no more need to worry about
arguments' side effects being evaluated multiple times.
. makes the code easier to debug on some platforms.
However, when using gcc -O0, keep using function-like macros
for a few critical operations, for performance reasons.
This sort of thing isn't needed with gcc -Og, but -Og
is a GCC 4.8 feature and isn't widely-enough available yet.
Also, move functions from lisp.h to individual modules when possible.
From a suggestion by Andreas Schwab in <http://bugs.gnu.org/11935#68>.
* alloc.c (XFLOAT_INIT, set_symbol_name):
* buffer.c (CHECK_OVERLAY):
* chartab.c (CHECK_CHAR_TABLE, set_char_table_ascii)
(set_char_table_parent):
* coding.c (CHECK_NATNUM_CAR, CHECK_NATNUM_CDR):
* data.c (BOOLFWDP, INTFWDP, KBOARD_OBJFWDP, OBJFWDP, XBOOLFWD)
(XKBOARD_OBJFWD, XINTFWD, XOBJFWD, CHECK_SUBR, set_blv_found)
(blv_value, set_blv_value, set_blv_where, set_blv_defcell)
(set_blv_valcell):
* emacs.c (setlocale) [!HAVE_SETLOCALE]:
* eval.c (specpdl_symbol, specpdl_old_value, specpdl_where)
(specpdl_arg, specpdl_func, backtrace_function, backtrace_nargs)
(backtrace_args, backtrace_debug_on_exit):
* floatfns.c (CHECK_FLOAT):
* fns.c (CHECK_HASH_TABLE, CHECK_LIST_END)
(set_hash_key_and_value, set_hash_next, set_hash_next_slot)
(set_hash_hash, set_hash_hash_slot, set_hash_index)
(set_hash_index_slot):
* keymap.c (CHECK_VECTOR_OR_CHAR_TABLE):
* marker.c (CHECK_MARKER):
* textprop.c (CHECK_STRING_OR_BUFFER):
* window.c (CHECK_WINDOW_CONFIGURATION):
Move here from lisp.h, and make these functions static rather than
extern inline.
* buffer.c (Qoverlayp):
* data.c (Qsubrp):
* fns.c (Qhash_table_p):
* window.c (Qwindow_configuration_p):
Now static.
* lisp.h: Remove the abovementioned defns and decls.
* configure.ac (WARN_CFLAGS): Remove -Wbad-function-cast,
as it generates bogus warnings about reasonable casts of calls.
* alloc.c (gdb_make_enums_visible) [USE_LSB_TAG]:
Remove enum lsb_bits; no longer needed.
(allocate_misc, free_misc): Don't use XMISCTYPE as an lvalue.
* buffer.c (Qoverlap):
* data.c (Qsubrp):
* fns.c (Qhash_table_p):
Now extern, so lisp.h can use these symbols.
* dispextern.h: Include character.h, for MAX_CHAR etc.
(GLYPH, GLYPH_CHAR, GLYPH_FACE, SET_GLYPH_CHAR, SET_GLYPH_FACE)
(SET_GLYPH, GLYPH_CODE_CHAR, GLYPH_CODE_FACE)
(SET_GLYPH_FROM_GLYPH_CODE, GLYPH_MODE_LINE_FACE, GLYPH_CHAR_VALID_P)
(GLYPH_CODE_P): Move here from lisp.h.
(GLYPH_CHAR, GLYPH_FACE, GLYPH_CODE_CHAR, GLYPH_CODE_FACE)
(GLYPH_CHAR_VALID_P, GLYPH_CODE_P): Now functions, not macros.
(GLYPH_MODE_LINE_FACE): Now enums, not macros.
* eval.c (Fautoload): Cast XUNTAG output to intptr_t, since
XUNTAG now returns void *.
* lisp.h (lisp_h_XLI, lisp_h_XIL, lisp_h_CHECK_LIST_CONS)
(lisp_h_CHECK_NUMBER CHECK_SYMBOL, lisp_h_CHECK_TYPE)
(lisp_h_CONSP, lisp_h_EQ, lisp_h_FLOATP, lisp_h_INTEGERP)
(lisp_h_MARKERP, lisp_h_MISCP, lisp_h_NILP)
(lisp_h_SET_SYMBOL_VAL, lisp_h_SYMBOL_CONSTANT_P)
(lisp_h_SYMBOL_VAL, lisp_h_SYMBOLP, lisp_h_VECTORLIKEP)
(lisp_h_XCAR, lisp_h_XCDR, lisp_h_XCONS, lisp_h_XHASH)
(lisp_h_XPNTR, lisp_h_XSYMBOL):
New macros, renamed from their sans-lisp_h_ counterparts.
(XLI, XIL, CHECK_LIST_CONS, CHECK_NUMBER CHECK_SYMBOL)
(CHECK_TYPE, CONSP, EQ, FLOATP, INTEGERP, MARKERP)
(MISCP, NILP, SET_SYMBOL_VAL, SYMBOL_CONSTANT_P, SYMBOL_VAL, SYMBOLP)
(VECTORLIKEP, XCAR, XCDR, XCONS, XHASH, XPNTR, XSYMBOL):
If compiling via GCC without optimization, define these as macros
in addition to inline functions.
To disable this, compile with -DINLINING=0.
(LISP_MACRO_DEFUN, LISP_MACRO_DEFUN_VOID): New macros.
(check_cons_list) [!GC_CHECK_CONS_LIST]: Likewise.
(make_number, XFASTINT, XINT, XTYPE, XUNTAG): Likewise, but
hand-optimize only in the USE_LSB_TAG case, as GNUish hosts do that.
(INTMASK, VALMASK): Now macros, since static values cannot be
accessed from extern inline functions.
(VALMASK): Also a constant, for benefit of old GDB.
(LISP_INT_TAG_P): Remove; no longer needed as the only caller
is INTEGERP, which can fold it in.
(XLI, XIL, XHASH, XTYPE,XINT, XFASTINT, XUINT)
(make_number, XPNTR, XUNTAG, EQ, XCONS, XVECTOR, XSTRING, XSYMBOL)
(XFLOAT, XPROCESS, XWINDOW, XTERMINAL, XSUBR, XBUFFER, XCHAR_TABLE)
(XSUB_CHAR_TABLE, XBOOL_VECTOR, make_lisp_ptr, CHECK_TYPE)
(CHECK_STRING_OR_BUFFER, XCAR, XCDR, XSETCAR, XSETCDR, CAR, CDR)
(CAR_SAFE, CDR_SAFE, STRING_MULTIBYTE, SDATA, SSDATA, SREF, SSET)
(SCHARS, STRING_BYTES, SBYTES, STRING_SET_CHARS, STRING_COPYIN, AREF)
(ASIZE, ASET, CHAR_TABLE_REF_ASCII, CHAR_TABLE_REF)
(CHAR_TABLE_SET, CHAR_TABLE_EXTRA_SLOTS, SYMBOL_VAL, SYMBOL_ALIAS)
(SYMBOL_BLV, SYMBOL_FWD, SET_SYMBOL_VAL, SET_SYMBOL_ALIAS)
(SET_SYMBOL_BLV, SET_SYMBOL_FWD, SYMBOL_NAME, SYMBOL_INTERNED_P)
(SYMBOL_INTERNED_IN_INITIAL_OBARRAY_P, SYMBOL_CONSTANT_P)
(XHASH_TABLE, HASH_TABLE_P, CHECK_HASH_TABLE, HASH_KEY, HASH_VALUE)
(HASH_NEXT, HASH_HASH, HASH_INDEX, HASH_TABLE_SIZE)
(XMISC, XMISCANY, XMARKER, XOVERLAY, XSAVE_VALUE, XFWDTYPE)
(XINTFWD, XBOOLFWD, XOBJFWD, XBUFFER_OBJFWD, XKBOARD_OBJFWD)
(XFLOAT_DATA, XFLOAT_INIT, NILP, NUMBERP, NATNUMP)
(RANGED_INTEGERP, CONSP, FLOATP, MISCP, STRINGP, SYMBOLP)
(INTEGERP, VECTORLIKEP, VECTORP, OVERLAYP)
(MARKERP, SAVE_VALUEP, AUTOLOADP, INTFWDP, BOOLFWDP, OBJFWDP)
(BUFFER_OBJFWDP, KBOARD_OBJFWDP, PSEUDOVECTOR_TYPEP)
(PSEUDOVECTORP, WINDOW_CONFIGURATIONP, PROCESSP, WINDOWP)
(TERMINALP, SUBRP, COMPILEDP, BUFFERP, CHAR_TABLE_P)
(SUB_CHAR_TABLE_P, BOOL_VECTOR_P, FRAMEP, IMAGEP, ARRAYP)
(CHECK_LIST, CHECK_LIST_CONS, CHECK_LIST_END, CHECK_STRING)
(CHECK_STRING_CAR, CHECK_CONS, CHECK_SYMBOL, CHECK_CHAR_TABLE)
(CHECK_VECTOR, CHECK_VECTOR_OR_STRING, CHECK_ARRAY)
(CHECK_VECTOR_OR_CHAR_TABLE, CHECK_BUFFER, CHECK_WINDOW)
(CHECK_WINDOW_CONFIGURATION, CHECK_PROCESS, CHECK_SUBR)
(CHECK_NUMBER, CHECK_NATNUM, CHECK_MARKER, XFLOATINT)
(CHECK_FLOAT, CHECK_NUMBER_OR_FLOAT, CHECK_OVERLAY)
(CHECK_NUMBER_CAR, CHECK_NUMBER_CDR, CHECK_NATNUM_CAR)
(CHECK_NATNUM_CDR, FUNCTIONP, SPECPDL_INDEX, LOADHIST_ATTACH)
Now functions.
(check_cons_list) [!GC_CHECK_CONS_LIST]: New empty function.
(LISP_MAKE_RVALUE, TYPEMASK): Remove; no longer needed.
(VALMASK): Define in one place rather than in two, merging the
USE_LSB_TAG parts; this is simpler.
(aref_addr, gc_aset, MOST_POSITIVE_FIXNUM, MOST_NEGATIVE_FIXNUM)
(max, min, struct Lisp_String, UNSIGNED_CMP, ASCII_CHAR_P):
Move up, to avoid use before definition.
Also include "globals.h" earlier, for the same reason.
(make_natnum): New function.
(XUNTAG): Now returns void *, not intptr_t, as this means fewer casts.
(union Lisp_Fwd, BOOLFWDP, BOOL_VECTOR_P, BUFFER_OBJFWDP, BUFFERP)
(CHAR_TABLE_P, CHAR_TABLE_REF_ASCII, CONSP, FLOATP, INTEGERP, INTFWDP)
(KBOARD_OBJFWDP, MARKERP, MISCP, NILP, OBJFWDP, OVERLAYP, PROCESSP)
(PSEUDOVECTORP, SAVE_VALUEP, STRINGP, SUB_CHAR_TABLE_P, SUBRP, SYMBOLP)
(VECTORLIKEP, WINDOWP, Qoverlayp, char_table_ref, char_table_set)
(char_table_translate, Qarrayp, Qbufferp, Qbuffer_or_string_p)
(Qchar_table_p, Qconsp, Qfloatp, Qintegerp, Qlambda, Qlistp, Qmarkerp)
(Qnil, Qnumberp, Qsubrp, Qstringp, Qsymbolp, Qvectorp)
(Qvector_or_char_table_p, Qwholenump, Ffboundp, wrong_type_argument)
(initialized, Qhash_table_p, extract_float, Qprocessp, Qwindowp)
(Qwindow_configuration_p, Qimage): New forward declarations.
(XSETFASTINT): Simplify by rewriting in terms of make_natnum.
(STRING_COPYIN): Remove; unused.
(XCAR_AS_LVALUE, XCDR_AS_LVALUE): Remove these macros, replacing with ...
(xcar_addr, xcdr_addr): New functions. All uses changed.
(IEEE_FLOATING_POINT): Now a constant, not a macro.
(GLYPH, GLYPH_CHAR, GLYPH_FACE, SET_GLYPH_CHAR, SET_GLYPH_FACE)
(SET_GLYPH, GLYPH_CODE_CHAR, GLYPH_CODE_FACE)
(SET_GLYPH_FROM_GLYPH_CODE, GLYPH_MODE_LINE_FACE, GLYPH_CHAR_VALID_P)
(GLYPH_CODE_P): Move to dispextern.h, to avoid define-before-use.
(TYPE_RANGED_INTEGERP): Simplify.
(Qsubrp, Qhash_table_p, Qoverlayp): New extern decls.
(setlocale, fixup_locale, synchronize_system_messages_locale)
(synchronize_system_time_locale) [!HAVE_SETLOCALE]:
Now empty functions, not macros.
(functionp): Return bool, not int.
* window.c (Qwindow_configuration_p): Now extern,
so window.h can use it.
* window.h (Qwindowp): Move decl back to lisp.h.
2013-06-17 06:03:19 +00:00
|
|
|
nw="$nw -Wbad-function-cast" # These casts are no worse than others.
|
configure: new option --enable-gcc-warnings
I have been using this change for many months in my private copy
of Emacs, and have used it to find several bugs. It's mature
enough to publish now.
* Makefile.in (GNULIB_MODULES): Add warnings, manywarnings.
* configure.in: Support --enable-gcc-warnings, in the style of
other GNU packages such as coreutils.
(C_WARNINGS_SWITCH): Remove, replacing with...
(WARN_CFLAGS, GNULIB_WARN_CFLAGS): New variable.
(PKG_CHECK_MODULES, C_SWITCH_X_SITE): Use -isystem rather than -I,
when including system files with GCC.
* etc/NEWS: Mention --enable-gcc-warnings.
* lib/Makefile.am (AM_CFLAGS): New macro.
* m4/manywarnings.m4, m4/warnings.m4: New files, from gnulib.
* lib-src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(BASE_CFLAGS): Use new macros rather than old.
* lwlib/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* oldXMenu/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/process.c: Ignore -Wstrict-overflow to work around GCC bug 52904.
* src/regex.c: Ignore -Wstrict-overflow. If !emacs, also ignore
-Wunused-but-set-variable, -Wunused-function, -Wunused-macros,
-Wunused-result, -Wunused-variable. This should go away once
the Emacs and Gnulib regex code is merged.
(xmalloc, xrealloc): Now static.
2012-04-09 07:45:59 +00:00
|
|
|
|
|
|
|
# Emacs doesn't care about shadowing; see
|
|
|
|
# <http://lists.gnu.org/archive/html/emacs-diffs/2011-11/msg00265.html>.
|
|
|
|
nw="$nw -Wshadow"
|
|
|
|
|
2012-12-26 05:41:42 +00:00
|
|
|
# Emacs's use of alloca inhibits protecting the stack.
|
|
|
|
nw="$nw -Wstack-protector"
|
|
|
|
|
Clean up extern decls a bit.
* configure.ac (WERROR_CFLAGS): Don't disable -Wnested-externs.
While we're at it, don't disable -Wlogical-op either.
* src/bytecode.c: Include blockinput.h and keyboard.h rather
than rolling their APIs by hand.
* src/emacs.c: Include regex.h and rely on its and lisp.h's API
rather than rolling them by hand.
* src/lastfile.c: Include lisp.h, to check this file's API.
* src/lisp.h (lisp_eval_depth, my_edata, my_endbss, my_endbss_static):
New decls.
* src/regex.h (re_max_failures): New decl.
* src/unexcw.c, src/unexmacosx.c, src/unexw32.c:
Rely on lisp.h's API rather than rolling it by hand.
* src/vm-limit.c (__after_morecore_hook, __morecore, real_morecore):
Declare at top level, to pacify GCC -Wnested-externs.
2014-09-01 02:37:22 +00:00
|
|
|
# Emacs's use of partly-pure functions such as CHECK_TYPE make this
|
|
|
|
# option problematic.
|
configure: new option --enable-gcc-warnings
I have been using this change for many months in my private copy
of Emacs, and have used it to find several bugs. It's mature
enough to publish now.
* Makefile.in (GNULIB_MODULES): Add warnings, manywarnings.
* configure.in: Support --enable-gcc-warnings, in the style of
other GNU packages such as coreutils.
(C_WARNINGS_SWITCH): Remove, replacing with...
(WARN_CFLAGS, GNULIB_WARN_CFLAGS): New variable.
(PKG_CHECK_MODULES, C_SWITCH_X_SITE): Use -isystem rather than -I,
when including system files with GCC.
* etc/NEWS: Mention --enable-gcc-warnings.
* lib/Makefile.am (AM_CFLAGS): New macro.
* m4/manywarnings.m4, m4/warnings.m4: New files, from gnulib.
* lib-src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(BASE_CFLAGS): Use new macros rather than old.
* lwlib/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* oldXMenu/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/process.c: Ignore -Wstrict-overflow to work around GCC bug 52904.
* src/regex.c: Ignore -Wstrict-overflow. If !emacs, also ignore
-Wunused-but-set-variable, -Wunused-function, -Wunused-macros,
-Wunused-result, -Wunused-variable. This should go away once
the Emacs and Gnulib regex code is merged.
(xmalloc, xrealloc): Now static.
2012-04-09 07:45:59 +00:00
|
|
|
nw="$nw -Wsuggest-attribute=pure"
|
|
|
|
|
2013-09-07 00:20:56 +00:00
|
|
|
# This part is merely for shortening the command line,
|
|
|
|
# since -Wno-FOO needs to be added below regardless.
|
|
|
|
nw="$nw -Wmissing-field-initializers"
|
|
|
|
nw="$nw -Wswitch"
|
|
|
|
nw="$nw -Wtype-limits"
|
|
|
|
nw="$nw -Wunused-parameter"
|
|
|
|
|
2013-05-18 05:32:17 +00:00
|
|
|
if test $emacs_cv_clang = yes; then
|
|
|
|
nw="$nw -Wcast-align"
|
|
|
|
fi
|
|
|
|
|
configure: new option --enable-gcc-warnings
I have been using this change for many months in my private copy
of Emacs, and have used it to find several bugs. It's mature
enough to publish now.
* Makefile.in (GNULIB_MODULES): Add warnings, manywarnings.
* configure.in: Support --enable-gcc-warnings, in the style of
other GNU packages such as coreutils.
(C_WARNINGS_SWITCH): Remove, replacing with...
(WARN_CFLAGS, GNULIB_WARN_CFLAGS): New variable.
(PKG_CHECK_MODULES, C_SWITCH_X_SITE): Use -isystem rather than -I,
when including system files with GCC.
* etc/NEWS: Mention --enable-gcc-warnings.
* lib/Makefile.am (AM_CFLAGS): New macro.
* m4/manywarnings.m4, m4/warnings.m4: New files, from gnulib.
* lib-src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(BASE_CFLAGS): Use new macros rather than old.
* lwlib/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* oldXMenu/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/process.c: Ignore -Wstrict-overflow to work around GCC bug 52904.
* src/regex.c: Ignore -Wstrict-overflow. If !emacs, also ignore
-Wunused-but-set-variable, -Wunused-function, -Wunused-macros,
-Wunused-result, -Wunused-variable. This should go away once
the Emacs and Gnulib regex code is merged.
(xmalloc, xrealloc): Now static.
2012-04-09 07:45:59 +00:00
|
|
|
gl_MANYWARN_ALL_GCC([ws])
|
|
|
|
gl_MANYWARN_COMPLEMENT([ws], [$ws], [$nw])
|
|
|
|
for w in $ws; do
|
|
|
|
gl_WARN_ADD([$w])
|
|
|
|
done
|
Omit redundant extern decls.
Most of this patch is from Dmitry Antipov, in:
http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00263.html
* configure.ac (WERROR_CFLAGS): Add -Wredundant-decls.
* lib-src/emacsclient.c (getenv): Remove decl.
* lib-src/make-docfile.c (write_globals): Add ATTRIBUTE_CONST for
Fbyteorder, Ftool_bar_height, Fmax_char, Fidentity.
* lwlib/lwlib-Xm.c (lw_motif_widget_p, xm_update_one_value)
(xm_create_dialog, xm_destroy_instance, xm_popup_menu)
(xm_set_keyboard_focus, xm_set_main_areas): Remove decls.
* src/commands.h (update_mode_lines):
* src/frame.h (Qbackground_color, Qforeground_color)
(x_set_menu_bar_lines):
* src/ftfont.c (ftfont_font_format):
* src/intervals.h (Qkeymap, Qfont):
* src/keyboard.c (timer_check, safe_run_hooks, Qregion_extract_function):
* src/lisp.h (Ffboundp, Qnil, Qt, Qlambda, Qintegerp, Qwholenump)
(Qsymbolp, Qlisp, Qconsp, Qstringp, Qarrayp, Qbufferp, Qmarkerp)
(Qvectorp, Qbuffer_or_string_p, Qchar_table_p, Qvector_or_char_table_p)
(Qfloatp, Qnumberp, Qfont_spec, Qfont_entity, Qfont_object)
(Fbyteorder, wrong_type_argument, Fmax_char, syms_of_composite)
(Fidentity, extract_float, init_display, syms_of_display, Qdisplay):
(Qimage, Qbox, redisplay_preserve_echo_area, char_table_ref)
(char_table_set, char_table_translate, Qautoload, Qbottom, Qtop)
(Qvisible, Qfont, Qfront_sticky, Qrear_nonsticky, init_sigio)
(Qtool_bar, Qheader_line):
* src/macros.c (Fexecute_kbd_macro):
* src/xdisp.c (Ftool_bar_height, Ftool_bar_height):
* src/xterm.c (x_delete_terminal, XSetIMValues):
* src/xterm.h (x_set_window_size, x_query_color, x_get_focus_frame)
(x_implicitly_set_name, popup_activated)
(widget_store_internal_border):
Remove redundant decls.
* src/frame.c [USE_X_TOOLKIT]: Include widget.h.
* src/keyboard.c (Fexit_recursive_edit, Fabort_recursive_edit):
Remove _Noreturn, as make-docfile now does that for us.
* src/lisp.h (DEFUN): Don't declare fnname here; rely on make-docfile.
(Qregion_extract_function): New decl.
* src/window.c, src/xfns.c: Include menu.h.
2014-06-17 16:09:19 +00:00
|
|
|
gl_WARN_ADD([-Wredundant-decls]) # Prefer this, as we don't use Bison.
|
configure: new option --enable-gcc-warnings
I have been using this change for many months in my private copy
of Emacs, and have used it to find several bugs. It's mature
enough to publish now.
* Makefile.in (GNULIB_MODULES): Add warnings, manywarnings.
* configure.in: Support --enable-gcc-warnings, in the style of
other GNU packages such as coreutils.
(C_WARNINGS_SWITCH): Remove, replacing with...
(WARN_CFLAGS, GNULIB_WARN_CFLAGS): New variable.
(PKG_CHECK_MODULES, C_SWITCH_X_SITE): Use -isystem rather than -I,
when including system files with GCC.
* etc/NEWS: Mention --enable-gcc-warnings.
* lib/Makefile.am (AM_CFLAGS): New macro.
* m4/manywarnings.m4, m4/warnings.m4: New files, from gnulib.
* lib-src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(BASE_CFLAGS): Use new macros rather than old.
* lwlib/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* oldXMenu/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/process.c: Ignore -Wstrict-overflow to work around GCC bug 52904.
* src/regex.c: Ignore -Wstrict-overflow. If !emacs, also ignore
-Wunused-but-set-variable, -Wunused-function, -Wunused-macros,
-Wunused-result, -Wunused-variable. This should go away once
the Emacs and Gnulib regex code is merged.
(xmalloc, xrealloc): Now static.
2012-04-09 07:45:59 +00:00
|
|
|
gl_WARN_ADD([-Wno-missing-field-initializers]) # We need this one
|
|
|
|
gl_WARN_ADD([-Wno-sign-compare]) # Too many warnings for now
|
|
|
|
gl_WARN_ADD([-Wno-type-limits]) # Too many warnings for now
|
|
|
|
gl_WARN_ADD([-Wno-switch]) # Too many warnings for now
|
|
|
|
gl_WARN_ADD([-Wno-unused-parameter]) # Too many warnings for now
|
|
|
|
gl_WARN_ADD([-Wno-format-nonliteral])
|
|
|
|
|
2013-05-18 05:32:17 +00:00
|
|
|
# More things that clang is unduly picky about.
|
|
|
|
if test $emacs_cv_clang = yes; then
|
|
|
|
gl_WARN_ADD([-Wno-format-extra-args])
|
|
|
|
gl_WARN_ADD([-Wno-tautological-constant-out-of-range-compare])
|
|
|
|
gl_WARN_ADD([-Wno-unused-command-line-argument])
|
|
|
|
gl_WARN_ADD([-Wno-unused-value])
|
|
|
|
fi
|
|
|
|
|
configure: new option --enable-gcc-warnings
I have been using this change for many months in my private copy
of Emacs, and have used it to find several bugs. It's mature
enough to publish now.
* Makefile.in (GNULIB_MODULES): Add warnings, manywarnings.
* configure.in: Support --enable-gcc-warnings, in the style of
other GNU packages such as coreutils.
(C_WARNINGS_SWITCH): Remove, replacing with...
(WARN_CFLAGS, GNULIB_WARN_CFLAGS): New variable.
(PKG_CHECK_MODULES, C_SWITCH_X_SITE): Use -isystem rather than -I,
when including system files with GCC.
* etc/NEWS: Mention --enable-gcc-warnings.
* lib/Makefile.am (AM_CFLAGS): New macro.
* m4/manywarnings.m4, m4/warnings.m4: New files, from gnulib.
* lib-src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(BASE_CFLAGS): Use new macros rather than old.
* lwlib/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* oldXMenu/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/process.c: Ignore -Wstrict-overflow to work around GCC bug 52904.
* src/regex.c: Ignore -Wstrict-overflow. If !emacs, also ignore
-Wunused-but-set-variable, -Wunused-function, -Wunused-macros,
-Wunused-result, -Wunused-variable. This should go away once
the Emacs and Gnulib regex code is merged.
(xmalloc, xrealloc): Now static.
2012-04-09 07:45:59 +00:00
|
|
|
AC_DEFINE([lint], [1], [Define to 1 if the compiler is checking for lint.])
|
2012-09-01 18:54:38 +00:00
|
|
|
AH_VERBATIM([FORTIFY_SOURCE],
|
|
|
|
[/* Enable compile-time and run-time bounds-checking, and some warnings,
|
|
|
|
without upsetting glibc 2.15+. */
|
2012-10-23 19:39:36 +00:00
|
|
|
#if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__
|
2012-09-01 18:54:38 +00:00
|
|
|
# define _FORTIFY_SOURCE 2
|
|
|
|
#endif
|
|
|
|
])
|
configure: new option --enable-gcc-warnings
I have been using this change for many months in my private copy
of Emacs, and have used it to find several bugs. It's mature
enough to publish now.
* Makefile.in (GNULIB_MODULES): Add warnings, manywarnings.
* configure.in: Support --enable-gcc-warnings, in the style of
other GNU packages such as coreutils.
(C_WARNINGS_SWITCH): Remove, replacing with...
(WARN_CFLAGS, GNULIB_WARN_CFLAGS): New variable.
(PKG_CHECK_MODULES, C_SWITCH_X_SITE): Use -isystem rather than -I,
when including system files with GCC.
* etc/NEWS: Mention --enable-gcc-warnings.
* lib/Makefile.am (AM_CFLAGS): New macro.
* m4/manywarnings.m4, m4/warnings.m4: New files, from gnulib.
* lib-src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(BASE_CFLAGS): Use new macros rather than old.
* lwlib/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* oldXMenu/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/process.c: Ignore -Wstrict-overflow to work around GCC bug 52904.
* src/regex.c: Ignore -Wstrict-overflow. If !emacs, also ignore
-Wunused-but-set-variable, -Wunused-function, -Wunused-macros,
-Wunused-result, -Wunused-variable. This should go away once
the Emacs and Gnulib regex code is merged.
(xmalloc, xrealloc): Now static.
2012-04-09 07:45:59 +00:00
|
|
|
AC_DEFINE([GNULIB_PORTCHECK], [1], [enable some gnulib portability checks])
|
|
|
|
|
|
|
|
# We use a slightly smaller set of warning options for lib/.
|
|
|
|
# Remove the following and save the result in GNULIB_WARN_CFLAGS.
|
|
|
|
nw=
|
|
|
|
nw="$nw -Wunused-macros"
|
|
|
|
|
|
|
|
gl_MANYWARN_COMPLEMENT([GNULIB_WARN_CFLAGS], [$WARN_CFLAGS], [$nw])
|
|
|
|
AC_SUBST([GNULIB_WARN_CFLAGS])
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
|
2014-05-03 08:12:06 +00:00
|
|
|
edit_cflags="
|
|
|
|
s,///*,/,g
|
|
|
|
s/^/ /
|
|
|
|
s/ -I/ $isystem/g
|
|
|
|
s/^ //
|
|
|
|
"
|
|
|
|
|
2014-05-13 11:12:05 +00:00
|
|
|
AC_ARG_ENABLE(link-time-optimization,
|
|
|
|
[AS_HELP_STRING([--enable-link-time-optimization],
|
|
|
|
[build emacs with link-time optimization.
|
2014-06-21 19:45:59 +00:00
|
|
|
This requires GCC 4.5.0 or later, or clang.
|
|
|
|
(Note that clang support is experimental - see INSTALL.)
|
|
|
|
It also makes Emacs harder to debug, and when we tried it
|
|
|
|
with GCC 4.9.0 x86-64 it made Emacs slower, so it's not
|
|
|
|
recommended for typical use.])],
|
2014-05-13 11:12:05 +00:00
|
|
|
if test "${enableval}" != "no"; then
|
|
|
|
ac_lto_supported=no
|
|
|
|
if test $emacs_cv_clang = yes; then
|
|
|
|
AC_MSG_CHECKING([whether link-time optimization is supported by clang])
|
|
|
|
GOLD_PLUGIN=`$CC -print-file-name=LLVMgold.so 2>/dev/null`
|
|
|
|
if test -x "$GOLD_PLUGIN"; then
|
|
|
|
LTO="-flto"
|
|
|
|
fi
|
|
|
|
elif test x$GCC = xyes; then
|
|
|
|
AC_MSG_CHECKING([whether link-time optimization is supported by gcc])
|
|
|
|
CPUS=`getconf _NPROCESSORS_ONLN 2>/dev/null`
|
|
|
|
if test x$CPUS != x; then
|
|
|
|
LTO="-flto=$CPUS"
|
|
|
|
else
|
|
|
|
LTO="-flto"
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
AC_MSG_ERROR([Link-time optimization is not supported with your compiler.])
|
|
|
|
fi
|
|
|
|
if test -z "$LTO"; then
|
|
|
|
ac_lto_supported=no
|
|
|
|
else
|
|
|
|
old_CFLAGS=$CFLAGS
|
|
|
|
CFLAGS="$CFLAGS $LTO"
|
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
|
|
|
|
[ac_lto_supported=yes], [ac_lto_supported=no])
|
|
|
|
CFLAGS="$old_CFLAGS"
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT([$ac_lto_supported])
|
|
|
|
if test "$ac_lto_supported" = "yes"; then
|
|
|
|
CFLAGS="$CFLAGS $LTO"
|
|
|
|
if test x$emacs_cv_clang = xyes; then
|
|
|
|
AC_MSG_WARN([Please read INSTALL before using link-time optimization with clang])
|
|
|
|
# WARNING: 'ar --plugin ...' doesn't work without
|
|
|
|
# command, so plugin name is appended to ARFLAGS.
|
|
|
|
ARFLAGS="cru --plugin $GOLD_PLUGIN"
|
|
|
|
RANLIB="$RANLIB --plugin $GOLD_PLUGIN"
|
2014-06-21 19:45:59 +00:00
|
|
|
else
|
|
|
|
dnl The following is needed for GCC 4.9.0. The GCC 4.9.0 release notes
|
|
|
|
dnl suggest that instead of -ffat-lto-objects we should use gcc-ar and
|
|
|
|
dnl gcc-ranlib in place of ar and ranlib, but gcc-ar makes /usr/bin/ar
|
|
|
|
dnl dump core on Fedora 20, so play it safe for now.
|
|
|
|
gl_COMPILER_OPTION_IF([-ffat-lto-objects],
|
|
|
|
[CFLAGS="$CFLAGS -ffat-lto-objects"])
|
2014-05-13 11:12:05 +00:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi)
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2014-09-07 08:46:42 +00:00
|
|
|
dnl Port to Automake 1.11.
|
|
|
|
dnl This section can be removed once we assume Automake 1.14 or later.
|
|
|
|
: ${AM_DEFAULT_VERBOSITY=1}
|
|
|
|
: ${AM_V=$AM_DEFAULT_VERBOSITY}
|
|
|
|
: ${AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY}
|
|
|
|
AC_SUBST([AM_V])
|
|
|
|
AM_SUBST_NOTMAKE([AM_V])
|
|
|
|
AC_SUBST([AM_DEFAULT_V])
|
|
|
|
AM_SUBST_NOTMAKE([AM_DEFAULT_V])
|
|
|
|
AC_SUBST([AM_DEFAULT_VERBOSITY])
|
|
|
|
|
* 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 09:01:55 +00:00
|
|
|
dnl Some other nice autoconf tests.
|
|
|
|
dnl These are commented out, since gl_EARLY and/or Autoconf already does them.
|
|
|
|
dnl AC_PROG_INSTALL
|
|
|
|
dnl AC_PROG_MKDIR_P
|
|
|
|
dnl if test "x$RANLIB" = x; then
|
|
|
|
dnl AC_PROG_RANLIB
|
|
|
|
dnl fi
|
2013-04-18 05:03:53 +00:00
|
|
|
|
|
|
|
|
|
|
|
dnl Sadly, AC_PROG_LN_S is too restrictive. It also tests whether links
|
|
|
|
dnl can be made to directories. This is not relevant for our usage, and
|
|
|
|
dnl excludes some cases that work fine for us. Eg MS Windows or files
|
|
|
|
dnl hosted on AFS, both examples where simple links work, but links to
|
|
|
|
dnl directories fail. We use a cut-down version instead.
|
|
|
|
dnl AC_PROG_LN_S
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([whether ln -s works for files in the same directory])
|
|
|
|
rm -f conf$$ conf$$.file
|
|
|
|
|
|
|
|
LN_S_FILEONLY='cp -p'
|
|
|
|
|
2014-04-13 06:44:22 +00:00
|
|
|
dnl On MinGW, ensure we will call the MSYS /bin/ln.exe, not some
|
|
|
|
dnl random program in the current directory.
|
2013-04-18 05:03:53 +00:00
|
|
|
if (echo >conf$$.file) 2>/dev/null; then
|
|
|
|
if ln -s conf$$.file conf$$ 2>/dev/null; then
|
2014-04-13 06:44:22 +00:00
|
|
|
if test "$opsys" = "mingw32"; then
|
|
|
|
LN_S_FILEONLY='/bin/ln -s'
|
|
|
|
else
|
|
|
|
LN_S_FILEONLY='ln -s'
|
|
|
|
fi
|
2013-04-18 05:03:53 +00:00
|
|
|
elif ln conf$$.file conf$$ 2>/dev/null; then
|
2014-04-13 06:44:22 +00:00
|
|
|
if test "$opsys" = "mingw32"; then
|
|
|
|
LN_S_FILEONLY=/bin/ln
|
|
|
|
else
|
|
|
|
LN_S_FILEONLY=ln
|
|
|
|
fi
|
2013-04-18 05:03:53 +00:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
rm -f conf$$ conf$$.file
|
|
|
|
|
|
|
|
if test "$LN_S_FILEONLY" = "ln -s"; then
|
|
|
|
AC_MSG_RESULT([yes])
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT([no, using $LN_S_FILEONLY])
|
|
|
|
fi
|
|
|
|
|
|
|
|
AC_SUBST(LN_S_FILEONLY)
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2013-04-17 17:51:31 +00:00
|
|
|
dnl AC_PROG_LN_S sets LN_S to 'cp -pR' for MinGW, on the premise that 'ln'
|
|
|
|
dnl doesn't support links to directories, as in "ln file dir". But that
|
|
|
|
dnl use is non-portable, and OTOH MinGW wants to use hard links for Emacs
|
|
|
|
dnl executables at "make install" time.
|
|
|
|
dnl See http://lists.gnu.org/archive/html/emacs-devel/2013-04/msg00475.html
|
|
|
|
dnl for more details.
|
2013-04-14 16:36:49 +00:00
|
|
|
if test "$opsys" = "mingw32"; then
|
2014-04-13 06:46:10 +00:00
|
|
|
LN_S="/bin/ln"
|
2013-04-14 16:36:49 +00:00
|
|
|
fi
|
|
|
|
|
2014-05-17 01:40:49 +00:00
|
|
|
dnl On some Debian versions, "install-info" prints irritating messages
|
|
|
|
dnl "This is not dpkg install-info anymore, but GNU install-info"
|
|
|
|
dnl if called via an absolute file name.
|
|
|
|
dnl Use the entirely-identical-but-quieter ginstall-info instead if present.
|
2014-05-18 22:41:22 +00:00
|
|
|
dnl Sadly some people may have an old ginstall-info installed on
|
|
|
|
dnl non-Debian systems, so we can't use this.
|
|
|
|
dnl AC_PATH_PROGS(INSTALL_INFO, [ginstall-info install-info], :,
|
|
|
|
dnl $PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin)
|
|
|
|
|
2012-05-28 00:46:33 +00:00
|
|
|
AC_PATH_PROG(INSTALL_INFO, install-info, :,
|
|
|
|
$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin)
|
2010-12-03 14:45:09 +00:00
|
|
|
dnl Don't use GZIP, which is used by gzip for additional parameters.
|
|
|
|
AC_PATH_PROG(GZIP_PROG, gzip)
|
|
|
|
|
2013-09-09 00:10:58 +00:00
|
|
|
test $with_compress_install != yes && test -n "$GZIP_PROG" && \
|
2013-09-08 23:50:23 +00:00
|
|
|
GZIP_PROG=" # $GZIP_PROG # (disabled by configure --without-compress-install)"
|
|
|
|
|
2012-06-27 23:57:56 +00:00
|
|
|
if test $opsys = gnu-linux; then
|
|
|
|
AC_PATH_PROG(PAXCTL, paxctl,,
|
|
|
|
[$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/sbin])
|
2012-08-05 05:00:52 +00:00
|
|
|
if test "X$PAXCTL" != X; then
|
|
|
|
AC_MSG_CHECKING([whether binaries have a PT_PAX_FLAGS header])
|
|
|
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
|
|
|
|
[if $PAXCTL -v conftest$EXEEXT >/dev/null 2>&1; then AC_MSG_RESULT(yes)
|
|
|
|
else AC_MSG_RESULT(no); PAXCTL=""; fi])
|
|
|
|
fi
|
2014-01-05 00:55:29 +00:00
|
|
|
|
|
|
|
if test "${SETFATTR+set}" != set; then
|
|
|
|
AC_CACHE_CHECK([for setfattr],
|
|
|
|
[emacs_cv_prog_setfattr],
|
|
|
|
[touch conftest.tmp
|
|
|
|
if (setfattr -n user.pax.flags conftest.tmp) >/dev/null 2>&1; then
|
|
|
|
emacs_cv_prog_setfattr=yes
|
|
|
|
else
|
|
|
|
emacs_cv_prog_setfattr=no
|
|
|
|
fi])
|
|
|
|
if test "$emacs_cv_prog_setfattr" = yes; then
|
|
|
|
SETFATTR=setfattr
|
|
|
|
else
|
2014-01-05 01:00:32 +00:00
|
|
|
SETFATTR=
|
2014-01-05 00:55:29 +00:00
|
|
|
fi
|
|
|
|
rm -f conftest.tmp
|
|
|
|
AC_SUBST([SETFATTR])
|
|
|
|
fi
|
2012-06-27 23:57:56 +00:00
|
|
|
fi
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2012-04-09 00:50:17 +00:00
|
|
|
## Need makeinfo >= 4.7 (?) to build the manuals.
|
2012-12-09 02:22:39 +00:00
|
|
|
if test "$MAKEINFO" != "no"; then
|
2014-09-04 02:02:46 +00:00
|
|
|
if test "$MAKEINFO" = "${am_missing_run}makeinfo"; then
|
|
|
|
MAKEINFO=makeinfo
|
|
|
|
fi
|
|
|
|
case `($MAKEINFO --version) 2>/dev/null` in
|
2014-09-25 02:59:45 +00:00
|
|
|
*' (GNU texinfo) '4.[[7-9]]* | \
|
|
|
|
*' (GNU texinfo) '4.[[1-9][0-9]]* | \
|
|
|
|
*' (GNU texinfo) '[[5-9]]* | \
|
|
|
|
*' (GNU texinfo) '[[1-9][0-9]]* ) ;;
|
2014-09-04 02:02:46 +00:00
|
|
|
*) MAKEINFO=no;;
|
2012-12-09 02:22:39 +00:00
|
|
|
esac
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
## Makeinfo is unusual. For a released Emacs, the manuals are
|
|
|
|
## pre-built, and not deleted by the normal clean rules. makeinfo is
|
|
|
|
## therefore in the category of "special tools" not normally required, which
|
|
|
|
## configure does not have to check for (eg autoconf itself).
|
2014-01-09 00:10:07 +00:00
|
|
|
## In a repository checkout on the other hand, the manuals are not included.
|
|
|
|
## So makeinfo is a requirement to build from the repository, and configure
|
2010-12-03 14:45:09 +00:00
|
|
|
## should test for it as it does for any other build requirement.
|
|
|
|
## We use the presence of $srcdir/info/emacs to distinguish a release,
|
2014-01-09 00:10:07 +00:00
|
|
|
## with pre-built manuals, from a repository checkout.
|
2011-01-05 07:10:47 +00:00
|
|
|
HAVE_MAKEINFO=yes
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "$MAKEINFO" = "no"; then
|
2011-01-05 07:10:47 +00:00
|
|
|
MAKEINFO=makeinfo
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "x${with_makeinfo}" = "xno"; then
|
2011-01-05 07:10:47 +00:00
|
|
|
HAVE_MAKEINFO=no
|
2012-12-09 02:22:39 +00:00
|
|
|
elif test ! -e "$srcdir/info/emacs" && test ! -e "$srcdir/info/emacs.info"; then
|
2012-04-09 00:50:17 +00:00
|
|
|
AC_MSG_ERROR( [You do not seem to have makeinfo >= 4.7, and your
|
2010-12-03 14:45:09 +00:00
|
|
|
source tree does not seem to have pre-built manuals in the `info' directory.
|
|
|
|
Either install a suitable version of makeinfo, or re-run configure
|
|
|
|
with the `--without-makeinfo' option to build without the manuals.] )
|
|
|
|
fi
|
|
|
|
fi
|
2011-01-05 07:10:47 +00:00
|
|
|
AC_SUBST(HAVE_MAKEINFO)
|
2010-12-03 14:45:09 +00:00
|
|
|
|
Move source for Emacs on MS Windows FAQ here from Emacs webpages repository
* Makefile.in (mostlyclean, clean, distclean, bootstrap-clean)
(maintainer-clean, check-declare): Remove pointless subshells.
Check cd return value.
* configure.ac (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32)
(DOCMISC_PDF_W32, DOCMISC_PS_W32): New output variables.
* Makefile.in (check-info-dir): Ignore efaq-w32.
* admin/admin.el (manual-misc-manuals): Use INFO_COMMON rather than
INFO_TARGETS.
* doc/misc/efaq-w32.texi: Move here from the web-pages repository.
* doc/misc/Makefile.in (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32)
(DOCMISC_PDF_W32, DOCMISC_PS_W32): New configure output variables.
(INFO_COMMON, INFO_INSTALL): New derivations of INFO_TARGETS.
(DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS):
Add DOCMISC_*_W32 variables.
(echo-info): Use INFO_INSTALL rather than INFO_TARGETS.
(efaq_w32_deps): New variable.
(efaq-w32, $(buildinfodir)/efaq-w32$(INFO_EXT), efaq-w32.dvi)
(efaq-w32.pdf, efaq-w32.html): New rules.
(clean): Remove efaq-w32 products.
2013-08-27 07:57:39 +00:00
|
|
|
if test $opsys = mingw32; then
|
2013-08-28 01:37:13 +00:00
|
|
|
DOCMISC_W32=efaq-w32
|
Move source for Emacs on MS Windows FAQ here from Emacs webpages repository
* Makefile.in (mostlyclean, clean, distclean, bootstrap-clean)
(maintainer-clean, check-declare): Remove pointless subshells.
Check cd return value.
* configure.ac (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32)
(DOCMISC_PDF_W32, DOCMISC_PS_W32): New output variables.
* Makefile.in (check-info-dir): Ignore efaq-w32.
* admin/admin.el (manual-misc-manuals): Use INFO_COMMON rather than
INFO_TARGETS.
* doc/misc/efaq-w32.texi: Move here from the web-pages repository.
* doc/misc/Makefile.in (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32)
(DOCMISC_PDF_W32, DOCMISC_PS_W32): New configure output variables.
(INFO_COMMON, INFO_INSTALL): New derivations of INFO_TARGETS.
(DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS):
Add DOCMISC_*_W32 variables.
(echo-info): Use INFO_INSTALL rather than INFO_TARGETS.
(efaq_w32_deps): New variable.
(efaq-w32, $(buildinfodir)/efaq-w32$(INFO_EXT), efaq-w32.dvi)
(efaq-w32.pdf, efaq-w32.html): New rules.
(clean): Remove efaq-w32 products.
2013-08-27 07:57:39 +00:00
|
|
|
else
|
2013-08-28 01:37:13 +00:00
|
|
|
DOCMISC_W32=
|
Move source for Emacs on MS Windows FAQ here from Emacs webpages repository
* Makefile.in (mostlyclean, clean, distclean, bootstrap-clean)
(maintainer-clean, check-declare): Remove pointless subshells.
Check cd return value.
* configure.ac (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32)
(DOCMISC_PDF_W32, DOCMISC_PS_W32): New output variables.
* Makefile.in (check-info-dir): Ignore efaq-w32.
* admin/admin.el (manual-misc-manuals): Use INFO_COMMON rather than
INFO_TARGETS.
* doc/misc/efaq-w32.texi: Move here from the web-pages repository.
* doc/misc/Makefile.in (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32)
(DOCMISC_PDF_W32, DOCMISC_PS_W32): New configure output variables.
(INFO_COMMON, INFO_INSTALL): New derivations of INFO_TARGETS.
(DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS):
Add DOCMISC_*_W32 variables.
(echo-info): Use INFO_INSTALL rather than INFO_TARGETS.
(efaq_w32_deps): New variable.
(efaq-w32, $(buildinfodir)/efaq-w32$(INFO_EXT), efaq-w32.dvi)
(efaq-w32.pdf, efaq-w32.html): New rules.
(clean): Remove efaq-w32 products.
2013-08-27 07:57:39 +00:00
|
|
|
fi
|
2013-08-28 01:37:13 +00:00
|
|
|
AC_SUBST(DOCMISC_W32)
|
Move source for Emacs on MS Windows FAQ here from Emacs webpages repository
* Makefile.in (mostlyclean, clean, distclean, bootstrap-clean)
(maintainer-clean, check-declare): Remove pointless subshells.
Check cd return value.
* configure.ac (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32)
(DOCMISC_PDF_W32, DOCMISC_PS_W32): New output variables.
* Makefile.in (check-info-dir): Ignore efaq-w32.
* admin/admin.el (manual-misc-manuals): Use INFO_COMMON rather than
INFO_TARGETS.
* doc/misc/efaq-w32.texi: Move here from the web-pages repository.
* doc/misc/Makefile.in (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32)
(DOCMISC_PDF_W32, DOCMISC_PS_W32): New configure output variables.
(INFO_COMMON, INFO_INSTALL): New derivations of INFO_TARGETS.
(DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS):
Add DOCMISC_*_W32 variables.
(echo-info): Use INFO_INSTALL rather than INFO_TARGETS.
(efaq_w32_deps): New variable.
(efaq-w32, $(buildinfodir)/efaq-w32$(INFO_EXT), efaq-w32.dvi)
(efaq-w32.pdf, efaq-w32.html): New rules.
(clean): Remove efaq-w32 products.
2013-08-27 07:57:39 +00:00
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
dnl Add our options to ac_link now, after it is set up.
|
|
|
|
|
|
|
|
if test x$GCC = xyes; then
|
|
|
|
test "x$GCC_LINK_TEST_OPTIONS" != x && \
|
|
|
|
ac_link="$ac_link $GCC_LINK_TEST_OPTIONS"
|
|
|
|
else
|
|
|
|
test "x$NON_GCC_LINK_TEST_OPTIONS" != x && \
|
|
|
|
ac_link="$ac_link $NON_GCC_LINK_TEST_OPTIONS"
|
|
|
|
fi
|
|
|
|
|
|
|
|
dnl We need -znocombreloc if we're using a relatively recent GNU ld.
|
|
|
|
dnl If we can link with the flag, it shouldn't do any harm anyhow.
|
|
|
|
dnl (Don't use `-z nocombreloc' as -z takes no arg on Irix.)
|
|
|
|
dnl Treat GCC specially since it just gives a non-fatal `unrecognized option'
|
|
|
|
dnl if not built to support GNU ld.
|
|
|
|
|
2013-09-09 18:14:50 +00:00
|
|
|
dnl For a long time, -znocombreloc was added to LDFLAGS rather than
|
|
|
|
dnl LD_SWITCH_SYSTEM_TEMACS. That is:
|
|
|
|
dnl * inappropriate, as LDFLAGS is a user option but this is essential.
|
|
|
|
dnl Eg "make LDFLAGS=... all" could run into problems,
|
2013-09-09 16:26:38 +00:00
|
|
|
dnl http://bugs.debian.org/684788
|
2013-09-09 18:14:50 +00:00
|
|
|
dnl * unnecessary, since temacs is the only thing that actually needs it.
|
|
|
|
dnl Indeed this is where it was originally, prior to:
|
2013-09-09 16:26:38 +00:00
|
|
|
dnl http://lists.gnu.org/archive/html/emacs-pretest-bug/2004-03/msg00170.html
|
2013-09-09 15:54:03 +00:00
|
|
|
late_LDFLAGS="$LDFLAGS"
|
2010-12-03 14:45:09 +00:00
|
|
|
if test x$GCC = xyes; then
|
2013-09-09 07:34:15 +00:00
|
|
|
LDFLAGS_NOCOMBRELOC="-Wl,-znocombreloc"
|
2010-12-03 14:45:09 +00:00
|
|
|
else
|
2013-09-09 07:34:15 +00:00
|
|
|
LDFLAGS_NOCOMBRELOC="-znocombreloc"
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
|
2013-09-09 07:34:15 +00:00
|
|
|
LDFLAGS="$LDFLAGS $LDFLAGS_NOCOMBRELOC"
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_MSG_CHECKING([for -znocombreloc])
|
|
|
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
|
|
|
|
[AC_MSG_RESULT(yes)],
|
2013-09-09 07:34:15 +00:00
|
|
|
LDFLAGS_NOCOMBRELOC=
|
2010-12-03 14:45:09 +00:00
|
|
|
[AC_MSG_RESULT(no)])
|
|
|
|
|
2013-09-09 15:54:03 +00:00
|
|
|
LDFLAGS="$late_LDFLAGS"
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2013-12-26 08:57:28 +00:00
|
|
|
AC_CACHE_CHECK([whether addresses are sanitized],
|
|
|
|
[emacs_cv_sanitize_address],
|
|
|
|
[AC_COMPILE_IFELSE(
|
|
|
|
[AC_LANG_PROGRAM(
|
|
|
|
[[#ifndef __has_feature
|
|
|
|
#define __has_feature(f) 0
|
|
|
|
#endif
|
|
|
|
#if defined __SANITIZE_ADDRESS__ || __has_feature (address_sanitizer)
|
|
|
|
#else
|
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 22:51:08 +00:00
|
|
|
error "Addresses are not sanitized.";
|
2013-12-26 08:57:28 +00:00
|
|
|
#endif
|
|
|
|
]])],
|
|
|
|
[emacs_cv_sanitize_address=yes],
|
|
|
|
[emacs_cv_sanitize_address=no])])
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
dnl The function dump-emacs will not be defined and temacs will do
|
|
|
|
dnl (load "loadup") automatically unless told otherwise.
|
2011-01-25 03:55:12 +00:00
|
|
|
test "x$CANNOT_DUMP" = "x" && CANNOT_DUMP=no
|
2010-12-03 14:45:09 +00:00
|
|
|
case "$opsys" in
|
2011-01-25 03:55:12 +00:00
|
|
|
your-opsys-here) CANNOT_DUMP=yes ;;
|
2010-12-03 14:45:09 +00:00
|
|
|
esac
|
2011-01-25 03:55:12 +00:00
|
|
|
|
2013-12-26 08:57:28 +00:00
|
|
|
if test "$CANNOT_DUMP" = "yes"; then
|
2011-01-25 03:55:12 +00:00
|
|
|
AC_DEFINE(CANNOT_DUMP, 1, [Define if Emacs cannot be dumped on your system.])
|
2013-12-26 08:57:28 +00:00
|
|
|
elif test "$emacs_cv_sanitize_address" = yes; then
|
|
|
|
AC_MSG_WARN([[Addresses are sanitized; suggest CANNOT_DUMP=yes]])
|
|
|
|
fi
|
2011-01-25 03:55:12 +00:00
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_SUBST(CANNOT_DUMP)
|
|
|
|
|
|
|
|
|
|
|
|
UNEXEC_OBJ=unexelf.o
|
|
|
|
case "$opsys" in
|
|
|
|
# MSDOS uses unexcoff.o
|
|
|
|
aix4-2)
|
|
|
|
UNEXEC_OBJ=unexaix.o
|
|
|
|
;;
|
|
|
|
cygwin)
|
|
|
|
UNEXEC_OBJ=unexcw.o
|
|
|
|
;;
|
|
|
|
darwin)
|
|
|
|
UNEXEC_OBJ=unexmacosx.o
|
|
|
|
;;
|
|
|
|
hpux10-20 | hpux11)
|
|
|
|
UNEXEC_OBJ=unexhp9k800.o
|
|
|
|
;;
|
2012-11-22 17:32:57 +00:00
|
|
|
mingw32)
|
|
|
|
UNEXEC_OBJ=unexw32.o
|
|
|
|
;;
|
2010-12-03 14:45:09 +00:00
|
|
|
sol2-10)
|
|
|
|
# Use the Solaris dldump() function, called from unexsol.c, to dump
|
|
|
|
# emacs, instead of the generic ELF dump code found in unexelf.c.
|
|
|
|
# The resulting binary has a complete symbol table, and is better
|
|
|
|
# for debugging and other observability tools (debuggers, pstack, etc).
|
2011-01-22 00:12:10 +00:00
|
|
|
#
|
2010-12-03 14:45:09 +00:00
|
|
|
# If you encounter a problem using dldump(), please consider sending
|
|
|
|
# a message to the OpenSolaris tools-linking mailing list:
|
|
|
|
# http://mail.opensolaris.org/mailman/listinfo/tools-linking
|
2011-01-22 00:12:10 +00:00
|
|
|
#
|
2010-12-03 14:45:09 +00:00
|
|
|
# It is likely that dldump() works with older Solaris too, but this has
|
|
|
|
# not been tested, so for now this change is for Solaris 10 or newer.
|
|
|
|
UNEXEC_OBJ=unexsol.o
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
LD_SWITCH_SYSTEM=
|
|
|
|
case "$opsys" in
|
2013-04-18 17:12:21 +00:00
|
|
|
freebsd|dragonfly)
|
2010-12-03 14:45:09 +00:00
|
|
|
## Let `ld' find image libs and similar things in /usr/local/lib.
|
|
|
|
## The system compiler, GCC, has apparently been modified to not
|
|
|
|
## look there, contrary to what a stock GCC would do.
|
2012-05-02 16:55:00 +00:00
|
|
|
### It's not our place to do this. See bug#10313#17.
|
|
|
|
### LD_SWITCH_SYSTEM=-L/usr/local/lib
|
|
|
|
:
|
2010-12-03 14:45:09 +00:00
|
|
|
;;
|
|
|
|
|
|
|
|
gnu-linux)
|
|
|
|
## cpp test was "ifdef __mips__", but presumably this is equivalent...
|
2010-12-04 19:50:39 +00:00
|
|
|
case $host_cpu in mips*) LD_SWITCH_SYSTEM="-G 0";; esac
|
2010-12-03 14:45:09 +00:00
|
|
|
;;
|
|
|
|
|
|
|
|
netbsd)
|
2012-05-02 16:55:00 +00:00
|
|
|
### It's not our place to do this. See bug#10313#17.
|
|
|
|
### LD_SWITCH_SYSTEM="-Wl,-rpath,/usr/pkg/lib -L/usr/pkg/lib -Wl,-rpath,/usr/local/lib -L/usr/local/lib"
|
|
|
|
:
|
2010-12-03 14:45:09 +00:00
|
|
|
;;
|
|
|
|
|
|
|
|
openbsd)
|
2013-05-13 06:23:08 +00:00
|
|
|
## Han Boetes <han@boetes.org> says this is necessary,
|
2010-12-03 14:45:09 +00:00
|
|
|
## otherwise Emacs dumps core on elf systems.
|
|
|
|
LD_SWITCH_SYSTEM="-Z"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
AC_SUBST(LD_SWITCH_SYSTEM)
|
|
|
|
|
|
|
|
ac_link="$ac_link $LD_SWITCH_SYSTEM"
|
|
|
|
|
2012-05-01 00:16:02 +00:00
|
|
|
## This setting of LD_SWITCH_SYSTEM references LD_SWITCH_X_SITE_RPATH,
|
2010-12-03 14:45:09 +00:00
|
|
|
## which has not been defined yet. When this was handled with cpp,
|
|
|
|
## it was expanded to null when configure sourced the s/*.h file.
|
|
|
|
## Thus LD_SWITCH_SYSTEM had different values in configure and the Makefiles.
|
|
|
|
## FIXME it would be cleaner to put this in LD_SWITCH_SYSTEM_TEMACS
|
|
|
|
## (or somesuch), but because it is supposed to go at the _front_
|
|
|
|
## of LD_SWITCH_SYSTEM, we cannot do that in exactly the same way.
|
|
|
|
## Compare with the gnu-linux case below, which added to the end
|
|
|
|
## of LD_SWITCH_SYSTEM, and so can instead go at the front of
|
|
|
|
## LD_SWITCH_SYSTEM_TEMACS.
|
|
|
|
case "$opsys" in
|
|
|
|
netbsd|openbsd)
|
2012-05-01 00:16:02 +00:00
|
|
|
LD_SWITCH_SYSTEM="\$(LD_SWITCH_X_SITE_RPATH) $LD_SWITCH_SYSTEM" ;;
|
2010-12-03 14:45:09 +00:00
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
|
|
C_SWITCH_MACHINE=
|
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 16:20:27 +00:00
|
|
|
case $canonical in
|
|
|
|
alpha*)
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_CHECK_DECL([__ELF__])
|
|
|
|
if test "$ac_cv_have_decl___ELF__" = "yes"; then
|
|
|
|
## With ELF, make sure that all common symbols get allocated to in the
|
|
|
|
## data section. Otherwise, the dump of temacs may miss variables in
|
|
|
|
## the shared library that have been initialized. For example, with
|
|
|
|
## GNU libc, __malloc_initialized would normally be resolved to the
|
|
|
|
## shared library's .bss section, which is fatal.
|
|
|
|
if test "x$GCC" = "xyes"; then
|
|
|
|
C_SWITCH_MACHINE="-fno-common"
|
|
|
|
else
|
2013-10-13 23:01:20 +00:00
|
|
|
AC_MSG_ERROR([Non-GCC compilers are not supported.])
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
else
|
2013-10-13 23:01:20 +00:00
|
|
|
dnl This was the unexalpha.c case. Removed in 24.1, 2010-07-24,
|
|
|
|
dnl albeit under the mistaken assumption that said file
|
|
|
|
dnl was no longer used.
|
|
|
|
AC_MSG_ERROR([Non-ELF systems are not supported since Emacs 24.1.])
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
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 16:20:27 +00:00
|
|
|
;;
|
|
|
|
esac
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_SUBST(C_SWITCH_MACHINE)
|
|
|
|
|
|
|
|
AC_SUBST(UNEXEC_OBJ)
|
|
|
|
|
|
|
|
C_SWITCH_SYSTEM=
|
|
|
|
## Some programs in src produce warnings saying certain subprograms
|
|
|
|
## are too complex and need a MAXMEM value greater than 2000 for
|
|
|
|
## additional optimization. --nils@exp-math.uni-essen.de
|
|
|
|
test "$opsys" = "aix4.2" && test "x$GCC" != "xyes" && \
|
|
|
|
C_SWITCH_SYSTEM="-ma -qmaxmem=4000"
|
2013-12-31 16:01:34 +00:00
|
|
|
if test "$opsys" = "mingw32"; then
|
|
|
|
case "$canonical" in
|
2014-08-23 08:48:30 +00:00
|
|
|
x86_64-*-mingw*) C_SWITCH_SYSTEM="-mtune=generic" ;;
|
2013-12-31 16:01:34 +00:00
|
|
|
*) C_SWITCH_SYSTEM="-mtune=pentium4" ;;
|
|
|
|
esac
|
|
|
|
fi
|
2010-12-03 14:45:09 +00:00
|
|
|
## gnu-linux might need -D_BSD_SOURCE on old libc5 systems.
|
|
|
|
## It is redundant in glibc2, since we define _GNU_SOURCE.
|
|
|
|
AC_SUBST(C_SWITCH_SYSTEM)
|
|
|
|
|
|
|
|
|
|
|
|
LIBS_SYSTEM=
|
|
|
|
case "$opsys" in
|
|
|
|
## IBM's X11R5 uses -lIM and -liconv in AIX 3.2.2.
|
|
|
|
aix4-2) LIBS_SYSTEM="-lrts -lIM -liconv" ;;
|
|
|
|
|
2013-04-18 17:12:21 +00:00
|
|
|
freebsd|dragonfly) LIBS_SYSTEM="-lutil" ;;
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
hpux*) LIBS_SYSTEM="-l:libdld.sl" ;;
|
|
|
|
|
2011-02-16 00:33:44 +00:00
|
|
|
sol2*) LIBS_SYSTEM="-lsocket -lnsl" ;;
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
## Motif needs -lgen.
|
|
|
|
unixware) LIBS_SYSTEM="-lsocket -lnsl -lelf -lgen" ;;
|
|
|
|
esac
|
|
|
|
|
2013-03-30 17:00:51 +00:00
|
|
|
AC_SUBST(LIBS_SYSTEM)
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
### Make sure subsequent tests use flags consistent with the build flags.
|
|
|
|
|
|
|
|
if test x"${OVERRIDE_CPPFLAGS}" != x; then
|
|
|
|
CPPFLAGS="${OVERRIDE_CPPFLAGS}"
|
|
|
|
else
|
|
|
|
CPPFLAGS="$C_SWITCH_SYSTEM $C_SWITCH_MACHINE $CPPFLAGS"
|
|
|
|
fi
|
|
|
|
|
2014-05-17 08:11:31 +00:00
|
|
|
# Suppress obsolescent Autoconf test for size_t; Emacs assumes C99 or better.
|
2011-04-22 07:36:41 +00:00
|
|
|
AC_DEFUN([AC_TYPE_SIZE_T])
|
2011-07-08 20:20:19 +00:00
|
|
|
# Likewise for obsolescent test for uid_t, gid_t; Emacs assumes them.
|
|
|
|
AC_DEFUN([AC_TYPE_UID_T])
|
2011-04-22 07:36:41 +00:00
|
|
|
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
# sqrt and other floating-point functions such as fmod and frexp
|
|
|
|
# are found in -lm on many systems.
|
|
|
|
OLD_LIBS=$LIBS
|
|
|
|
AC_SEARCH_LIBS([sqrt], [m])
|
|
|
|
if test "X$LIBS" = "X$OLD_LIBS"; then
|
|
|
|
LIB_MATH=
|
|
|
|
else
|
|
|
|
LIB_MATH=$ac_cv_search_sqrt
|
|
|
|
fi
|
|
|
|
LIBS=$OLD_LIBS
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2012-06-11 23:17:11 +00:00
|
|
|
dnl Current possibilities handled by sed (aix4-2 -> aix,
|
|
|
|
dnl gnu-linux -> gnu/linux, etc.):
|
|
|
|
dnl gnu, gnu/linux, gnu/kfreebsd, aix, cygwin, darwin, hpux, irix.
|
|
|
|
dnl And special cases: berkeley-unix, usg-unix-v, ms-dos, windows-nt.
|
2012-06-12 16:14:53 +00:00
|
|
|
SYSTEM_TYPE=`echo $opsys | sed -e 's/[[0-9]].*//' -e 's|-|/|'`
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
case $opsys in
|
|
|
|
cygwin )
|
|
|
|
LIB_MATH=
|
|
|
|
;;
|
|
|
|
darwin )
|
|
|
|
## Adding -lm confuses the dynamic linker, so omit it.
|
|
|
|
LIB_MATH=
|
|
|
|
;;
|
2013-04-18 17:12:21 +00:00
|
|
|
freebsd | dragonfly )
|
2012-06-11 23:17:11 +00:00
|
|
|
SYSTEM_TYPE=berkeley-unix
|
2010-12-03 14:45:09 +00:00
|
|
|
;;
|
|
|
|
gnu-linux | gnu-kfreebsd )
|
|
|
|
;;
|
|
|
|
hpux10-20 | hpux11 )
|
|
|
|
;;
|
2012-11-22 17:32:57 +00:00
|
|
|
mingw32 )
|
|
|
|
LIB_MATH=
|
2013-03-29 19:53:25 +00:00
|
|
|
SYSTEM_TYPE=windows-nt
|
2012-11-22 17:32:57 +00:00
|
|
|
;;
|
2011-09-24 19:06:20 +00:00
|
|
|
dnl NB this may be adjusted below.
|
2010-12-03 14:45:09 +00:00
|
|
|
netbsd | openbsd )
|
2012-06-11 23:17:11 +00:00
|
|
|
SYSTEM_TYPE=berkeley-unix
|
2010-12-03 14:45:09 +00:00
|
|
|
;;
|
2012-06-11 23:17:11 +00:00
|
|
|
|
|
|
|
sol2* | unixware )
|
|
|
|
SYSTEM_TYPE=usg-unix-v
|
|
|
|
;;
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
esac
|
|
|
|
|
|
|
|
AC_SUBST(LIB_MATH)
|
2012-06-11 23:17:11 +00:00
|
|
|
AC_DEFINE_UNQUOTED(SYSTEM_TYPE, "$SYSTEM_TYPE",
|
|
|
|
[The type of system you are compiling for; sets `system-type'.])
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2014-05-02 23:31:41 +00:00
|
|
|
|
2012-07-17 02:09:58 +00:00
|
|
|
pre_PKG_CONFIG_CFLAGS=$CFLAGS
|
|
|
|
pre_PKG_CONFIG_LIBS=$LIBS
|
2012-06-22 21:17:42 +00:00
|
|
|
|
2014-05-11 02:47:57 +00:00
|
|
|
PKG_PROG_PKG_CONFIG(0.9.0)
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2014-05-03 08:12:06 +00:00
|
|
|
dnl EMACS_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4)
|
|
|
|
dnl acts like PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4,
|
|
|
|
dnl HAVE_GSTUFF=yes, HAVE_GSTUFF=no) -- see pkg-config man page --
|
2014-05-16 15:49:13 +00:00
|
|
|
dnl except that it postprocesses CFLAGS as needed for --enable-gcc-warnings.
|
2014-05-03 08:12:06 +00:00
|
|
|
dnl EMACS_CHECK_MODULES accepts optional 3rd and 4th arguments that
|
|
|
|
dnl can take the place of the default HAVE_GSTUFF=yes and HAVE_GSTUFF=no
|
|
|
|
dnl actions.
|
|
|
|
AC_DEFUN([EMACS_CHECK_MODULES],
|
2014-05-16 15:49:13 +00:00
|
|
|
[PKG_CHECK_MODULES([$1], [$2],
|
|
|
|
[$1_CFLAGS=`AS_ECHO(["$$1_CFLAGS"]) | sed -e "$edit_cflags"`
|
2014-05-16 19:03:07 +00:00
|
|
|
m4_default([$3], [HAVE_$1=yes])],
|
|
|
|
[m4_default([$4], [HAVE_$1=no])])])
|
2014-05-03 08:12:06 +00:00
|
|
|
|
2013-07-27 01:18:21 +00:00
|
|
|
HAVE_SOUND=no
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "${with_sound}" != "no"; then
|
2014-09-27 23:35:50 +00:00
|
|
|
# Sound support for GNU/Linux, the free BSDs, MinGW, and Cygwin.
|
2014-09-13 07:10:40 +00:00
|
|
|
AC_CHECK_HEADERS([machine/soundcard.h sys/soundcard.h soundcard.h mmsystem.h],
|
2013-03-30 07:24:02 +00:00
|
|
|
have_sound_header=yes, [], [
|
|
|
|
#ifdef __MINGW32__
|
|
|
|
#define WIN32_LEAN_AND_MEAN
|
|
|
|
#include <windows.h>
|
|
|
|
#endif
|
|
|
|
])
|
2013-08-31 20:00:22 +00:00
|
|
|
test "${with_sound}" = "oss" && test "${have_sound_header}" != "yes" && \
|
|
|
|
AC_MSG_ERROR([OSS sound support requested but not found.])
|
2013-08-31 19:54:17 +00:00
|
|
|
|
2013-08-31 20:00:22 +00:00
|
|
|
if test "${with_sound}" = "bsd-ossaudio" || test "${with_sound}" = "yes"; then
|
2013-07-27 01:18:21 +00:00
|
|
|
# Emulation library used on NetBSD.
|
|
|
|
AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=)
|
2013-08-31 20:00:22 +00:00
|
|
|
test "${with_sound}" = "bsd-ossaudio" && test -z "$LIBSOUND" && \
|
|
|
|
AC_MSG_ERROR([bsd-ossaudio sound support requested but not found.])
|
|
|
|
dnl FIXME? If we did find ossaudio, should we set with_sound=bsd-ossaudio?
|
2013-07-27 01:18:21 +00:00
|
|
|
dnl Traditionally, we go on to check for alsa too. Does that make sense?
|
|
|
|
fi
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_SUBST(LIBSOUND)
|
|
|
|
|
2013-07-27 01:18:21 +00:00
|
|
|
if test "${with_sound}" = "alsa" || test "${with_sound}" = "yes"; then
|
|
|
|
ALSA_REQUIRED=1.0.0
|
|
|
|
ALSA_MODULES="alsa >= $ALSA_REQUIRED"
|
2014-05-03 08:12:06 +00:00
|
|
|
EMACS_CHECK_MODULES([ALSA], [$ALSA_MODULES])
|
2013-07-27 01:18:21 +00:00
|
|
|
if test $HAVE_ALSA = yes; then
|
|
|
|
SAVE_CFLAGS="$CFLAGS"
|
|
|
|
SAVE_LIBS="$LIBS"
|
|
|
|
CFLAGS="$ALSA_CFLAGS $CFLAGS"
|
|
|
|
LIBS="$ALSA_LIBS $LIBS"
|
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <asoundlib.h>]], [[snd_lib_error_set_handler (0);]])],
|
|
|
|
emacs_alsa_normal=yes,
|
|
|
|
emacs_alsa_normal=no)
|
|
|
|
if test "$emacs_alsa_normal" != yes; then
|
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <alsa/asoundlib.h>]],
|
|
|
|
[[snd_lib_error_set_handler (0);]])],
|
|
|
|
emacs_alsa_subdir=yes,
|
|
|
|
emacs_alsa_subdir=no)
|
|
|
|
if test "$emacs_alsa_subdir" != yes; then
|
|
|
|
AC_MSG_ERROR([pkg-config found alsa, but it does not compile. See config.log for error messages.])
|
|
|
|
fi
|
|
|
|
ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE"
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
|
2013-07-27 01:18:21 +00:00
|
|
|
CFLAGS="$SAVE_CFLAGS"
|
|
|
|
LIBS="$SAVE_LIBS"
|
|
|
|
LIBSOUND="$LIBSOUND $ALSA_LIBS"
|
|
|
|
CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"
|
|
|
|
AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if ALSA is available.])
|
|
|
|
elif test "${with_sound}" = "alsa"; then
|
|
|
|
AC_MSG_ERROR([ALSA sound support requested but not found.])
|
|
|
|
fi
|
|
|
|
fi dnl with_sound = alsa|yes
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
dnl Define HAVE_SOUND if we have sound support. We know it works and
|
|
|
|
dnl compiles only on the specified platforms. For others, it
|
|
|
|
dnl probably doesn't make sense to try.
|
2013-07-27 01:18:21 +00:00
|
|
|
dnl FIXME So surely we should bypass this whole section if not using
|
|
|
|
dnl one of these platforms?
|
2010-12-03 14:45:09 +00:00
|
|
|
if test x$have_sound_header = xyes || test $HAVE_ALSA = yes; then
|
|
|
|
case "$opsys" in
|
|
|
|
dnl defined __FreeBSD__ || defined __NetBSD__ || defined __linux__
|
2013-07-27 01:18:21 +00:00
|
|
|
dnl Adjust the --with-sound help text if you change this.
|
2014-09-27 23:35:50 +00:00
|
|
|
gnu-linux|freebsd|netbsd|mingw32|cygwin)
|
2013-03-29 19:53:25 +00:00
|
|
|
AC_DEFINE(HAVE_SOUND, 1, [Define to 1 if you have sound support.])
|
2013-07-27 01:18:21 +00:00
|
|
|
HAVE_SOUND=yes
|
2013-03-29 19:53:25 +00:00
|
|
|
;;
|
2010-12-03 14:45:09 +00:00
|
|
|
esac
|
|
|
|
fi
|
|
|
|
|
|
|
|
AC_SUBST(CFLAGS_SOUND)
|
|
|
|
fi
|
|
|
|
|
|
|
|
dnl checks for header files
|
2012-05-28 00:46:33 +00:00
|
|
|
AC_CHECK_HEADERS_ONCE(
|
Remove some unused macros from 'configure'.
* configure.ac (HAVE_SOUNDCARD_H, HAVE_LINUX_VERSION_H, HAVE_SPEED_T)
(HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY)
(HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION, HAVE_UTIMES)
(HAVE_LIBHESIOD, HAVE_LIBRESOLV, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB, HAVE_DES_H, HAVE_KERBEROSIV_DES_H)
(HAVE_DEV_PTMX, DEVICE_SEP, USG5):
Remove these macros, as they are not used.
(sys_siglist): Remove macro; src/sysdep.c now does this.
* src/sysdep.c (sys_siglist) [HAVE_DECL___SYS_SIGLIST]:
Define to __sys_siglist.
2013-07-02 16:56:29 +00:00
|
|
|
sys/systeminfo.h
|
2014-07-10 12:33:35 +00:00
|
|
|
sys/sysinfo.h
|
2012-11-24 16:16:33 +00:00
|
|
|
coff.h pty.h
|
Simplify data_start configuration.
This is a followon simplification to the fix for Bug#13650.
* admin/CPP-DEFINES (DATA_START, ORDINARY_LINK): Remove.
* configure.ac (CRT_DIR, LIB_STANDARD, START_FILES, DATA_START)
(LD_FIRSTFLAG, ORDINARY_LINK, LIB_GCC): Remove.
(AC_CHECK_HEADERS_ONCE): Remove sys/resource.h, as it's
not always needed.
(HAVE_DATA_START): New macro.
* etc/PROBLEMS (LIBS_SYSTEM, LIBS_MACHINE, LIBS_STANDARD): Remove.
Remove legacy-systems section, as this stuff is no longer
applicable with current linking strategies.
* src/Makefile.in (LD_FIRSTFLAG, LIB_GCC, CRT_DIR, LIB_STANDARD)
(START_FILES): Remove. All uses removed.
(otherobj): Remove $(VMLIMIT_OBJ), as it's now first.
(ALLOBJS): Move here from autodeps.mk, and with VMLIMITS_OBJ first.
(buildobj.h): Use it.
($(ALLOBJS)): Depend on globals.h.
(temacs$(EXEEXT)): Use $(ALLOBJS).
* src/autodeps.mk (ALLOBJS): Move to Makefile.in.
* src/deps.mk (vm-limit.o):
* src/makefile.w32-in ($(BLD)/vm-limit.$(O)):
Do not depend on mem-limits.h.
* src/emacs.c (__do_global_ctors, __do_global_ctors_aux)
(__do_global_dtors, __CTOR_LIST__, __DTOR_LIST__)
[__GNUC__ && !ORDINARY_LINK]: Remove.
* src/mem-limits.h, src/pre-crt0.c: Remove.
* src/unexaix.c, src/unexcoff.c: Don't include mem-limits.h.
* src/unexcoff.c (etext): New decl.
(make_hdr): Use it instead of start_of_data.
* src/vm-limit.c: Move most of mem-limits.h's contents here.
(data_start): New decl. It's OK if this is approximate,
so simplify-away some unnecessary exactness.
(POINTER): Remove; all uses removed.
(data_space_start): Now char *, to avoid casts.
(exceeds_lisp_ptr): New function, replacing the old
EXCEEDS_LISP_PTR macro. All uses changed.
(check_memory_limits): Simplify and remove casts.
(start_of_data) [!CANNOT_DUMP || !SYSTEM_MALLOC]: Remove.
(memory_warnings): Use data_start instead of start_of_data.
Fixes: debbugs:13783
2013-02-25 05:55:37 +00:00
|
|
|
sys/resource.h
|
2012-11-23 07:48:43 +00:00
|
|
|
sys/utsname.h pwd.h utmp.h util.h)
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
AC_MSG_CHECKING(if personality LINUX32 can be set)
|
2011-03-26 19:29:10 +00:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/personality.h>]], [[personality (PER_LINUX32)]])],
|
2010-12-03 14:45:09 +00:00
|
|
|
emacs_cv_personality_linux32=yes,
|
|
|
|
emacs_cv_personality_linux32=no)
|
|
|
|
AC_MSG_RESULT($emacs_cv_personality_linux32)
|
|
|
|
|
|
|
|
if test $emacs_cv_personality_linux32 = yes; then
|
|
|
|
AC_DEFINE(HAVE_PERSONALITY_LINUX32, 1,
|
|
|
|
[Define to 1 if personality LINUX32 can be set.])
|
|
|
|
fi
|
|
|
|
|
2014-08-26 14:42:06 +00:00
|
|
|
# Note that Solaris has sys/sysinfo.h which defines struct
|
|
|
|
# sysinfo as well. To make sure that we're using GNU/Linux
|
|
|
|
# sysinfo, we explicitly set one of its fields.
|
2014-07-10 12:33:35 +00:00
|
|
|
if test "$ac_cv_header_sys_sysinfo_h" = yes; then
|
|
|
|
AC_MSG_CHECKING([if Linux sysinfo may be used])
|
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/sysinfo.h>]],
|
2014-08-26 14:42:06 +00:00
|
|
|
[[struct sysinfo si;
|
|
|
|
si.totalram = 0;
|
|
|
|
sysinfo (&si)]])],
|
2014-07-10 12:33:35 +00:00
|
|
|
emacs_cv_linux_sysinfo=yes, emacs_cv_linux_sysinfo=no)
|
|
|
|
AC_MSG_RESULT($emacs_cv_linux_sysinfo)
|
|
|
|
if test $emacs_cv_linux_sysinfo = yes; then
|
|
|
|
AC_DEFINE([HAVE_LINUX_SYSINFO], 1, [Define to 1 if you have Linux sysinfo function.])
|
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/sysinfo.h>]],
|
|
|
|
[[struct sysinfo si; return si.mem_unit]])],
|
|
|
|
AC_DEFINE(LINUX_SYSINFO_UNIT, 1,
|
|
|
|
[Define to 1 if Linux sysinfo sizes are in multiples of mem_unit bytes.]))
|
|
|
|
fi
|
2014-07-31 20:17:01 +00:00
|
|
|
fi
|
2014-07-10 12:33:35 +00:00
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
dnl On Solaris 8 there's a compilation warning for term.h because
|
|
|
|
dnl it doesn't define `bool'.
|
|
|
|
AC_CHECK_HEADERS(term.h, , , -)
|
|
|
|
AC_HEADER_TIME
|
2012-10-07 02:26:03 +00:00
|
|
|
AC_CHECK_DECLS([sys_siglist], [], [], [[#include <signal.h>
|
|
|
|
]])
|
2010-12-03 14:45:09 +00:00
|
|
|
if test $ac_cv_have_decl_sys_siglist != yes; then
|
|
|
|
# For Tru64, at least:
|
2012-10-07 02:26:03 +00:00
|
|
|
AC_CHECK_DECLS([__sys_siglist], [], [], [[#include <signal.h>
|
|
|
|
]])
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
AC_HEADER_SYS_WAIT
|
|
|
|
|
2012-05-28 00:46:33 +00:00
|
|
|
AC_CHECK_HEADERS_ONCE(sys/socket.h)
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_CHECK_HEADERS(net/if.h, , , [AC_INCLUDES_DEFAULT
|
|
|
|
#if HAVE_SYS_SOCKET_H
|
|
|
|
#include <sys/socket.h>
|
|
|
|
#endif])
|
2011-08-13 10:48:03 +00:00
|
|
|
AC_CHECK_HEADERS(ifaddrs.h, , , [AC_INCLUDES_DEFAULT
|
|
|
|
#if HAVE_SYS_SOCKET_H
|
|
|
|
#include <sys/socket.h>
|
|
|
|
#endif])
|
|
|
|
AC_CHECK_HEADERS(net/if_dl.h, , , [AC_INCLUDES_DEFAULT
|
|
|
|
#if HAVE_SYS_SOCKET_H
|
|
|
|
#include <sys/socket.h>
|
|
|
|
#endif])
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
dnl checks for structure members
|
|
|
|
AC_CHECK_MEMBERS([struct ifreq.ifr_flags, struct ifreq.ifr_hwaddr,
|
|
|
|
struct ifreq.ifr_netmask, struct ifreq.ifr_broadaddr,
|
2011-08-13 10:48:03 +00:00
|
|
|
struct ifreq.ifr_addr,
|
|
|
|
struct ifreq.ifr_addr.sa_len], , ,
|
2010-12-03 14:45:09 +00:00
|
|
|
[AC_INCLUDES_DEFAULT
|
|
|
|
#if HAVE_SYS_SOCKET_H
|
|
|
|
#include <sys/socket.h>
|
|
|
|
#endif
|
|
|
|
#if HAVE_NET_IF_H
|
|
|
|
#include <net/if.h>
|
|
|
|
#endif])
|
|
|
|
|
2011-11-17 09:09:20 +00:00
|
|
|
dnl Check for endianness.
|
2012-05-28 00:46:33 +00:00
|
|
|
dnl AC_C_BIGENDIAN is done by gnulib.
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
dnl check for Make feature
|
|
|
|
|
|
|
|
DEPFLAGS=
|
|
|
|
MKDEPDIR=":"
|
|
|
|
deps_frag=deps.mk
|
2014-03-27 19:41:57 +00:00
|
|
|
dnl check if we have GCC and autodepend is on.
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "$GCC" = yes && test "$ac_enable_autodepend" = yes; then
|
2014-03-27 19:41:57 +00:00
|
|
|
AC_MSG_CHECKING([whether gcc understands -MMD -MF])
|
|
|
|
SAVE_CFLAGS="$CFLAGS"
|
|
|
|
CFLAGS="$CFLAGS -MMD -MF deps.d -MP"
|
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])], , ac_enable_autodepend=no)
|
|
|
|
CFLAGS="$SAVE_CFLAGS"
|
|
|
|
test -f deps.d || ac_enable_autodepend=no
|
|
|
|
rm -rf deps.d
|
|
|
|
AC_MSG_RESULT([$ac_enable_autodepend])
|
2010-12-03 14:45:09 +00:00
|
|
|
if test $ac_enable_autodepend = yes; then
|
2011-08-26 07:12:16 +00:00
|
|
|
DEPFLAGS='-MMD -MF ${DEPDIR}/$*.d -MP'
|
2012-05-12 00:57:48 +00:00
|
|
|
## MKDIR_P is documented (see AC_PROG_MKDIR_P) to be parallel-safe.
|
|
|
|
MKDEPDIR='${MKDIR_P} ${DEPDIR}'
|
2010-12-03 14:45:09 +00:00
|
|
|
deps_frag=autodeps.mk
|
|
|
|
fi
|
|
|
|
fi
|
Use gcc auto-dependency information for lwlib and oldXMenu
* configure.ac (lwlib_deps_frag, oldxmenu_deps_frag): New output files.
* make-dist (lwlib, oldXMenu): Distribute *.mk.
* lwlib/Makefile.in: Move old dependency information to new file deps.mk.
(MKDIR_P, DEPFLAGS, MKDEPDIR, lwlib_deps_frag):
New, set by configure.
(DEPDIR): New variable.
(ALL_CFLAGS): Add DEPFLAGS.
(.c.o): Add MKDEPDIR.
(clean, mostlyclean): Delete DEPDIR.
* lwlib/deps.mk, lwlib/autodeps.mk: New files.
* oldXMenu/Makefile.in: Move old dependency information to new file deps.mk.
(MKDIR_P, DEPFLAGS, MKDEPDIR, oldxmenu_deps_frag):
New, set by configure.
(DEPDIR): New variable.
(ALL_CFLAGS): Add DEPFLAGS.
(.c.o): Add MKDEPDIR.
(clean, mostlyclean): Delete DEPDIR.
* oldXMenu/deps.mk, oldXMenu/autodeps.mk: New files.
* src/deps.mk: Comment update.
* .bzrignore: Ignore lwlib/deps, oldXMenu/deps.
2014-06-28 22:57:23 +00:00
|
|
|
lwlib_deps_frag=$srcdir/lwlib/$deps_frag
|
|
|
|
oldxmenu_deps_frag=$srcdir/oldXMenu/$deps_frag
|
2010-12-03 14:45:09 +00:00
|
|
|
deps_frag=$srcdir/src/$deps_frag
|
|
|
|
AC_SUBST(MKDEPDIR)
|
|
|
|
AC_SUBST(DEPFLAGS)
|
|
|
|
AC_SUBST_FILE(deps_frag)
|
Use gcc auto-dependency information for lwlib and oldXMenu
* configure.ac (lwlib_deps_frag, oldxmenu_deps_frag): New output files.
* make-dist (lwlib, oldXMenu): Distribute *.mk.
* lwlib/Makefile.in: Move old dependency information to new file deps.mk.
(MKDIR_P, DEPFLAGS, MKDEPDIR, lwlib_deps_frag):
New, set by configure.
(DEPDIR): New variable.
(ALL_CFLAGS): Add DEPFLAGS.
(.c.o): Add MKDEPDIR.
(clean, mostlyclean): Delete DEPDIR.
* lwlib/deps.mk, lwlib/autodeps.mk: New files.
* oldXMenu/Makefile.in: Move old dependency information to new file deps.mk.
(MKDIR_P, DEPFLAGS, MKDEPDIR, oldxmenu_deps_frag):
New, set by configure.
(DEPDIR): New variable.
(ALL_CFLAGS): Add DEPFLAGS.
(.c.o): Add MKDEPDIR.
(clean, mostlyclean): Delete DEPDIR.
* oldXMenu/deps.mk, oldXMenu/autodeps.mk: New files.
* src/deps.mk: Comment update.
* .bzrignore: Ignore lwlib/deps, oldXMenu/deps.
2014-06-28 22:57:23 +00:00
|
|
|
AC_SUBST_FILE(lwlib_deps_frag)
|
|
|
|
AC_SUBST_FILE(oldxmenu_deps_frag)
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2011-05-20 00:41:03 +00:00
|
|
|
lisp_frag=$srcdir/src/lisp.mk
|
|
|
|
AC_SUBST_FILE(lisp_frag)
|
|
|
|
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
dnl checks for operating system services
|
|
|
|
AC_SYS_LONG_FILE_NAMES
|
|
|
|
|
|
|
|
#### Choose a window system.
|
|
|
|
|
2012-09-01 06:38:52 +00:00
|
|
|
## We leave window_system equal to none if
|
|
|
|
## we end up building without one. Any new window system should
|
|
|
|
## set window_system to an appropriate value and add objects to
|
|
|
|
## window-system-specific substs.
|
|
|
|
|
|
|
|
window_system=none
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_PATH_X
|
2012-09-01 06:38:52 +00:00
|
|
|
if test "$no_x" != yes; then
|
2010-12-03 14:45:09 +00:00
|
|
|
window_system=x11
|
|
|
|
fi
|
|
|
|
|
2012-05-01 00:16:02 +00:00
|
|
|
LD_SWITCH_X_SITE_RPATH=
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "${x_libraries}" != NONE; then
|
|
|
|
if test -n "${x_libraries}"; then
|
|
|
|
LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"`
|
2012-05-01 01:13:18 +00:00
|
|
|
LD_SWITCH_X_SITE_RPATH=-Wl,-rpath,`echo ${x_libraries} | sed -e "s/:/ -Wl,-rpath,/g"`
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
x_default_search_path=""
|
|
|
|
x_search_path=${x_libraries}
|
|
|
|
if test -z "${x_search_path}"; then
|
|
|
|
x_search_path=/usr/lib
|
|
|
|
fi
|
|
|
|
for x_library in `echo ${x_search_path}: | \
|
|
|
|
sed -e "s/:/ /g" -e p -e "s:/lib[[^ /]]* :/share :g"`; do
|
|
|
|
x_search_path="\
|
|
|
|
${x_library}/X11/%L/%T/%N%C%S:\
|
|
|
|
${x_library}/X11/%l/%T/%N%C%S:\
|
|
|
|
${x_library}/X11/%T/%N%C%S:\
|
|
|
|
${x_library}/X11/%L/%T/%N%S:\
|
|
|
|
${x_library}/X11/%l/%T/%N%S:\
|
|
|
|
${x_library}/X11/%T/%N%S"
|
|
|
|
if test x"${x_default_search_path}" = x; then
|
|
|
|
x_default_search_path=${x_search_path}
|
|
|
|
else
|
|
|
|
x_default_search_path="${x_search_path}:${x_default_search_path}"
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
fi
|
2012-05-01 00:16:02 +00:00
|
|
|
AC_SUBST(LD_SWITCH_X_SITE_RPATH)
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
if test "${x_includes}" != NONE && test -n "${x_includes}"; then
|
configure: new option --enable-gcc-warnings
I have been using this change for many months in my private copy
of Emacs, and have used it to find several bugs. It's mature
enough to publish now.
* Makefile.in (GNULIB_MODULES): Add warnings, manywarnings.
* configure.in: Support --enable-gcc-warnings, in the style of
other GNU packages such as coreutils.
(C_WARNINGS_SWITCH): Remove, replacing with...
(WARN_CFLAGS, GNULIB_WARN_CFLAGS): New variable.
(PKG_CHECK_MODULES, C_SWITCH_X_SITE): Use -isystem rather than -I,
when including system files with GCC.
* etc/NEWS: Mention --enable-gcc-warnings.
* lib/Makefile.am (AM_CFLAGS): New macro.
* m4/manywarnings.m4, m4/warnings.m4: New files, from gnulib.
* lib-src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(BASE_CFLAGS): Use new macros rather than old.
* lwlib/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* oldXMenu/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/process.c: Ignore -Wstrict-overflow to work around GCC bug 52904.
* src/regex.c: Ignore -Wstrict-overflow. If !emacs, also ignore
-Wunused-but-set-variable, -Wunused-function, -Wunused-macros,
-Wunused-result, -Wunused-variable. This should go away once
the Emacs and Gnulib regex code is merged.
(xmalloc, xrealloc): Now static.
2012-04-09 07:45:59 +00:00
|
|
|
C_SWITCH_X_SITE="$isystem"`echo ${x_includes} | sed -e "s/:/ $isystem/g"`
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
if test x"${x_includes}" = x; then
|
|
|
|
bitmapdir=/usr/include/X11/bitmaps
|
|
|
|
else
|
|
|
|
# accumulate include directories that have X11 bitmap subdirectories
|
|
|
|
bmd_acc="dummyval"
|
|
|
|
for bmd in `echo ${x_includes} | sed -e "s/:/ /g"`; do
|
|
|
|
if test -d "${bmd}/X11/bitmaps"; then
|
|
|
|
bmd_acc="${bmd_acc}:${bmd}/X11/bitmaps"
|
|
|
|
fi
|
|
|
|
if test -d "${bmd}/bitmaps"; then
|
|
|
|
bmd_acc="${bmd_acc}:${bmd}/bitmaps"
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
if test ${bmd_acc} != "dummyval"; then
|
|
|
|
bitmapdir=`echo ${bmd_acc} | sed -e "s/^dummyval://"`
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
HAVE_NS=no
|
|
|
|
NS_IMPL_COCOA=no
|
|
|
|
NS_IMPL_GNUSTEP=no
|
|
|
|
tmp_CPPFLAGS="$CPPFLAGS"
|
|
|
|
tmp_CFLAGS="$CFLAGS"
|
|
|
|
CPPFLAGS="$CPPFLAGS -x objective-c"
|
|
|
|
CFLAGS="$CFLAGS -x objective-c"
|
2011-09-15 02:32:55 +00:00
|
|
|
GNU_OBJC_CFLAGS=
|
2012-12-29 19:37:32 +00:00
|
|
|
LIBS_GNUSTEP=
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "${with_ns}" != no; then
|
|
|
|
if test "${opsys}" = darwin; then
|
|
|
|
NS_IMPL_COCOA=yes
|
|
|
|
ns_appdir=`pwd`/nextstep/Emacs.app
|
2012-05-12 18:10:37 +00:00
|
|
|
ns_appbindir=${ns_appdir}/Contents/MacOS
|
2010-12-03 14:45:09 +00:00
|
|
|
ns_appresdir=${ns_appdir}/Contents/Resources
|
Increase compartmentalization of Nextstep builds rules,
and store Emacs version number in fewer versioned files.
* configure.ac (ns_appsrc): Use relative names.
(ns_frag): Remove.
(Info-gnustep.plist, Emacs.desktop, Info.plist, InfoPlist.strings)
(nextstep/Makefile): Generate these nextstep files.
(SUBDIR_MAKEFILES): Add nextstep.
* Makefile.in (clean, distclean, bootstrap-clean): Add nextstep.
* make-dist (nextstep/templates): Add directory.
(nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj): Remove.
(nextstep/Cocoa/Emacs.base/Contents)
(nextstep/GNUstep/Emacs.base/Resources): Update contents.
* .bzrignore: Add some nextstep files.
* admin/admin.el (set-version): No more need to set nextstep versions.
(set-copyright): Update for moved nextstep files.
* nextstep/Makefile.in: New file.
* nextstep/templates: New directory.
* nextstep/templates/Emacs.desktop.in, nextstep/templates/Info-gnustep.plist.in:
* nextstep/templates/Info.plist.in, nextstep/templates/InfoPlist.strings.in:
Move here from various Cocoa/, GNUstep/ locations.
Let configure set the version number.
* nextstep/Cocoa/Emacs.base/Contents/Info.plist:
* nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
* nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist:
* nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop: Move to templates/.
* nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj: Remove directory.
* src/Makefile.in (ns_appdir, ns_appbindir, ns_appsrc): Remove variables.
(ns_frag): Remove.
(ns-app): Move here from ns.mk, and simplify.
(clean): Simplify nextstep entry.
* src/ns.mk: Remove file.
2012-09-16 18:49:00 +00:00
|
|
|
ns_appsrc=Cocoa/Emacs.base
|
Require OSX >= 10.6. Remove PowerPC unexec code.
* configure.ac: Require OSX 10.6. Remove NSInteger test,
use nsfont for Gnustep, macfont for OSX.
* etc/NEWS: OSX required is 10.6 or newer.
* src/Makefile.in: Replace nsfont.o macfont.o with ns_fontfile in
comment.
* src/macfont.h (MAC_FONT_FORMAT_ATTRIBUTE, MAC_FONT_FORMAT_BITMAP)
(mac_font_copy_non_synthetic_table): Remove versions for OSX < 10.6
* src/nsfns.m: Always include src/macfont.h on COCOA.
(ns_filename_from_panel, ns_directory_from_panel)
(Fx_create_frame, Fns_popup_font_panel, ns_run_file_dialog)
(Fns_read_file_name, Fns_list_services): Remove code for OSX < 10.6
* src/nsterm.m: Always include src/macfont.h on COCOA.
(ns_update_auto_hide_menu_bar, ns_draw_fringe_bitmap)
(ns_dumpglyphs_image, ns_check_menu_open)
(applicationDidFinishLaunching)
(antialiasThresholdDidChange:)
(keyDown:, toggleFullScreen:, setPosition:portion:whole:): Remove
checks for OSX <= 10.5/10.6.
(changeFont:): Use macfont on COCOA, nsfont on GNUSTEP.
(syms_of_nsterm): Call syms_of_macfont on COCOA, syms_of_nsfont on
GNUSTEP.
* src/macfont.m: Remove >= 1050 check.
(macfont_create_family_with_symbol)
(macfont_get_glyph_for_character)
(mac_font_get_glyphs_for_variants)
(mac_ctfont_create_available_families, syms_of_macfont): Remove
code for OSX < 10.6.
(mac_font_family_group, mac_font_family_compare): Remove, only used
for OSX < 10.6.
* src/nsimage.m (allocInitFromFile:): Remove code for OSX < 10.6.
* src/nsmenu.m (NSMenuDidBeginTrackingNotification): Remove.
(x_activate_menubar, trackingNotification:): Remove check for
OSX >= 10.5.
(menuNeedsUpdate:): Remove check for OSX < 10.5.
* src/nsterm.h (MAC_OS_X_VERSION_10_4, MAC_OS_X_VERSION_10_5): Remove.
(NS_HAVE_NSINTEGER): Remove block.
Remove >= OSX 10.6 tests.
* src/unexmacosx.c: Remove include ppc/reloc.h.
(unrelocate, copy_dysymtab): Remove PPC code.
(rebase_reloc_address): Remove, only used for PPC:
2014-10-12 08:35:50 +00:00
|
|
|
ns_fontfile=macfont.o
|
2010-12-03 14:45:09 +00:00
|
|
|
elif test -f $GNUSTEP_CONFIG_FILE; then
|
|
|
|
NS_IMPL_GNUSTEP=yes
|
|
|
|
ns_appdir=`pwd`/nextstep/Emacs.app
|
2012-05-12 18:10:37 +00:00
|
|
|
ns_appbindir=${ns_appdir}
|
2010-12-03 14:45:09 +00:00
|
|
|
ns_appresdir=${ns_appdir}/Resources
|
Increase compartmentalization of Nextstep builds rules,
and store Emacs version number in fewer versioned files.
* configure.ac (ns_appsrc): Use relative names.
(ns_frag): Remove.
(Info-gnustep.plist, Emacs.desktop, Info.plist, InfoPlist.strings)
(nextstep/Makefile): Generate these nextstep files.
(SUBDIR_MAKEFILES): Add nextstep.
* Makefile.in (clean, distclean, bootstrap-clean): Add nextstep.
* make-dist (nextstep/templates): Add directory.
(nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj): Remove.
(nextstep/Cocoa/Emacs.base/Contents)
(nextstep/GNUstep/Emacs.base/Resources): Update contents.
* .bzrignore: Add some nextstep files.
* admin/admin.el (set-version): No more need to set nextstep versions.
(set-copyright): Update for moved nextstep files.
* nextstep/Makefile.in: New file.
* nextstep/templates: New directory.
* nextstep/templates/Emacs.desktop.in, nextstep/templates/Info-gnustep.plist.in:
* nextstep/templates/Info.plist.in, nextstep/templates/InfoPlist.strings.in:
Move here from various Cocoa/, GNUstep/ locations.
Let configure set the version number.
* nextstep/Cocoa/Emacs.base/Contents/Info.plist:
* nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
* nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist:
* nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop: Move to templates/.
* nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj: Remove directory.
* src/Makefile.in (ns_appdir, ns_appbindir, ns_appsrc): Remove variables.
(ns_frag): Remove.
(ns-app): Move here from ns.mk, and simplify.
(clean): Simplify nextstep entry.
* src/ns.mk: Remove file.
2012-09-16 18:49:00 +00:00
|
|
|
ns_appsrc=GNUstep/Emacs.base
|
Require OSX >= 10.6. Remove PowerPC unexec code.
* configure.ac: Require OSX 10.6. Remove NSInteger test,
use nsfont for Gnustep, macfont for OSX.
* etc/NEWS: OSX required is 10.6 or newer.
* src/Makefile.in: Replace nsfont.o macfont.o with ns_fontfile in
comment.
* src/macfont.h (MAC_FONT_FORMAT_ATTRIBUTE, MAC_FONT_FORMAT_BITMAP)
(mac_font_copy_non_synthetic_table): Remove versions for OSX < 10.6
* src/nsfns.m: Always include src/macfont.h on COCOA.
(ns_filename_from_panel, ns_directory_from_panel)
(Fx_create_frame, Fns_popup_font_panel, ns_run_file_dialog)
(Fns_read_file_name, Fns_list_services): Remove code for OSX < 10.6
* src/nsterm.m: Always include src/macfont.h on COCOA.
(ns_update_auto_hide_menu_bar, ns_draw_fringe_bitmap)
(ns_dumpglyphs_image, ns_check_menu_open)
(applicationDidFinishLaunching)
(antialiasThresholdDidChange:)
(keyDown:, toggleFullScreen:, setPosition:portion:whole:): Remove
checks for OSX <= 10.5/10.6.
(changeFont:): Use macfont on COCOA, nsfont on GNUSTEP.
(syms_of_nsterm): Call syms_of_macfont on COCOA, syms_of_nsfont on
GNUSTEP.
* src/macfont.m: Remove >= 1050 check.
(macfont_create_family_with_symbol)
(macfont_get_glyph_for_character)
(mac_font_get_glyphs_for_variants)
(mac_ctfont_create_available_families, syms_of_macfont): Remove
code for OSX < 10.6.
(mac_font_family_group, mac_font_family_compare): Remove, only used
for OSX < 10.6.
* src/nsimage.m (allocInitFromFile:): Remove code for OSX < 10.6.
* src/nsmenu.m (NSMenuDidBeginTrackingNotification): Remove.
(x_activate_menubar, trackingNotification:): Remove check for
OSX >= 10.5.
(menuNeedsUpdate:): Remove check for OSX < 10.5.
* src/nsterm.h (MAC_OS_X_VERSION_10_4, MAC_OS_X_VERSION_10_5): Remove.
(NS_HAVE_NSINTEGER): Remove block.
Remove >= OSX 10.6 tests.
* src/unexmacosx.c: Remove include ppc/reloc.h.
(unrelocate, copy_dysymtab): Remove PPC code.
(rebase_reloc_address): Remove, only used for PPC:
2014-10-12 08:35:50 +00:00
|
|
|
ns_fontfile=nsfont.o
|
2010-12-03 14:45:09 +00:00
|
|
|
dnl FIXME sourcing this several times in subshells seems inefficient.
|
|
|
|
GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)"
|
|
|
|
GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)"
|
|
|
|
dnl I seemed to need these as well with GNUstep-startup 0.25.
|
|
|
|
GNUSTEP_LOCAL_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_LOCAL_HEADERS)"
|
|
|
|
GNUSTEP_LOCAL_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_LOCAL_LIBRARIES)"
|
|
|
|
test "x${GNUSTEP_LOCAL_HEADERS}" != "x" && \
|
|
|
|
GNUSTEP_LOCAL_HEADERS="-I${GNUSTEP_LOCAL_HEADERS}"
|
|
|
|
test "x${GNUSTEP_LOCAL_LIBRARIES}" != "x" && \
|
|
|
|
GNUSTEP_LOCAL_LIBRARIES="-L${GNUSTEP_LOCAL_LIBRARIES}"
|
|
|
|
CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
|
|
|
|
CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
|
|
|
|
LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES}"
|
2012-12-29 19:37:32 +00:00
|
|
|
LIBS_GNUSTEP="-lgnustep-gui -lgnustep-base -lobjc -lpthread"
|
2011-09-15 02:32:55 +00:00
|
|
|
dnl GNUstep defines BASE_NATIVE_OBJC_EXCEPTIONS to 0 or 1.
|
|
|
|
dnl If they had chosen to either define it or not, we could have
|
|
|
|
dnl just used AC_CHECK_DECL here.
|
|
|
|
AC_CACHE_CHECK(if GNUstep defines BASE_NATIVE_OBJC_EXCEPTIONS,
|
|
|
|
emacs_cv_objc_exceptions,
|
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <GNUstepBase/GSConfig.h>]],
|
|
|
|
[[#if defined BASE_NATIVE_OBJC_EXCEPTIONS && BASE_NATIVE_OBJC_EXCEPTIONS > 0
|
|
|
|
1;
|
|
|
|
#else
|
|
|
|
fail;
|
|
|
|
#endif]])], emacs_cv_objc_exceptions=yes, emacs_cv_objc_exceptions=no ) )
|
|
|
|
if test $emacs_cv_objc_exceptions = yes; then
|
|
|
|
dnl _NATIVE_OBJC_EXCEPTIONS is used by the GNUstep headers.
|
|
|
|
AC_DEFINE(_NATIVE_OBJC_EXCEPTIONS, 1,
|
|
|
|
[Define if GNUstep uses ObjC exceptions.])
|
|
|
|
GNU_OBJC_CFLAGS="-fobjc-exceptions"
|
|
|
|
fi
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
2011-09-15 02:32:55 +00:00
|
|
|
|
|
|
|
dnl This is only used while we test the NS headers, it gets reset below.
|
|
|
|
CFLAGS="$CFLAGS $GNU_OBJC_CFLAGS"
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_CHECK_HEADER([AppKit/AppKit.h], [HAVE_NS=yes],
|
|
|
|
[AC_MSG_ERROR([`--with-ns' was specified, but the include
|
|
|
|
files are missing or cannot be compiled.])])
|
2012-10-07 10:07:23 +00:00
|
|
|
|
Port the font backend from the Mac port.
* configure.ac: Add check for OSX 10.5, required for macfont.o.
* etc/NEWS: Mention the macfont backend.
* src/Makefile.in (NS_OBJ, SOME_MACHINE_OBJECTS): Add macfont.o.
* src/font.c (syms_of_font): Call syms_of_macfont.
* src/font.h: Declare syms_of_macfont.
* src/nsfns.m: Include macfont.h.
(Fx_create_frame): Register macfont driver, make a better default font.
(Fns_popup_font_panel): Get font from macfont driver, if used.
* src/nsfont.m (ns_tmp_flags, ns_tmp_font): Remove.
(nsfont_open): Set font driver type.
Set font->ascent and font->descent. Figure out font instead of
ns_tmp_font, and flags instead of ns_tmp_flags.
Fix indentation. Remove call to ns_draw_text_decoration,
moved to nsterm.
* src/nsterm.m: Include macfont.h.
(ns_tmp_flags, ns_tmp_font): Remove.
(ns_compute_glyph_string_overhangs): Check for driver Qns.
(ns_draw_glyph_string): Use local variables instead of ns_tmp_flags,
ns_tmp_font. Call ns_draw_text_decoration here instead of nsfont.m.
(changeFont:): Fix code style. Check for font driver type when
getiing font.
* src/nsterm.h (FONT_DESCENT, FONT_ASCENT): Define to (f)->ascent and
(f)->descent.
2013-09-15 17:58:46 +00:00
|
|
|
macfont_file=""
|
|
|
|
if test "${NS_IMPL_COCOA}" = "yes"; then
|
Require OSX >= 10.6. Remove PowerPC unexec code.
* configure.ac: Require OSX 10.6. Remove NSInteger test,
use nsfont for Gnustep, macfont for OSX.
* etc/NEWS: OSX required is 10.6 or newer.
* src/Makefile.in: Replace nsfont.o macfont.o with ns_fontfile in
comment.
* src/macfont.h (MAC_FONT_FORMAT_ATTRIBUTE, MAC_FONT_FORMAT_BITMAP)
(mac_font_copy_non_synthetic_table): Remove versions for OSX < 10.6
* src/nsfns.m: Always include src/macfont.h on COCOA.
(ns_filename_from_panel, ns_directory_from_panel)
(Fx_create_frame, Fns_popup_font_panel, ns_run_file_dialog)
(Fns_read_file_name, Fns_list_services): Remove code for OSX < 10.6
* src/nsterm.m: Always include src/macfont.h on COCOA.
(ns_update_auto_hide_menu_bar, ns_draw_fringe_bitmap)
(ns_dumpglyphs_image, ns_check_menu_open)
(applicationDidFinishLaunching)
(antialiasThresholdDidChange:)
(keyDown:, toggleFullScreen:, setPosition:portion:whole:): Remove
checks for OSX <= 10.5/10.6.
(changeFont:): Use macfont on COCOA, nsfont on GNUSTEP.
(syms_of_nsterm): Call syms_of_macfont on COCOA, syms_of_nsfont on
GNUSTEP.
* src/macfont.m: Remove >= 1050 check.
(macfont_create_family_with_symbol)
(macfont_get_glyph_for_character)
(mac_font_get_glyphs_for_variants)
(mac_ctfont_create_available_families, syms_of_macfont): Remove
code for OSX < 10.6.
(mac_font_family_group, mac_font_family_compare): Remove, only used
for OSX < 10.6.
* src/nsimage.m (allocInitFromFile:): Remove code for OSX < 10.6.
* src/nsmenu.m (NSMenuDidBeginTrackingNotification): Remove.
(x_activate_menubar, trackingNotification:): Remove check for
OSX >= 10.5.
(menuNeedsUpdate:): Remove check for OSX < 10.5.
* src/nsterm.h (MAC_OS_X_VERSION_10_4, MAC_OS_X_VERSION_10_5): Remove.
(NS_HAVE_NSINTEGER): Remove block.
Remove >= OSX 10.6 tests.
* src/unexmacosx.c: Remove include ppc/reloc.h.
(unrelocate, copy_dysymtab): Remove PPC code.
(rebase_reloc_address): Remove, only used for PPC:
2014-10-12 08:35:50 +00:00
|
|
|
AC_MSG_CHECKING([for OSX 10.6 or newer])
|
Port the font backend from the Mac port.
* configure.ac: Add check for OSX 10.5, required for macfont.o.
* etc/NEWS: Mention the macfont backend.
* src/Makefile.in (NS_OBJ, SOME_MACHINE_OBJECTS): Add macfont.o.
* src/font.c (syms_of_font): Call syms_of_macfont.
* src/font.h: Declare syms_of_macfont.
* src/nsfns.m: Include macfont.h.
(Fx_create_frame): Register macfont driver, make a better default font.
(Fns_popup_font_panel): Get font from macfont driver, if used.
* src/nsfont.m (ns_tmp_flags, ns_tmp_font): Remove.
(nsfont_open): Set font driver type.
Set font->ascent and font->descent. Figure out font instead of
ns_tmp_font, and flags instead of ns_tmp_flags.
Fix indentation. Remove call to ns_draw_text_decoration,
moved to nsterm.
* src/nsterm.m: Include macfont.h.
(ns_tmp_flags, ns_tmp_font): Remove.
(ns_compute_glyph_string_overhangs): Check for driver Qns.
(ns_draw_glyph_string): Use local variables instead of ns_tmp_flags,
ns_tmp_font. Call ns_draw_text_decoration here instead of nsfont.m.
(changeFont:): Fix code style. Check for font driver type when
getiing font.
* src/nsterm.h (FONT_DESCENT, FONT_ASCENT): Define to (f)->ascent and
(f)->descent.
2013-09-15 17:58:46 +00:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <AppKit/AppKit.h>],
|
2012-10-07 10:07:23 +00:00
|
|
|
[
|
|
|
|
#ifdef MAC_OS_X_VERSION_MAX_ALLOWED
|
Require OSX >= 10.6. Remove PowerPC unexec code.
* configure.ac: Require OSX 10.6. Remove NSInteger test,
use nsfont for Gnustep, macfont for OSX.
* etc/NEWS: OSX required is 10.6 or newer.
* src/Makefile.in: Replace nsfont.o macfont.o with ns_fontfile in
comment.
* src/macfont.h (MAC_FONT_FORMAT_ATTRIBUTE, MAC_FONT_FORMAT_BITMAP)
(mac_font_copy_non_synthetic_table): Remove versions for OSX < 10.6
* src/nsfns.m: Always include src/macfont.h on COCOA.
(ns_filename_from_panel, ns_directory_from_panel)
(Fx_create_frame, Fns_popup_font_panel, ns_run_file_dialog)
(Fns_read_file_name, Fns_list_services): Remove code for OSX < 10.6
* src/nsterm.m: Always include src/macfont.h on COCOA.
(ns_update_auto_hide_menu_bar, ns_draw_fringe_bitmap)
(ns_dumpglyphs_image, ns_check_menu_open)
(applicationDidFinishLaunching)
(antialiasThresholdDidChange:)
(keyDown:, toggleFullScreen:, setPosition:portion:whole:): Remove
checks for OSX <= 10.5/10.6.
(changeFont:): Use macfont on COCOA, nsfont on GNUSTEP.
(syms_of_nsterm): Call syms_of_macfont on COCOA, syms_of_nsfont on
GNUSTEP.
* src/macfont.m: Remove >= 1050 check.
(macfont_create_family_with_symbol)
(macfont_get_glyph_for_character)
(mac_font_get_glyphs_for_variants)
(mac_ctfont_create_available_families, syms_of_macfont): Remove
code for OSX < 10.6.
(mac_font_family_group, mac_font_family_compare): Remove, only used
for OSX < 10.6.
* src/nsimage.m (allocInitFromFile:): Remove code for OSX < 10.6.
* src/nsmenu.m (NSMenuDidBeginTrackingNotification): Remove.
(x_activate_menubar, trackingNotification:): Remove check for
OSX >= 10.5.
(menuNeedsUpdate:): Remove check for OSX < 10.5.
* src/nsterm.h (MAC_OS_X_VERSION_10_4, MAC_OS_X_VERSION_10_5): Remove.
(NS_HAVE_NSINTEGER): Remove block.
Remove >= OSX 10.6 tests.
* src/unexmacosx.c: Remove include ppc/reloc.h.
(unrelocate, copy_dysymtab): Remove PPC code.
(rebase_reloc_address): Remove, only used for PPC:
2014-10-12 08:35:50 +00:00
|
|
|
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
|
2012-10-07 10:07:23 +00:00
|
|
|
; /* OK */
|
|
|
|
#else
|
Require OSX >= 10.6. Remove PowerPC unexec code.
* configure.ac: Require OSX 10.6. Remove NSInteger test,
use nsfont for Gnustep, macfont for OSX.
* etc/NEWS: OSX required is 10.6 or newer.
* src/Makefile.in: Replace nsfont.o macfont.o with ns_fontfile in
comment.
* src/macfont.h (MAC_FONT_FORMAT_ATTRIBUTE, MAC_FONT_FORMAT_BITMAP)
(mac_font_copy_non_synthetic_table): Remove versions for OSX < 10.6
* src/nsfns.m: Always include src/macfont.h on COCOA.
(ns_filename_from_panel, ns_directory_from_panel)
(Fx_create_frame, Fns_popup_font_panel, ns_run_file_dialog)
(Fns_read_file_name, Fns_list_services): Remove code for OSX < 10.6
* src/nsterm.m: Always include src/macfont.h on COCOA.
(ns_update_auto_hide_menu_bar, ns_draw_fringe_bitmap)
(ns_dumpglyphs_image, ns_check_menu_open)
(applicationDidFinishLaunching)
(antialiasThresholdDidChange:)
(keyDown:, toggleFullScreen:, setPosition:portion:whole:): Remove
checks for OSX <= 10.5/10.6.
(changeFont:): Use macfont on COCOA, nsfont on GNUSTEP.
(syms_of_nsterm): Call syms_of_macfont on COCOA, syms_of_nsfont on
GNUSTEP.
* src/macfont.m: Remove >= 1050 check.
(macfont_create_family_with_symbol)
(macfont_get_glyph_for_character)
(mac_font_get_glyphs_for_variants)
(mac_ctfont_create_available_families, syms_of_macfont): Remove
code for OSX < 10.6.
(mac_font_family_group, mac_font_family_compare): Remove, only used
for OSX < 10.6.
* src/nsimage.m (allocInitFromFile:): Remove code for OSX < 10.6.
* src/nsmenu.m (NSMenuDidBeginTrackingNotification): Remove.
(x_activate_menubar, trackingNotification:): Remove check for
OSX >= 10.5.
(menuNeedsUpdate:): Remove check for OSX < 10.5.
* src/nsterm.h (MAC_OS_X_VERSION_10_4, MAC_OS_X_VERSION_10_5): Remove.
(NS_HAVE_NSINTEGER): Remove block.
Remove >= OSX 10.6 tests.
* src/unexmacosx.c: Remove include ppc/reloc.h.
(unrelocate, copy_dysymtab): Remove PPC code.
(rebase_reloc_address): Remove, only used for PPC:
2014-10-12 08:35:50 +00:00
|
|
|
error "OSX 10.6 or newer required";
|
2012-10-07 10:07:23 +00:00
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
])],
|
Require OSX >= 10.6. Remove PowerPC unexec code.
* configure.ac: Require OSX 10.6. Remove NSInteger test,
use nsfont for Gnustep, macfont for OSX.
* etc/NEWS: OSX required is 10.6 or newer.
* src/Makefile.in: Replace nsfont.o macfont.o with ns_fontfile in
comment.
* src/macfont.h (MAC_FONT_FORMAT_ATTRIBUTE, MAC_FONT_FORMAT_BITMAP)
(mac_font_copy_non_synthetic_table): Remove versions for OSX < 10.6
* src/nsfns.m: Always include src/macfont.h on COCOA.
(ns_filename_from_panel, ns_directory_from_panel)
(Fx_create_frame, Fns_popup_font_panel, ns_run_file_dialog)
(Fns_read_file_name, Fns_list_services): Remove code for OSX < 10.6
* src/nsterm.m: Always include src/macfont.h on COCOA.
(ns_update_auto_hide_menu_bar, ns_draw_fringe_bitmap)
(ns_dumpglyphs_image, ns_check_menu_open)
(applicationDidFinishLaunching)
(antialiasThresholdDidChange:)
(keyDown:, toggleFullScreen:, setPosition:portion:whole:): Remove
checks for OSX <= 10.5/10.6.
(changeFont:): Use macfont on COCOA, nsfont on GNUSTEP.
(syms_of_nsterm): Call syms_of_macfont on COCOA, syms_of_nsfont on
GNUSTEP.
* src/macfont.m: Remove >= 1050 check.
(macfont_create_family_with_symbol)
(macfont_get_glyph_for_character)
(mac_font_get_glyphs_for_variants)
(mac_ctfont_create_available_families, syms_of_macfont): Remove
code for OSX < 10.6.
(mac_font_family_group, mac_font_family_compare): Remove, only used
for OSX < 10.6.
* src/nsimage.m (allocInitFromFile:): Remove code for OSX < 10.6.
* src/nsmenu.m (NSMenuDidBeginTrackingNotification): Remove.
(x_activate_menubar, trackingNotification:): Remove check for
OSX >= 10.5.
(menuNeedsUpdate:): Remove check for OSX < 10.5.
* src/nsterm.h (MAC_OS_X_VERSION_10_4, MAC_OS_X_VERSION_10_5): Remove.
(NS_HAVE_NSINTEGER): Remove block.
Remove >= OSX 10.6 tests.
* src/unexmacosx.c: Remove include ppc/reloc.h.
(unrelocate, copy_dysymtab): Remove PPC code.
(rebase_reloc_address): Remove, only used for PPC:
2014-10-12 08:35:50 +00:00
|
|
|
ns_osx_have_106=yes,
|
|
|
|
ns_osx_have_106=no)
|
|
|
|
AC_MSG_RESULT([$ns_osx_have_106])
|
Port the font backend from the Mac port.
* configure.ac: Add check for OSX 10.5, required for macfont.o.
* etc/NEWS: Mention the macfont backend.
* src/Makefile.in (NS_OBJ, SOME_MACHINE_OBJECTS): Add macfont.o.
* src/font.c (syms_of_font): Call syms_of_macfont.
* src/font.h: Declare syms_of_macfont.
* src/nsfns.m: Include macfont.h.
(Fx_create_frame): Register macfont driver, make a better default font.
(Fns_popup_font_panel): Get font from macfont driver, if used.
* src/nsfont.m (ns_tmp_flags, ns_tmp_font): Remove.
(nsfont_open): Set font driver type.
Set font->ascent and font->descent. Figure out font instead of
ns_tmp_font, and flags instead of ns_tmp_flags.
Fix indentation. Remove call to ns_draw_text_decoration,
moved to nsterm.
* src/nsterm.m: Include macfont.h.
(ns_tmp_flags, ns_tmp_font): Remove.
(ns_compute_glyph_string_overhangs): Check for driver Qns.
(ns_draw_glyph_string): Use local variables instead of ns_tmp_flags,
ns_tmp_font. Call ns_draw_text_decoration here instead of nsfont.m.
(changeFont:): Fix code style. Check for font driver type when
getiing font.
* src/nsterm.h (FONT_DESCENT, FONT_ASCENT): Define to (f)->ascent and
(f)->descent.
2013-09-15 17:58:46 +00:00
|
|
|
|
Require OSX >= 10.6. Remove PowerPC unexec code.
* configure.ac: Require OSX 10.6. Remove NSInteger test,
use nsfont for Gnustep, macfont for OSX.
* etc/NEWS: OSX required is 10.6 or newer.
* src/Makefile.in: Replace nsfont.o macfont.o with ns_fontfile in
comment.
* src/macfont.h (MAC_FONT_FORMAT_ATTRIBUTE, MAC_FONT_FORMAT_BITMAP)
(mac_font_copy_non_synthetic_table): Remove versions for OSX < 10.6
* src/nsfns.m: Always include src/macfont.h on COCOA.
(ns_filename_from_panel, ns_directory_from_panel)
(Fx_create_frame, Fns_popup_font_panel, ns_run_file_dialog)
(Fns_read_file_name, Fns_list_services): Remove code for OSX < 10.6
* src/nsterm.m: Always include src/macfont.h on COCOA.
(ns_update_auto_hide_menu_bar, ns_draw_fringe_bitmap)
(ns_dumpglyphs_image, ns_check_menu_open)
(applicationDidFinishLaunching)
(antialiasThresholdDidChange:)
(keyDown:, toggleFullScreen:, setPosition:portion:whole:): Remove
checks for OSX <= 10.5/10.6.
(changeFont:): Use macfont on COCOA, nsfont on GNUSTEP.
(syms_of_nsterm): Call syms_of_macfont on COCOA, syms_of_nsfont on
GNUSTEP.
* src/macfont.m: Remove >= 1050 check.
(macfont_create_family_with_symbol)
(macfont_get_glyph_for_character)
(mac_font_get_glyphs_for_variants)
(mac_ctfont_create_available_families, syms_of_macfont): Remove
code for OSX < 10.6.
(mac_font_family_group, mac_font_family_compare): Remove, only used
for OSX < 10.6.
* src/nsimage.m (allocInitFromFile:): Remove code for OSX < 10.6.
* src/nsmenu.m (NSMenuDidBeginTrackingNotification): Remove.
(x_activate_menubar, trackingNotification:): Remove check for
OSX >= 10.5.
(menuNeedsUpdate:): Remove check for OSX < 10.5.
* src/nsterm.h (MAC_OS_X_VERSION_10_4, MAC_OS_X_VERSION_10_5): Remove.
(NS_HAVE_NSINTEGER): Remove block.
Remove >= OSX 10.6 tests.
* src/unexmacosx.c: Remove include ppc/reloc.h.
(unrelocate, copy_dysymtab): Remove PPC code.
(rebase_reloc_address): Remove, only used for PPC:
2014-10-12 08:35:50 +00:00
|
|
|
if test $ns_osx_have_106 = no; then
|
|
|
|
AC_MSG_ERROR([`OSX 10.6 or newer is required']);
|
Port the font backend from the Mac port.
* configure.ac: Add check for OSX 10.5, required for macfont.o.
* etc/NEWS: Mention the macfont backend.
* src/Makefile.in (NS_OBJ, SOME_MACHINE_OBJECTS): Add macfont.o.
* src/font.c (syms_of_font): Call syms_of_macfont.
* src/font.h: Declare syms_of_macfont.
* src/nsfns.m: Include macfont.h.
(Fx_create_frame): Register macfont driver, make a better default font.
(Fns_popup_font_panel): Get font from macfont driver, if used.
* src/nsfont.m (ns_tmp_flags, ns_tmp_font): Remove.
(nsfont_open): Set font driver type.
Set font->ascent and font->descent. Figure out font instead of
ns_tmp_font, and flags instead of ns_tmp_flags.
Fix indentation. Remove call to ns_draw_text_decoration,
moved to nsterm.
* src/nsterm.m: Include macfont.h.
(ns_tmp_flags, ns_tmp_font): Remove.
(ns_compute_glyph_string_overhangs): Check for driver Qns.
(ns_draw_glyph_string): Use local variables instead of ns_tmp_flags,
ns_tmp_font. Call ns_draw_text_decoration here instead of nsfont.m.
(changeFont:): Fix code style. Check for font driver type when
getiing font.
* src/nsterm.h (FONT_DESCENT, FONT_ASCENT): Define to (f)->ascent and
(f)->descent.
2013-09-15 17:58:46 +00:00
|
|
|
fi
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
fi
|
2012-09-17 11:55:02 +00:00
|
|
|
|
2012-12-29 19:37:32 +00:00
|
|
|
AC_SUBST(LIBS_GNUSTEP)
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2012-05-18 07:41:13 +00:00
|
|
|
INSTALL_ARCH_INDEP_EXTRA=install-etc
|
2012-05-17 05:32:37 +00:00
|
|
|
ns_self_contained=no
|
2010-12-03 14:45:09 +00:00
|
|
|
NS_OBJ=
|
2011-02-08 21:42:56 +00:00
|
|
|
NS_OBJC_OBJ=
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "${HAVE_NS}" = yes; then
|
2012-02-02 02:12:57 +00:00
|
|
|
if test "$with_toolkit_scroll_bars" = "no"; then
|
2012-02-02 19:13:36 +00:00
|
|
|
AC_MSG_ERROR([Non-toolkit scroll bars are not implemented for Nextstep.])
|
2012-02-02 02:12:57 +00:00
|
|
|
fi
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
window_system=nextstep
|
|
|
|
# set up packaging dirs
|
|
|
|
if test "${EN_NS_SELF_CONTAINED}" = yes; then
|
2012-05-17 05:32:37 +00:00
|
|
|
ns_self_contained=yes
|
2010-12-03 14:45:09 +00:00
|
|
|
prefix=${ns_appresdir}
|
2011-11-22 01:37:45 +00:00
|
|
|
exec_prefix=${ns_appbindir}
|
2012-05-17 01:23:03 +00:00
|
|
|
dnl This one isn't really used, only archlibdir is.
|
|
|
|
libexecdir="\${ns_appbindir}/libexec"
|
|
|
|
archlibdir="\${ns_appbindir}/libexec"
|
Add build, install, uninstall rules for all dvi, html, pdf, ps manuals
* configure.ac (etcdocdir): Rename from docdir, to avoid confusion
with configure's standard --docdir argument. All uses updated.
* Makefile.in (etcdocdir): Rename from docdir. All uses updated.
(install-etcdoc): Rename from install-doc. All uses updated.
(uninstall): Run uninstall-doc.
(PSS): Add misc-ps.
(INSTALL_DVI, INSTALL_HTML, INSTALL_PDF, INSTALL_PS)
(INSTALL_DOC, UNINSTALL_DVI, UNINSTALL_HTML, UNINSTALL_PDF)
(UNINSTALL_PS, UNINSTALL_DOC): New variables.
($(INSTALL_DOC), install-doc, install-dvi, install-html, install-pdf)
(install-ps, $(UNINSTALL_DOC), uninstall-doc, uninstall-dvi)
(uninstall-html, uninstall-pdf, uninstall-ps): New .PHONY rules.
* doc/emacs/Makefile.in (prefix, datarootdir, datadir, PACKAGE_TARNAME)
(docdir, dvidir, htmldir, pdfdir, psdir, GZIP_PROG, INSTALL)
(INSTALL_DATA): New, set by configure.
(HTML_OPTS, DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS):
New variables.
(.SUFFIXES): Add .ps and .dvi.
(.dvi.ps): New suffix rule.
(dvi, html, pdf, ps): Use *_TARGETS variables.
(emacs.ps, emacs-xtra.ps): Remove explicit rules.
(emacs.html): Use HTML_OPTS.
(clean): Use DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS.
(.PHONY): install-dvi, install-html, install-pdf, install-ps
,install-doc, uninstall-dvi, uninstall-html, uninstall-pdf,
uninstall-ps, and uninstall-doc.
(install-dvi, install-html, install-pdf, install-ps, install-doc)
(uninstall-dvi, uninstall-html, uninstall-ps, uninstall-pdf)
(uninstall-doc): New rules.
* doc/lispintro/Makefile.in (prefix, datarootdir, datadir, PACKAGE_TARNAME)
(docdir, dvidir, htmldir, pdfdir, psdir, GZIP_PROG, INSTALL)
(INSTALL_DATA): New, set by configure.
(HTML_OPTS, DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS):
New variables.
(.SUFFIXES): Add .ps and .dvi.
(.dvi.ps): New suffix rule.
(dvi, html, pdf, ps): Use *_TARGETS variables.
(emacs-lisp-intro.ps): Remove explicit rule.
(emacs-lisp-intro.html): Use HTML_OPTS.
(clean): Use DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS.
(.PHONY): install-dvi, install-html, install-pdf, install-ps
,install-doc, uninstall-dvi, uninstall-html, uninstall-pdf,
uninstall-ps, and uninstall-doc.
(install-dvi, install-html, install-pdf, install-ps, install-doc)
(uninstall-dvi, uninstall-html, uninstall-ps, uninstall-pdf)
(uninstall-doc): New rules.
* doc/lispref/Makefile.in (prefix, datarootdir, datadir, PACKAGE_TARNAME)
(docdir, dvidir, htmldir, pdfdir, psdir, GZIP_PROG, INSTALL)
(INSTALL_DATA): New, set by configure.
(HTML_OPTS, DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS):
New variables.
(.SUFFIXES): Add .ps and .dvi.
(.dvi.ps): New suffix rule.
(dvi, html, pdf, ps): Use *_TARGETS variables.
(elisp.html): Use HTML_OPTS.
(elisp.ps): Remove explicit rule.
(.PHONY): install-dvi, install-html, install-pdf, install-ps
,install-doc, uninstall-dvi, uninstall-html, uninstall-pdf,
uninstall-ps, and uninstall-doc.
(install-dvi, install-html, install-pdf, install-ps, install-doc)
(uninstall-dvi, uninstall-html, uninstall-ps, uninstall-pdf)
(uninstall-doc): New rules.
(clean): Use DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS.
* doc/misc/Makefile.in (prefix, datarootdir, datadir, PACKAGE_TARNAME)
(docdir, dvidir, htmldir, pdfdir, psdir, GZIP_PROG, INSTALL)
(INSTALL_DATA): New, set by configure.
(HTML_OPTS, HTML_TARGETS, PS_TARGETS, DVIPS): New variables.
(.PHONY): Add html, ps, install-dvi, install-html, install-pdf,
install-ps ,install-doc, uninstall-dvi, uninstall-html, uninstall-pdf,
uninstall-ps, and uninstall-doc.
(.SUFFIXES): Add .ps and .dvi.
(.dvi.ps): New suffix rule.
(html, ps, ada-mode.html, auth.html, autotype.html, bovine.html)
(calc.html, cc-mode.html, cl.html, dbus.html, dired-x.html)
(ebrowse.html, ede.html, ediff.html, edt.html, eieio.html)
(emacs-gnutls.html, emacs-mime.html, epa.html, erc.html)
(ert.html, eshell.html, eudc.html, faq.html, flymake.html)
(forms.html, gnus.html, htmlfontify.html, idlwave.html)
(ido.html, mairix-el.html, message.html, mh-e.html)
(newsticker.html, nxml-mode.html, org.html, pgg.html)
(rcirc.html, reftex.html, remember.html, sasl.html, sc.html)
(semantic.html, sieve.html, smtpmail.html, speedbar.html)
(srecode.html, todo-mode.html, tramp.html, url.html, vip.html)
(viper.html, widget.html, wisent.html, woman.html, install-dvi)
(install-html, install-pdf, install-ps, install-doc, uninstall-dvi)
(uninstall-html, uninstall-ps, uninstall-pdf, uninstall-doc):
New rules.
(clean): Remove HTML_TARGETS and PS_TARGETS.
2013-08-12 00:04:15 +00:00
|
|
|
etcdocdir="\${ns_appresdir}/etc"
|
2012-05-17 05:55:29 +00:00
|
|
|
etcdir="\${ns_appresdir}/etc"
|
2012-05-17 06:07:26 +00:00
|
|
|
dnl FIXME maybe set datarootdir instead.
|
|
|
|
dnl That would also get applications, icons, man.
|
|
|
|
infodir="\${ns_appresdir}/info"
|
2012-05-18 17:49:24 +00:00
|
|
|
mandir="\${ns_appresdir}/man"
|
2012-05-17 05:55:29 +00:00
|
|
|
lispdir="\${ns_appresdir}/lisp"
|
2012-05-18 07:41:13 +00:00
|
|
|
INSTALL_ARCH_INDEP_EXTRA=
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
Port the font backend from the Mac port.
* configure.ac: Add check for OSX 10.5, required for macfont.o.
* etc/NEWS: Mention the macfont backend.
* src/Makefile.in (NS_OBJ, SOME_MACHINE_OBJECTS): Add macfont.o.
* src/font.c (syms_of_font): Call syms_of_macfont.
* src/font.h: Declare syms_of_macfont.
* src/nsfns.m: Include macfont.h.
(Fx_create_frame): Register macfont driver, make a better default font.
(Fns_popup_font_panel): Get font from macfont driver, if used.
* src/nsfont.m (ns_tmp_flags, ns_tmp_font): Remove.
(nsfont_open): Set font driver type.
Set font->ascent and font->descent. Figure out font instead of
ns_tmp_font, and flags instead of ns_tmp_flags.
Fix indentation. Remove call to ns_draw_text_decoration,
moved to nsterm.
* src/nsterm.m: Include macfont.h.
(ns_tmp_flags, ns_tmp_font): Remove.
(ns_compute_glyph_string_overhangs): Check for driver Qns.
(ns_draw_glyph_string): Use local variables instead of ns_tmp_flags,
ns_tmp_font. Call ns_draw_text_decoration here instead of nsfont.m.
(changeFont:): Fix code style. Check for font driver type when
getiing font.
* src/nsterm.h (FONT_DESCENT, FONT_ASCENT): Define to (f)->ascent and
(f)->descent.
2013-09-15 17:58:46 +00:00
|
|
|
|
Require OSX >= 10.6. Remove PowerPC unexec code.
* configure.ac: Require OSX 10.6. Remove NSInteger test,
use nsfont for Gnustep, macfont for OSX.
* etc/NEWS: OSX required is 10.6 or newer.
* src/Makefile.in: Replace nsfont.o macfont.o with ns_fontfile in
comment.
* src/macfont.h (MAC_FONT_FORMAT_ATTRIBUTE, MAC_FONT_FORMAT_BITMAP)
(mac_font_copy_non_synthetic_table): Remove versions for OSX < 10.6
* src/nsfns.m: Always include src/macfont.h on COCOA.
(ns_filename_from_panel, ns_directory_from_panel)
(Fx_create_frame, Fns_popup_font_panel, ns_run_file_dialog)
(Fns_read_file_name, Fns_list_services): Remove code for OSX < 10.6
* src/nsterm.m: Always include src/macfont.h on COCOA.
(ns_update_auto_hide_menu_bar, ns_draw_fringe_bitmap)
(ns_dumpglyphs_image, ns_check_menu_open)
(applicationDidFinishLaunching)
(antialiasThresholdDidChange:)
(keyDown:, toggleFullScreen:, setPosition:portion:whole:): Remove
checks for OSX <= 10.5/10.6.
(changeFont:): Use macfont on COCOA, nsfont on GNUSTEP.
(syms_of_nsterm): Call syms_of_macfont on COCOA, syms_of_nsfont on
GNUSTEP.
* src/macfont.m: Remove >= 1050 check.
(macfont_create_family_with_symbol)
(macfont_get_glyph_for_character)
(mac_font_get_glyphs_for_variants)
(mac_ctfont_create_available_families, syms_of_macfont): Remove
code for OSX < 10.6.
(mac_font_family_group, mac_font_family_compare): Remove, only used
for OSX < 10.6.
* src/nsimage.m (allocInitFromFile:): Remove code for OSX < 10.6.
* src/nsmenu.m (NSMenuDidBeginTrackingNotification): Remove.
(x_activate_menubar, trackingNotification:): Remove check for
OSX >= 10.5.
(menuNeedsUpdate:): Remove check for OSX < 10.5.
* src/nsterm.h (MAC_OS_X_VERSION_10_4, MAC_OS_X_VERSION_10_5): Remove.
(NS_HAVE_NSINTEGER): Remove block.
Remove >= OSX 10.6 tests.
* src/unexmacosx.c: Remove include ppc/reloc.h.
(unrelocate, copy_dysymtab): Remove PPC code.
(rebase_reloc_address): Remove, only used for PPC:
2014-10-12 08:35:50 +00:00
|
|
|
NS_OBJC_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o $ns_fontfile"
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
CFLAGS="$tmp_CFLAGS"
|
|
|
|
CPPFLAGS="$tmp_CPPFLAGS"
|
2012-05-18 07:41:13 +00:00
|
|
|
AC_SUBST(INSTALL_ARCH_INDEP_EXTRA)
|
2012-05-17 05:32:37 +00:00
|
|
|
AC_SUBST(ns_self_contained)
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_SUBST(NS_OBJ)
|
2011-02-08 21:42:56 +00:00
|
|
|
AC_SUBST(NS_OBJC_OBJ)
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2012-09-17 11:55:02 +00:00
|
|
|
HAVE_W32=no
|
|
|
|
W32_OBJ=
|
|
|
|
W32_LIBS=
|
2013-04-01 13:18:20 +00:00
|
|
|
EMACSRES=
|
|
|
|
CLIENTRES=
|
2013-04-01 13:51:33 +00:00
|
|
|
CLIENTW=
|
2012-12-10 07:11:21 +00:00
|
|
|
W32_RES_LINK=
|
2013-04-01 13:18:20 +00:00
|
|
|
EMACS_MANIFEST=
|
2013-08-10 07:43:41 +00:00
|
|
|
UPDATE_MANIFEST=
|
2012-09-17 11:55:02 +00:00
|
|
|
if test "${with_w32}" != no; then
|
2013-04-18 18:02:48 +00:00
|
|
|
case "${opsys}" in
|
2013-05-18 05:32:17 +00:00
|
|
|
cygwin)
|
2013-04-18 18:02:48 +00:00
|
|
|
AC_CHECK_HEADER([windows.h], [HAVE_W32=yes],
|
|
|
|
[AC_MSG_ERROR([`--with-w32' was specified, but windows.h
|
2013-05-18 05:32:17 +00:00
|
|
|
cannot be found.])])
|
2013-04-18 18:02:48 +00:00
|
|
|
;;
|
|
|
|
mingw32)
|
|
|
|
## Using --with-w32 with MinGW is a no-op, but we allow it.
|
|
|
|
;;
|
2013-05-18 05:32:17 +00:00
|
|
|
*)
|
2012-11-23 15:22:47 +00:00
|
|
|
AC_MSG_ERROR([Using w32 with an autotools build is only supported for Cygwin and MinGW32.])
|
2013-04-18 18:02:48 +00:00
|
|
|
;;
|
|
|
|
esac
|
2012-11-22 17:32:57 +00:00
|
|
|
fi
|
2013-04-18 18:02:48 +00:00
|
|
|
|
2012-11-22 17:32:57 +00:00
|
|
|
if test "${opsys}" = "mingw32"; then
|
2012-11-24 12:39:36 +00:00
|
|
|
AC_MSG_CHECKING([whether Windows API headers are recent enough])
|
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
|
|
|
#include <windows.h>
|
|
|
|
#include <usp10.h>]],
|
2013-07-09 18:06:25 +00:00
|
|
|
[[PIMAGE_NT_HEADERS pHeader;
|
|
|
|
PIMAGE_SECTION_HEADER pSection = IMAGE_FIRST_SECTION(pHeader)]])],
|
2013-04-18 18:02:48 +00:00
|
|
|
[emacs_cv_w32api=yes
|
2013-05-18 05:32:17 +00:00
|
|
|
HAVE_W32=yes],
|
2013-04-18 18:02:48 +00:00
|
|
|
emacs_cv_w32api=no)
|
2012-11-24 12:39:36 +00:00
|
|
|
AC_MSG_RESULT($emacs_cv_w32api)
|
|
|
|
if test "${emacs_cv_w32api}" = "no"; then
|
|
|
|
AC_MSG_ERROR([the Windows API headers are too old to support this build.])
|
|
|
|
fi
|
2012-11-22 17:32:57 +00:00
|
|
|
fi
|
|
|
|
|
2013-04-01 13:18:20 +00:00
|
|
|
FIRSTFILE_OBJ=
|
2013-04-01 14:35:26 +00:00
|
|
|
NTDIR=
|
2013-04-06 13:25:17 +00:00
|
|
|
LIBS_ECLIENT=
|
|
|
|
LIB_WSOCK32=
|
|
|
|
NTLIB=
|
2013-04-01 16:28:53 +00:00
|
|
|
CM_OBJ="cm.o"
|
2013-04-14 15:05:42 +00:00
|
|
|
XARGS_LIMIT=
|
2012-11-22 17:32:57 +00:00
|
|
|
if test "${HAVE_W32}" = "yes"; then
|
2012-10-08 16:09:00 +00:00
|
|
|
AC_DEFINE(HAVE_NTGUI, 1, [Define to use native MS Windows GUI.])
|
2012-12-10 07:11:21 +00:00
|
|
|
AC_CHECK_TOOL(WINDRES, [windres],
|
|
|
|
[AC_MSG_ERROR([No resource compiler found.])])
|
2012-09-17 11:55:02 +00:00
|
|
|
W32_OBJ="w32fns.o w32menu.o w32reg.o w32font.o w32term.o"
|
|
|
|
W32_OBJ="$W32_OBJ w32xfns.o w32select.o w32uniscribe.o"
|
2013-04-01 13:18:20 +00:00
|
|
|
EMACSRES="emacs.res"
|
2014-04-09 21:16:37 +00:00
|
|
|
case "$canonical" in
|
|
|
|
x86_64-*-*) EMACS_MANIFEST="emacs-x64.manifest" ;;
|
|
|
|
*) EMACS_MANIFEST="emacs-x86.manifest" ;;
|
|
|
|
esac
|
2012-11-23 15:22:47 +00:00
|
|
|
if test "${opsys}" = "cygwin"; then
|
2012-11-22 17:32:57 +00:00
|
|
|
W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32"
|
|
|
|
W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool"
|
2013-03-28 18:13:59 +00:00
|
|
|
# Tell the linker that emacs.res is an object (which we compile from
|
|
|
|
# the rc file), not a linker script.
|
2013-04-14 17:27:45 +00:00
|
|
|
W32_RES_LINK="-Wl,emacs.res"
|
2012-11-22 17:32:57 +00:00
|
|
|
else
|
2014-04-03 19:10:35 +00:00
|
|
|
UPDATE_MANIFEST=update-game-score.exe.manifest
|
2012-11-23 15:22:47 +00:00
|
|
|
W32_OBJ="$W32_OBJ w32.o w32console.o w32heap.o w32inevt.o w32proc.o"
|
2013-03-30 17:00:51 +00:00
|
|
|
W32_LIBS="$W32_LIBS -lwinmm -lgdi32 -lcomdlg32"
|
2013-04-06 13:25:17 +00:00
|
|
|
W32_LIBS="$W32_LIBS -lmpr -lwinspool -lole32 -lcomctl32 -lusp10"
|
2013-04-14 15:15:31 +00:00
|
|
|
W32_RES_LINK="\$(EMACSRES)"
|
2013-04-01 13:18:20 +00:00
|
|
|
CLIENTRES="emacsclient.res"
|
2013-04-01 13:51:33 +00:00
|
|
|
CLIENTW="emacsclientw\$(EXEEXT)"
|
2013-04-01 13:18:20 +00:00
|
|
|
FIRSTFILE_OBJ=firstfile.o
|
2013-04-01 14:35:26 +00:00
|
|
|
NTDIR=nt
|
2013-04-01 16:28:53 +00:00
|
|
|
CM_OBJ=
|
2013-04-06 13:25:17 +00:00
|
|
|
LIBS_ECLIENT="-lcomctl32"
|
|
|
|
LIB_WSOCK32="-lwsock32"
|
|
|
|
NTLIB="ntlib.$ac_objext"
|
2013-04-14 15:05:42 +00:00
|
|
|
XARGS_LIMIT="-s 10000"
|
2012-11-22 17:32:57 +00:00
|
|
|
fi
|
2012-09-17 11:55:02 +00:00
|
|
|
fi
|
|
|
|
AC_SUBST(W32_OBJ)
|
|
|
|
AC_SUBST(W32_LIBS)
|
2013-04-01 13:18:20 +00:00
|
|
|
AC_SUBST(EMACSRES)
|
|
|
|
AC_SUBST(EMACS_MANIFEST)
|
2013-08-10 07:43:41 +00:00
|
|
|
AC_SUBST(UPDATE_MANIFEST)
|
2013-04-01 13:18:20 +00:00
|
|
|
AC_SUBST(CLIENTRES)
|
2013-04-01 13:51:33 +00:00
|
|
|
AC_SUBST(CLIENTW)
|
2012-12-10 07:11:21 +00:00
|
|
|
AC_SUBST(W32_RES_LINK)
|
2013-04-01 13:18:20 +00:00
|
|
|
AC_SUBST(FIRSTFILE_OBJ)
|
2013-04-01 14:35:26 +00:00
|
|
|
AC_SUBST(NTDIR)
|
2013-04-01 16:28:53 +00:00
|
|
|
AC_SUBST(CM_OBJ)
|
2013-04-06 13:25:17 +00:00
|
|
|
AC_SUBST(LIBS_ECLIENT)
|
|
|
|
AC_SUBST(LIB_WSOCK32)
|
|
|
|
AC_SUBST(NTLIB)
|
2013-04-14 15:05:42 +00:00
|
|
|
AC_SUBST(XARGS_LIMIT)
|
2012-09-17 11:55:02 +00:00
|
|
|
|
|
|
|
if test "${HAVE_W32}" = "yes"; then
|
|
|
|
window_system=w32
|
|
|
|
with_xft=no
|
|
|
|
fi
|
|
|
|
|
2012-09-01 06:38:52 +00:00
|
|
|
## $window_system is now set to the window system we will
|
|
|
|
## ultimately use.
|
|
|
|
|
Make --without-x compatible with --enable-gcc-warnings.
* configure.ac: If both --without-x and --enable-gcc-warnings are
specified, use -Wno-unused-variable, -Wno-unused-but-set-variable
and -Wno-unused-but-set-parameter.
* src/font.c (register_font_driver): Move check under HAVE_WINDOW_SYSTEM.
* src/font.h (struct font_driver): Move draw, get_bitmap and free_bitmap
members under HAVE_WINDOW_SYSTEM.
* src/keyboard.c (make_lispy_focus_out): Likewise.
(record_menu_key): Move under HAVE_MENUS.
* src/xdisp.c (toplevel): Move hourglass_shown_p, hourglass_atimer and
THIN_SPACE_WIDTH under HAVE_WINDOW_SYSTEM.
(syms_of_xdisp): Adjust user.
(window_box_edges): Define only if HAVE_WINDOW_SYSTEM.
(start_hourglass, cancel_hourglass):
* src/xfaces.c (toplevel): Likewise with PT_PER_INCH,
clear_font_table_count, CLEAR_FONT_TABLE_COUNT
and CLEAR_FONT_TABLE_NFONTS.
(set_font_frame_param, clear_face_gcs, realize_non_ascii_face):
Declare only if HAVE_WINDOW_SYSTEM.
(lface_same_font_attributes_p, clear_face_gcs): Define only
if HAVE_WINDOW_SYSTEM.
2013-09-05 06:25:12 +00:00
|
|
|
if test "$window_system" = none && test "$gl_gcc_warnings" = yes; then
|
|
|
|
# Too many warnings for now.
|
2013-09-07 00:20:56 +00:00
|
|
|
nw=
|
|
|
|
nw="$nw -Wsuggest-attribute=const"
|
|
|
|
nw="$nw -Wsuggest-attribute=noreturn"
|
|
|
|
gl_MANYWARN_COMPLEMENT([WARN_CFLAGS], [$WARN_CFLAGS], [$nw])
|
|
|
|
|
Make --without-x compatible with --enable-gcc-warnings.
* configure.ac: If both --without-x and --enable-gcc-warnings are
specified, use -Wno-unused-variable, -Wno-unused-but-set-variable
and -Wno-unused-but-set-parameter.
* src/font.c (register_font_driver): Move check under HAVE_WINDOW_SYSTEM.
* src/font.h (struct font_driver): Move draw, get_bitmap and free_bitmap
members under HAVE_WINDOW_SYSTEM.
* src/keyboard.c (make_lispy_focus_out): Likewise.
(record_menu_key): Move under HAVE_MENUS.
* src/xdisp.c (toplevel): Move hourglass_shown_p, hourglass_atimer and
THIN_SPACE_WIDTH under HAVE_WINDOW_SYSTEM.
(syms_of_xdisp): Adjust user.
(window_box_edges): Define only if HAVE_WINDOW_SYSTEM.
(start_hourglass, cancel_hourglass):
* src/xfaces.c (toplevel): Likewise with PT_PER_INCH,
clear_font_table_count, CLEAR_FONT_TABLE_COUNT
and CLEAR_FONT_TABLE_NFONTS.
(set_font_frame_param, clear_face_gcs, realize_non_ascii_face):
Declare only if HAVE_WINDOW_SYSTEM.
(lface_same_font_attributes_p, clear_face_gcs): Define only
if HAVE_WINDOW_SYSTEM.
2013-09-05 06:25:12 +00:00
|
|
|
gl_WARN_ADD([-Wno-unused-variable])
|
|
|
|
gl_WARN_ADD([-Wno-unused-but-set-variable])
|
|
|
|
gl_WARN_ADD([-Wno-unused-but-set-parameter])
|
|
|
|
fi
|
|
|
|
|
2012-09-01 06:38:52 +00:00
|
|
|
term_header=
|
|
|
|
HAVE_X_WINDOWS=no
|
|
|
|
HAVE_X11=no
|
|
|
|
USE_X_TOOLKIT=none
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
case "${window_system}" in
|
|
|
|
x11 )
|
|
|
|
HAVE_X_WINDOWS=yes
|
|
|
|
HAVE_X11=yes
|
2012-09-01 06:38:52 +00:00
|
|
|
term_header=xterm.h
|
2010-12-03 14:45:09 +00:00
|
|
|
case "${with_x_toolkit}" in
|
|
|
|
athena | lucid ) USE_X_TOOLKIT=LUCID ;;
|
|
|
|
motif ) USE_X_TOOLKIT=MOTIF ;;
|
|
|
|
gtk ) with_gtk=yes
|
2012-09-01 06:38:52 +00:00
|
|
|
term_header=gtkutil.h
|
2011-11-15 17:37:37 +00:00
|
|
|
dnl Don't set this for GTK. A lot of tests below assumes Xt when
|
2010-12-03 14:45:09 +00:00
|
|
|
dnl USE_X_TOOLKIT is set.
|
|
|
|
USE_X_TOOLKIT=none ;;
|
2012-09-12 20:21:39 +00:00
|
|
|
gtk2 ) with_gtk2=yes
|
|
|
|
term_header=gtkutil.h
|
|
|
|
USE_X_TOOLKIT=none ;;
|
2010-12-03 14:45:09 +00:00
|
|
|
gtk3 ) with_gtk3=yes
|
2012-09-01 06:38:52 +00:00
|
|
|
term_header=gtkutil.h
|
2010-12-03 14:45:09 +00:00
|
|
|
USE_X_TOOLKIT=none ;;
|
|
|
|
no ) USE_X_TOOLKIT=none ;;
|
|
|
|
dnl If user did not say whether to use a toolkit, make this decision later:
|
|
|
|
dnl use the toolkit if we have gtk, or X11R5 or newer.
|
|
|
|
* ) USE_X_TOOLKIT=maybe ;;
|
|
|
|
esac
|
|
|
|
;;
|
2012-09-01 06:38:52 +00:00
|
|
|
nextstep )
|
|
|
|
term_header=nsterm.h
|
2010-12-03 14:45:09 +00:00
|
|
|
;;
|
2012-09-17 11:55:02 +00:00
|
|
|
w32 )
|
|
|
|
term_header=w32term.h
|
|
|
|
;;
|
2010-12-03 14:45:09 +00:00
|
|
|
esac
|
|
|
|
|
|
|
|
if test "$window_system" = none && test "X$with_x" != "Xno"; then
|
|
|
|
AC_CHECK_PROG(HAVE_XSERVER, X, true, false)
|
|
|
|
if test "$HAVE_XSERVER" = true ||
|
|
|
|
test -n "$DISPLAY" ||
|
|
|
|
test "`echo /usr/lib/libX11.*`" != "/usr/lib/libX11.*"; then
|
|
|
|
AC_MSG_ERROR([You seem to be running X, but no X development libraries
|
|
|
|
were found. You should install the relevant development files for X
|
2014-01-23 02:09:31 +00:00
|
|
|
and for the toolkit you want, such as Gtk+ or Motif. Also make
|
2010-12-03 14:45:09 +00:00
|
|
|
sure you have development files for image handling, i.e.
|
|
|
|
tiff, gif, jpeg, png and xpm.
|
|
|
|
If you are sure you want Emacs compiled without X window support, pass
|
|
|
|
--without-x
|
|
|
|
to configure.])
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
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 16:20:27 +00:00
|
|
|
# Does the opsystem file prohibit the use of the GNU malloc?
|
2010-12-03 14:45:09 +00:00
|
|
|
# Assume not, until told otherwise.
|
|
|
|
GNU_MALLOC=yes
|
2012-04-22 06:56:42 +00:00
|
|
|
|
|
|
|
AC_CACHE_CHECK(
|
|
|
|
[whether malloc is Doug Lea style],
|
|
|
|
[emacs_cv_var_doug_lea_malloc],
|
2013-12-26 08:57:28 +00:00
|
|
|
[emacs_cv_var_doug_lea_malloc=no
|
|
|
|
dnl Hooks do not work with address sanitization.
|
|
|
|
if test "$emacs_cv_sanitize_address" != yes; then
|
|
|
|
AC_LINK_IFELSE(
|
|
|
|
[AC_LANG_PROGRAM(
|
|
|
|
[[#include <malloc.h>
|
|
|
|
static void hook (void) {}]],
|
|
|
|
[[malloc_set_state (malloc_get_state ());
|
|
|
|
__after_morecore_hook = hook;
|
|
|
|
__malloc_initialize_hook = hook;]])],
|
|
|
|
[emacs_cv_var_doug_lea_malloc=yes])])
|
|
|
|
fi
|
2012-04-22 06:56:42 +00:00
|
|
|
doug_lea_malloc=$emacs_cv_var_doug_lea_malloc
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2013-12-26 08:57:28 +00:00
|
|
|
system_malloc=$emacs_cv_sanitize_address
|
Add support for HYBRID_MALLOC, allowing the use of gmalloc before
dumping and the system malloc after dumping. (Bug#18222)
* configure.ac (HYBRID_MALLOC): New macro; define to use gmalloc
before dumping and the system malloc after dumping. Define on Cygwin.
* src/conf_post.h (malloc, realloc, calloc, free) [HYBRID_MALLOC]:
Define as macros, expanding to hybrid_malloc, etc.
(HYBRID_GET_CURRENT_DIR_NAME): New macro.
(get_current_dir_name) [HYBRID_GET_CURRENT_DIR_NAME]: Define as
macro.
* src/gmalloc.c: Set up the infrastructure for HYBRID_MALLOC, with a
full implementation on Cygwin. Remove Cygwin-specific code that
is no longer needed.
(malloc, realloc, calloc, free, aligned_alloc) [HYBRID_MALLOC]:
Redefine as macros expanding to gmalloc, grealloc, etc.
(DUMPED, ALLOCATED_BEFORE_DUMPING) [CYGWIN]: New macros.
(get_current_dir_name) [HYBRID_GET_CURRENT_DIR_NAME]: Undefine.
(USE_PTHREAD, posix_memalign) [HYBRID_MALLOC]: Don't define.
(hybrid_malloc, hybrid_calloc, hybrid_free, hybrid_realloc)
[HYBRID_MALLOC]:
(hybrid_get_current_dir_name) [HYBRID_GET_CURRENT_DIR_NAME]:
(hybrid_aligned_alloc) [HYBRID_MALLOC && (HAVE_ALIGNED_ALLOC ||
HAVE_POSIX_MEMALIGN)]: New functions.
* src/alloc.c (aligned_alloc) [HYBRID_MALLOC && (ALIGNED_ALLOC ||
HAVE_POSIX_MEMALIGN)]: Define as macro expanding to
hybrid_aligned_alloc; declare.
(USE_ALIGNED_ALLOC) [HYBRID_MALLOC && (ALIGNED_ALLOC ||
HAVE_POSIX_MEMALIGN)]: Define.
(refill_memory_reserve) [HYBRID_MALLOC]: Do nothing.
* src/sysdep.c (get_current_dir_name) [HYBRID_GET_CURRENT_DIR_NAME]:
Define as macro, expanding to gget_current_dir_name, and define
the latter.
* src/emacs.c (main) [HYBRID_MALLOC]: Don't call memory_warnings() or
malloc_enable_thread(). Don't initialize malloc.
* src/lisp.h (NONPOINTER_BITS) [CYGWIN]: Define (because GNU_MALLOC is
no longer defined on Cygwin).
(refill_memory_reserve) [HYBRID_MALLOC]: Don't declare.
* src/sheap.c (bss_sbrk_buffer_end): New variable.
* src/unexcw.c (__malloc_initialized): Remove variable.
* src/ralloc.c: Throughout, treat HYBRID_MALLOC the same as
SYSTEM_MALLOC.
* src/xdisp.c (decode_mode_spec) [HYBRID_MALLOC]: Don't check
Vmemory_full.
2014-08-28 14:48:02 +00:00
|
|
|
|
|
|
|
hybrid_malloc=
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
case "$opsys" in
|
|
|
|
## darwin ld insists on the use of malloc routines in the System framework.
|
Use mmap(2) emulation for buffer text on MS-Windows.
src/Makefile.in (C_HEAP_SWITCH): Get the predefined heap size from
configure.
(ADDSECTION, MINGW_TEMACS_POST_LINK): Remove, no longer used.
src/lisp.h (NONPOINTER_BITS): Modify the condition to define to zero
for MinGW, since it no longer uses gmalloc.
src/buffer.c: Do not define mmap allocations functions for Windows.
Remove mmap_find which is unused. Remove mmap_set_vars which does
nothing useful.
[WINDOWSNT]: Include w32heap.h.
(init_buffer): Always allocate new memory for buffers.
src/emacs.c: Remove mmap_set_vars calls.
src/image.c (free_image): Undef free for Windows because it is
redirected to our private version.
src/unexw32.c (COPY_PROC_CHUNK): Use %p format for 64bits
compatibility.
(copy_executable_and_dump_data): Remove dumping the heap section.
(unexec): Restore using_dynamic_heap after dumping.
src/w32heap.c (dumped_data_commit, malloc_after_dump)
(malloc_before_dump, realloc_after_dump, realloc_before_dump)
(free_after_dump, free_before_dump, mmap_alloc, mmap_realloc)
(mmap_free): New functions.
src/w32heap.h: Declare dumped_data and mmap_* function prototypes.
nt/inc/ms-w32.h: Switch to the system heap allocation scheme
instead of GNU malloc and ralloc.
nt/inc/sys/mman.h: New file.
nt/INSTALL: Update for the new build requirements.
etc/NEWS: Mention build changes on MS-Windows.
configure.ac (C_HEAP_SWITCH) define for different values of
dumped heap size depending on 32/64bits arch on Windows.
Don't check for pthreads.h on MinGW32/64, it gets in the way.
Use mmap(2) for buffers and system malloc for MinGW32/64.
2014-05-27 17:31:17 +00:00
|
|
|
darwin|mingw32|sol2-10) system_malloc=yes ;;
|
Add support for HYBRID_MALLOC, allowing the use of gmalloc before
dumping and the system malloc after dumping. (Bug#18222)
* configure.ac (HYBRID_MALLOC): New macro; define to use gmalloc
before dumping and the system malloc after dumping. Define on Cygwin.
* src/conf_post.h (malloc, realloc, calloc, free) [HYBRID_MALLOC]:
Define as macros, expanding to hybrid_malloc, etc.
(HYBRID_GET_CURRENT_DIR_NAME): New macro.
(get_current_dir_name) [HYBRID_GET_CURRENT_DIR_NAME]: Define as
macro.
* src/gmalloc.c: Set up the infrastructure for HYBRID_MALLOC, with a
full implementation on Cygwin. Remove Cygwin-specific code that
is no longer needed.
(malloc, realloc, calloc, free, aligned_alloc) [HYBRID_MALLOC]:
Redefine as macros expanding to gmalloc, grealloc, etc.
(DUMPED, ALLOCATED_BEFORE_DUMPING) [CYGWIN]: New macros.
(get_current_dir_name) [HYBRID_GET_CURRENT_DIR_NAME]: Undefine.
(USE_PTHREAD, posix_memalign) [HYBRID_MALLOC]: Don't define.
(hybrid_malloc, hybrid_calloc, hybrid_free, hybrid_realloc)
[HYBRID_MALLOC]:
(hybrid_get_current_dir_name) [HYBRID_GET_CURRENT_DIR_NAME]:
(hybrid_aligned_alloc) [HYBRID_MALLOC && (HAVE_ALIGNED_ALLOC ||
HAVE_POSIX_MEMALIGN)]: New functions.
* src/alloc.c (aligned_alloc) [HYBRID_MALLOC && (ALIGNED_ALLOC ||
HAVE_POSIX_MEMALIGN)]: Define as macro expanding to
hybrid_aligned_alloc; declare.
(USE_ALIGNED_ALLOC) [HYBRID_MALLOC && (ALIGNED_ALLOC ||
HAVE_POSIX_MEMALIGN)]: Define.
(refill_memory_reserve) [HYBRID_MALLOC]: Do nothing.
* src/sysdep.c (get_current_dir_name) [HYBRID_GET_CURRENT_DIR_NAME]:
Define as macro, expanding to gget_current_dir_name, and define
the latter.
* src/emacs.c (main) [HYBRID_MALLOC]: Don't call memory_warnings() or
malloc_enable_thread(). Don't initialize malloc.
* src/lisp.h (NONPOINTER_BITS) [CYGWIN]: Define (because GNU_MALLOC is
no longer defined on Cygwin).
(refill_memory_reserve) [HYBRID_MALLOC]: Don't declare.
* src/sheap.c (bss_sbrk_buffer_end): New variable.
* src/unexcw.c (__malloc_initialized): Remove variable.
* src/ralloc.c: Throughout, treat HYBRID_MALLOC the same as
SYSTEM_MALLOC.
* src/xdisp.c (decode_mode_spec) [HYBRID_MALLOC]: Don't check
Vmemory_full.
2014-08-28 14:48:02 +00:00
|
|
|
cygwin) hybrid_malloc=yes;;
|
2010-12-03 14:45:09 +00:00
|
|
|
esac
|
|
|
|
|
2013-11-07 05:31:04 +00:00
|
|
|
GMALLOC_OBJ=
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "${system_malloc}" = "yes"; then
|
2013-11-07 05:31:04 +00:00
|
|
|
AC_DEFINE([SYSTEM_MALLOC], 1,
|
|
|
|
[Define to 1 to use the system memory allocator, even if it is not
|
|
|
|
Doug Lea style.])
|
2010-12-03 14:45:09 +00:00
|
|
|
GNU_MALLOC=no
|
|
|
|
GNU_MALLOC_reason="
|
|
|
|
(The GNU allocators don't work with this system configuration.)"
|
|
|
|
VMLIMIT_OBJ=
|
Add support for HYBRID_MALLOC, allowing the use of gmalloc before
dumping and the system malloc after dumping. (Bug#18222)
* configure.ac (HYBRID_MALLOC): New macro; define to use gmalloc
before dumping and the system malloc after dumping. Define on Cygwin.
* src/conf_post.h (malloc, realloc, calloc, free) [HYBRID_MALLOC]:
Define as macros, expanding to hybrid_malloc, etc.
(HYBRID_GET_CURRENT_DIR_NAME): New macro.
(get_current_dir_name) [HYBRID_GET_CURRENT_DIR_NAME]: Define as
macro.
* src/gmalloc.c: Set up the infrastructure for HYBRID_MALLOC, with a
full implementation on Cygwin. Remove Cygwin-specific code that
is no longer needed.
(malloc, realloc, calloc, free, aligned_alloc) [HYBRID_MALLOC]:
Redefine as macros expanding to gmalloc, grealloc, etc.
(DUMPED, ALLOCATED_BEFORE_DUMPING) [CYGWIN]: New macros.
(get_current_dir_name) [HYBRID_GET_CURRENT_DIR_NAME]: Undefine.
(USE_PTHREAD, posix_memalign) [HYBRID_MALLOC]: Don't define.
(hybrid_malloc, hybrid_calloc, hybrid_free, hybrid_realloc)
[HYBRID_MALLOC]:
(hybrid_get_current_dir_name) [HYBRID_GET_CURRENT_DIR_NAME]:
(hybrid_aligned_alloc) [HYBRID_MALLOC && (HAVE_ALIGNED_ALLOC ||
HAVE_POSIX_MEMALIGN)]: New functions.
* src/alloc.c (aligned_alloc) [HYBRID_MALLOC && (ALIGNED_ALLOC ||
HAVE_POSIX_MEMALIGN)]: Define as macro expanding to
hybrid_aligned_alloc; declare.
(USE_ALIGNED_ALLOC) [HYBRID_MALLOC && (ALIGNED_ALLOC ||
HAVE_POSIX_MEMALIGN)]: Define.
(refill_memory_reserve) [HYBRID_MALLOC]: Do nothing.
* src/sysdep.c (get_current_dir_name) [HYBRID_GET_CURRENT_DIR_NAME]:
Define as macro, expanding to gget_current_dir_name, and define
the latter.
* src/emacs.c (main) [HYBRID_MALLOC]: Don't call memory_warnings() or
malloc_enable_thread(). Don't initialize malloc.
* src/lisp.h (NONPOINTER_BITS) [CYGWIN]: Define (because GNU_MALLOC is
no longer defined on Cygwin).
(refill_memory_reserve) [HYBRID_MALLOC]: Don't declare.
* src/sheap.c (bss_sbrk_buffer_end): New variable.
* src/unexcw.c (__malloc_initialized): Remove variable.
* src/ralloc.c: Throughout, treat HYBRID_MALLOC the same as
SYSTEM_MALLOC.
* src/xdisp.c (decode_mode_spec) [HYBRID_MALLOC]: Don't check
Vmemory_full.
2014-08-28 14:48:02 +00:00
|
|
|
elif test "$hybrid_malloc" = yes; then
|
|
|
|
AC_DEFINE(HYBRID_MALLOC, 1,
|
|
|
|
[Define to use gmalloc before dumping and the system malloc after.])
|
|
|
|
GNU_MALLOC=
|
|
|
|
GNU_MALLOC_reason="only before dumping"
|
|
|
|
GMALLOC_OBJ=gmalloc.o
|
|
|
|
VMLIMIT_OBJ=
|
2010-12-03 14:45:09 +00:00
|
|
|
else
|
|
|
|
test "$doug_lea_malloc" != "yes" && GMALLOC_OBJ=gmalloc.o
|
|
|
|
VMLIMIT_OBJ=vm-limit.o
|
Simplify data_start configuration.
This is a followon simplification to the fix for Bug#13650.
* admin/CPP-DEFINES (DATA_START, ORDINARY_LINK): Remove.
* configure.ac (CRT_DIR, LIB_STANDARD, START_FILES, DATA_START)
(LD_FIRSTFLAG, ORDINARY_LINK, LIB_GCC): Remove.
(AC_CHECK_HEADERS_ONCE): Remove sys/resource.h, as it's
not always needed.
(HAVE_DATA_START): New macro.
* etc/PROBLEMS (LIBS_SYSTEM, LIBS_MACHINE, LIBS_STANDARD): Remove.
Remove legacy-systems section, as this stuff is no longer
applicable with current linking strategies.
* src/Makefile.in (LD_FIRSTFLAG, LIB_GCC, CRT_DIR, LIB_STANDARD)
(START_FILES): Remove. All uses removed.
(otherobj): Remove $(VMLIMIT_OBJ), as it's now first.
(ALLOBJS): Move here from autodeps.mk, and with VMLIMITS_OBJ first.
(buildobj.h): Use it.
($(ALLOBJS)): Depend on globals.h.
(temacs$(EXEEXT)): Use $(ALLOBJS).
* src/autodeps.mk (ALLOBJS): Move to Makefile.in.
* src/deps.mk (vm-limit.o):
* src/makefile.w32-in ($(BLD)/vm-limit.$(O)):
Do not depend on mem-limits.h.
* src/emacs.c (__do_global_ctors, __do_global_ctors_aux)
(__do_global_dtors, __CTOR_LIST__, __DTOR_LIST__)
[__GNUC__ && !ORDINARY_LINK]: Remove.
* src/mem-limits.h, src/pre-crt0.c: Remove.
* src/unexaix.c, src/unexcoff.c: Don't include mem-limits.h.
* src/unexcoff.c (etext): New decl.
(make_hdr): Use it instead of start_of_data.
* src/vm-limit.c: Move most of mem-limits.h's contents here.
(data_start): New decl. It's OK if this is approximate,
so simplify-away some unnecessary exactness.
(POINTER): Remove; all uses removed.
(data_space_start): Now char *, to avoid casts.
(exceeds_lisp_ptr): New function, replacing the old
EXCEEDS_LISP_PTR macro. All uses changed.
(check_memory_limits): Simplify and remove casts.
(start_of_data) [!CANNOT_DUMP || !SYSTEM_MALLOC]: Remove.
(memory_warnings): Use data_start instead of start_of_data.
Fixes: debbugs:13783
2013-02-25 05:55:37 +00:00
|
|
|
|
|
|
|
AC_CHECK_HEADERS([sys/vlimit.h])
|
|
|
|
AC_CACHE_CHECK([for data_start], [emacs_cv_data_start],
|
|
|
|
[AC_LINK_IFELSE(
|
|
|
|
[AC_LANG_PROGRAM(
|
|
|
|
[[extern char data_start[]; char ch;]],
|
2013-02-28 03:19:51 +00:00
|
|
|
[[return data_start < &ch;]])],
|
Simplify data_start configuration.
This is a followon simplification to the fix for Bug#13650.
* admin/CPP-DEFINES (DATA_START, ORDINARY_LINK): Remove.
* configure.ac (CRT_DIR, LIB_STANDARD, START_FILES, DATA_START)
(LD_FIRSTFLAG, ORDINARY_LINK, LIB_GCC): Remove.
(AC_CHECK_HEADERS_ONCE): Remove sys/resource.h, as it's
not always needed.
(HAVE_DATA_START): New macro.
* etc/PROBLEMS (LIBS_SYSTEM, LIBS_MACHINE, LIBS_STANDARD): Remove.
Remove legacy-systems section, as this stuff is no longer
applicable with current linking strategies.
* src/Makefile.in (LD_FIRSTFLAG, LIB_GCC, CRT_DIR, LIB_STANDARD)
(START_FILES): Remove. All uses removed.
(otherobj): Remove $(VMLIMIT_OBJ), as it's now first.
(ALLOBJS): Move here from autodeps.mk, and with VMLIMITS_OBJ first.
(buildobj.h): Use it.
($(ALLOBJS)): Depend on globals.h.
(temacs$(EXEEXT)): Use $(ALLOBJS).
* src/autodeps.mk (ALLOBJS): Move to Makefile.in.
* src/deps.mk (vm-limit.o):
* src/makefile.w32-in ($(BLD)/vm-limit.$(O)):
Do not depend on mem-limits.h.
* src/emacs.c (__do_global_ctors, __do_global_ctors_aux)
(__do_global_dtors, __CTOR_LIST__, __DTOR_LIST__)
[__GNUC__ && !ORDINARY_LINK]: Remove.
* src/mem-limits.h, src/pre-crt0.c: Remove.
* src/unexaix.c, src/unexcoff.c: Don't include mem-limits.h.
* src/unexcoff.c (etext): New decl.
(make_hdr): Use it instead of start_of_data.
* src/vm-limit.c: Move most of mem-limits.h's contents here.
(data_start): New decl. It's OK if this is approximate,
so simplify-away some unnecessary exactness.
(POINTER): Remove; all uses removed.
(data_space_start): Now char *, to avoid casts.
(exceeds_lisp_ptr): New function, replacing the old
EXCEEDS_LISP_PTR macro. All uses changed.
(check_memory_limits): Simplify and remove casts.
(start_of_data) [!CANNOT_DUMP || !SYSTEM_MALLOC]: Remove.
(memory_warnings): Use data_start instead of start_of_data.
Fixes: debbugs:13783
2013-02-25 05:55:37 +00:00
|
|
|
[emacs_cv_data_start=yes],
|
|
|
|
[emacs_cv_data_start=no])])
|
|
|
|
if test $emacs_cv_data_start = yes; then
|
|
|
|
AC_DEFINE([HAVE_DATA_START], 1,
|
|
|
|
[Define to 1 if data_start is the address of the start
|
|
|
|
of the main data segment.])
|
|
|
|
fi
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
AC_SUBST(GMALLOC_OBJ)
|
|
|
|
AC_SUBST(VMLIMIT_OBJ)
|
|
|
|
|
|
|
|
if test "$doug_lea_malloc" = "yes" ; then
|
|
|
|
if test "$GNU_MALLOC" = yes ; then
|
|
|
|
GNU_MALLOC_reason="
|
|
|
|
(Using Doug Lea's new malloc from the GNU C Library.)"
|
|
|
|
fi
|
|
|
|
AC_DEFINE(DOUG_LEA_MALLOC, 1,
|
2013-11-07 05:31:04 +00:00
|
|
|
[Define to 1 if the system memory allocator is Doug Lea style,
|
|
|
|
with malloc hooks and malloc_set_state.])
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
## Use mmap directly for allocating larger buffers.
|
|
|
|
## FIXME this comes from src/s/{gnu,gnu-linux}.h:
|
|
|
|
## #ifdef DOUG_LEA_MALLOC; #undef REL_ALLOC; #endif
|
2011-12-15 07:24:10 +00:00
|
|
|
## Does the AC_FUNC_MMAP test below make this check unnecessary?
|
2010-12-03 14:45:09 +00:00
|
|
|
case "$opsys" in
|
Use mmap(2) emulation for buffer text on MS-Windows.
src/Makefile.in (C_HEAP_SWITCH): Get the predefined heap size from
configure.
(ADDSECTION, MINGW_TEMACS_POST_LINK): Remove, no longer used.
src/lisp.h (NONPOINTER_BITS): Modify the condition to define to zero
for MinGW, since it no longer uses gmalloc.
src/buffer.c: Do not define mmap allocations functions for Windows.
Remove mmap_find which is unused. Remove mmap_set_vars which does
nothing useful.
[WINDOWSNT]: Include w32heap.h.
(init_buffer): Always allocate new memory for buffers.
src/emacs.c: Remove mmap_set_vars calls.
src/image.c (free_image): Undef free for Windows because it is
redirected to our private version.
src/unexw32.c (COPY_PROC_CHUNK): Use %p format for 64bits
compatibility.
(copy_executable_and_dump_data): Remove dumping the heap section.
(unexec): Restore using_dynamic_heap after dumping.
src/w32heap.c (dumped_data_commit, malloc_after_dump)
(malloc_before_dump, realloc_after_dump, realloc_before_dump)
(free_after_dump, free_before_dump, mmap_alloc, mmap_realloc)
(mmap_free): New functions.
src/w32heap.h: Declare dumped_data and mmap_* function prototypes.
nt/inc/ms-w32.h: Switch to the system heap allocation scheme
instead of GNU malloc and ralloc.
nt/inc/sys/mman.h: New file.
nt/INSTALL: Update for the new build requirements.
etc/NEWS: Mention build changes on MS-Windows.
configure.ac (C_HEAP_SWITCH) define for different values of
dumped heap size depending on 32/64bits arch on Windows.
Don't check for pthreads.h on MinGW32/64, it gets in the way.
Use mmap(2) for buffers and system malloc for MinGW32/64.
2014-05-27 17:31:17 +00:00
|
|
|
mingw32|gnu*) REL_ALLOC=no ;;
|
2010-12-03 14:45:09 +00:00
|
|
|
esac
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test x"${REL_ALLOC}" = x; then
|
|
|
|
REL_ALLOC=${GNU_MALLOC}
|
|
|
|
fi
|
|
|
|
|
|
|
|
use_mmap_for_buffers=no
|
|
|
|
case "$opsys" in
|
Use mmap(2) emulation for buffer text on MS-Windows.
src/Makefile.in (C_HEAP_SWITCH): Get the predefined heap size from
configure.
(ADDSECTION, MINGW_TEMACS_POST_LINK): Remove, no longer used.
src/lisp.h (NONPOINTER_BITS): Modify the condition to define to zero
for MinGW, since it no longer uses gmalloc.
src/buffer.c: Do not define mmap allocations functions for Windows.
Remove mmap_find which is unused. Remove mmap_set_vars which does
nothing useful.
[WINDOWSNT]: Include w32heap.h.
(init_buffer): Always allocate new memory for buffers.
src/emacs.c: Remove mmap_set_vars calls.
src/image.c (free_image): Undef free for Windows because it is
redirected to our private version.
src/unexw32.c (COPY_PROC_CHUNK): Use %p format for 64bits
compatibility.
(copy_executable_and_dump_data): Remove dumping the heap section.
(unexec): Restore using_dynamic_heap after dumping.
src/w32heap.c (dumped_data_commit, malloc_after_dump)
(malloc_before_dump, realloc_after_dump, realloc_before_dump)
(free_after_dump, free_before_dump, mmap_alloc, mmap_realloc)
(mmap_free): New functions.
src/w32heap.h: Declare dumped_data and mmap_* function prototypes.
nt/inc/ms-w32.h: Switch to the system heap allocation scheme
instead of GNU malloc and ralloc.
nt/inc/sys/mman.h: New file.
nt/INSTALL: Update for the new build requirements.
etc/NEWS: Mention build changes on MS-Windows.
configure.ac (C_HEAP_SWITCH) define for different values of
dumped heap size depending on 32/64bits arch on Windows.
Don't check for pthreads.h on MinGW32/64, it gets in the way.
Use mmap(2) for buffers and system malloc for MinGW32/64.
2014-05-27 17:31:17 +00:00
|
|
|
cygwin|mingw32|freebsd|irix6-5) use_mmap_for_buffers=yes ;;
|
2010-12-03 14:45:09 +00:00
|
|
|
esac
|
|
|
|
|
|
|
|
AC_FUNC_MMAP
|
|
|
|
if test $use_mmap_for_buffers = yes; then
|
|
|
|
AC_DEFINE(USE_MMAP_FOR_BUFFERS, 1, [Define to use mmap to allocate buffer text.])
|
|
|
|
REL_ALLOC=no
|
|
|
|
fi
|
|
|
|
|
|
|
|
LIBS="$LIBS_SYSTEM $LIBS"
|
|
|
|
|
|
|
|
dnl FIXME replace main with a function we actually want from this library.
|
|
|
|
AC_CHECK_LIB(Xbsd, main, LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd")
|
|
|
|
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
dnl Check for the POSIX thread library.
|
2011-08-04 17:04:39 +00:00
|
|
|
LIB_PTHREAD=
|
Use mmap(2) emulation for buffer text on MS-Windows.
src/Makefile.in (C_HEAP_SWITCH): Get the predefined heap size from
configure.
(ADDSECTION, MINGW_TEMACS_POST_LINK): Remove, no longer used.
src/lisp.h (NONPOINTER_BITS): Modify the condition to define to zero
for MinGW, since it no longer uses gmalloc.
src/buffer.c: Do not define mmap allocations functions for Windows.
Remove mmap_find which is unused. Remove mmap_set_vars which does
nothing useful.
[WINDOWSNT]: Include w32heap.h.
(init_buffer): Always allocate new memory for buffers.
src/emacs.c: Remove mmap_set_vars calls.
src/image.c (free_image): Undef free for Windows because it is
redirected to our private version.
src/unexw32.c (COPY_PROC_CHUNK): Use %p format for 64bits
compatibility.
(copy_executable_and_dump_data): Remove dumping the heap section.
(unexec): Restore using_dynamic_heap after dumping.
src/w32heap.c (dumped_data_commit, malloc_after_dump)
(malloc_before_dump, realloc_after_dump, realloc_before_dump)
(free_after_dump, free_before_dump, mmap_alloc, mmap_realloc)
(mmap_free): New functions.
src/w32heap.h: Declare dumped_data and mmap_* function prototypes.
nt/inc/ms-w32.h: Switch to the system heap allocation scheme
instead of GNU malloc and ralloc.
nt/inc/sys/mman.h: New file.
nt/INSTALL: Update for the new build requirements.
etc/NEWS: Mention build changes on MS-Windows.
configure.ac (C_HEAP_SWITCH) define for different values of
dumped heap size depending on 32/64bits arch on Windows.
Don't check for pthreads.h on MinGW32/64, it gets in the way.
Use mmap(2) for buffers and system malloc for MinGW32/64.
2014-05-27 17:31:17 +00:00
|
|
|
if test "$opsys" != "mingw32"; then
|
2012-05-28 00:46:33 +00:00
|
|
|
AC_CHECK_HEADERS_ONCE(pthread.h)
|
2011-08-04 17:04:39 +00:00
|
|
|
if test "$ac_cv_header_pthread_h"; then
|
2011-12-17 00:51:40 +00:00
|
|
|
dnl gmalloc.c uses pthread_atfork, which is not available on older-style
|
|
|
|
dnl hosts such as MirBSD 10, so test for pthread_atfork instead of merely
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
dnl testing for pthread_kill if Emacs uses gmalloc.c.
|
2011-12-17 00:51:40 +00:00
|
|
|
if test "$GMALLOC_OBJ" = gmalloc.o; then
|
|
|
|
emacs_pthread_function=pthread_atfork
|
|
|
|
else
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
emacs_pthread_function=pthread_kill
|
2011-12-17 00:51:40 +00:00
|
|
|
fi
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
OLD_LIBS=$LIBS
|
|
|
|
AC_SEARCH_LIBS([$emacs_pthread_function], [pthread],
|
|
|
|
[AC_DEFINE([HAVE_PTHREAD], [1],
|
2014-06-08 00:35:27 +00:00
|
|
|
[Define to 1 if you have pthread (-lpthread).])
|
|
|
|
# Some systems optimize for single-threaded programs by default, and
|
|
|
|
# need special flags to disable these optimizations. For example, the
|
|
|
|
# definition of 'errno' in <errno.h>.
|
2014-06-15 00:06:30 +00:00
|
|
|
case $opsys in
|
|
|
|
sol*)
|
|
|
|
AC_DEFINE([_REENTRANT], 1,
|
|
|
|
[Define to 1 if your system requires this in multithreaded code.]);;
|
|
|
|
aix4-2)
|
|
|
|
AC_DEFINE([_THREAD_SAFE], 1,
|
|
|
|
[Define to 1 if your system requires this in multithreaded code.]);;
|
|
|
|
esac])
|
|
|
|
if test "X$LIBS" != "X$OLD_LIBS"; then
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
eval LIB_PTHREAD=\$ac_cv_search_$emacs_pthread_function
|
|
|
|
fi
|
|
|
|
LIBS=$OLD_LIBS
|
2011-08-04 17:04:39 +00:00
|
|
|
fi
|
|
|
|
AC_SUBST([LIB_PTHREAD])
|
Use mmap(2) emulation for buffer text on MS-Windows.
src/Makefile.in (C_HEAP_SWITCH): Get the predefined heap size from
configure.
(ADDSECTION, MINGW_TEMACS_POST_LINK): Remove, no longer used.
src/lisp.h (NONPOINTER_BITS): Modify the condition to define to zero
for MinGW, since it no longer uses gmalloc.
src/buffer.c: Do not define mmap allocations functions for Windows.
Remove mmap_find which is unused. Remove mmap_set_vars which does
nothing useful.
[WINDOWSNT]: Include w32heap.h.
(init_buffer): Always allocate new memory for buffers.
src/emacs.c: Remove mmap_set_vars calls.
src/image.c (free_image): Undef free for Windows because it is
redirected to our private version.
src/unexw32.c (COPY_PROC_CHUNK): Use %p format for 64bits
compatibility.
(copy_executable_and_dump_data): Remove dumping the heap section.
(unexec): Restore using_dynamic_heap after dumping.
src/w32heap.c (dumped_data_commit, malloc_after_dump)
(malloc_before_dump, realloc_after_dump, realloc_before_dump)
(free_after_dump, free_before_dump, mmap_alloc, mmap_realloc)
(mmap_free): New functions.
src/w32heap.h: Declare dumped_data and mmap_* function prototypes.
nt/inc/ms-w32.h: Switch to the system heap allocation scheme
instead of GNU malloc and ralloc.
nt/inc/sys/mman.h: New file.
nt/INSTALL: Update for the new build requirements.
etc/NEWS: Mention build changes on MS-Windows.
configure.ac (C_HEAP_SWITCH) define for different values of
dumped heap size depending on 32/64bits arch on Windows.
Don't check for pthreads.h on MinGW32/64, it gets in the way.
Use mmap(2) for buffers and system malloc for MinGW32/64.
2014-05-27 17:31:17 +00:00
|
|
|
fi
|
2011-08-04 17:04:39 +00:00
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
dnl Check for need for bigtoc support on IBM AIX
|
|
|
|
|
|
|
|
case ${host_os} in
|
|
|
|
aix*)
|
|
|
|
AC_CACHE_CHECK([for -bbigtoc option], [gdb_cv_bigtoc], [
|
|
|
|
case $GCC in
|
|
|
|
yes) gdb_cv_bigtoc=-Wl,-bbigtoc ;;
|
|
|
|
*) gdb_cv_bigtoc=-bbigtoc ;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
LDFLAGS=$LDFLAGS\ $gdb_cv_bigtoc
|
2011-03-26 19:29:10 +00:00
|
|
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[int i;]])], [], [gdb_cv_bigtoc=])
|
2010-12-03 14:45:09 +00:00
|
|
|
])
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
# Change CFLAGS, CPPFLAGS, and LIBS temporarily so that C_SWITCH_X_SITE
|
|
|
|
# is for the tests that follow. We set them back later on.
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
REAL_CFLAGS="$CFLAGS"
|
|
|
|
REAL_CPPFLAGS="$CPPFLAGS"
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
REAL_LIBS="$LIBS"
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
if test "${HAVE_X11}" = "yes"; then
|
|
|
|
DEFS="$C_SWITCH_X_SITE $DEFS"
|
|
|
|
LDFLAGS="$LDFLAGS $LD_SWITCH_X_SITE"
|
|
|
|
LIBS="-lX11 $LIBS"
|
|
|
|
CFLAGS="$C_SWITCH_X_SITE $CFLAGS"
|
|
|
|
CPPFLAGS="$C_SWITCH_X_SITE $CPPFLAGS"
|
|
|
|
|
|
|
|
# On Solaris, arrange for LD_RUN_PATH to point to the X libraries for tests.
|
2012-05-01 00:16:02 +00:00
|
|
|
# This is handled by LD_SWITCH_X_SITE_RPATH during the real build,
|
2012-05-01 00:12:02 +00:00
|
|
|
# but it's more convenient here to set LD_RUN_PATH since this
|
2012-05-01 00:16:02 +00:00
|
|
|
# also works on hosts that don't understand LD_SWITCH_X_SITE_RPATH.
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "${x_libraries}" != NONE && test -n "${x_libraries}"; then
|
|
|
|
LD_RUN_PATH=$x_libraries${LD_RUN_PATH+:}$LD_RUN_PATH
|
|
|
|
export LD_RUN_PATH
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test "${opsys}" = "gnu-linux"; then
|
|
|
|
AC_MSG_CHECKING(whether X on GNU/Linux needs -b to link)
|
2011-03-26 19:29:10 +00:00
|
|
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
|
|
|
|
[[XOpenDisplay ("foo");]])],
|
2011-10-02 22:43:52 +00:00
|
|
|
[xgnu_linux_first_failure=no],
|
|
|
|
[xgnu_linux_first_failure=yes])
|
|
|
|
if test "${xgnu_linux_first_failure}" = "yes"; then
|
2010-12-03 14:45:09 +00:00
|
|
|
OLD_CPPFLAGS="$CPPFLAGS"
|
|
|
|
OLD_LIBS="$LIBS"
|
|
|
|
CPPFLAGS="$CPPFLAGS -b i486-linuxaout"
|
|
|
|
LIBS="$LIBS -b i486-linuxaout"
|
2011-03-26 19:29:10 +00:00
|
|
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
|
|
|
|
[[XOpenDisplay ("foo");]])],
|
2011-10-02 22:43:52 +00:00
|
|
|
[xgnu_linux_second_failure=no],
|
|
|
|
[xgnu_linux_second_failure=yes])
|
|
|
|
if test "${xgnu_linux_second_failure}" = "yes"; then
|
2010-12-03 14:45:09 +00:00
|
|
|
# If we get the same failure with -b, there is no use adding -b.
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
# So leave it out. This plays safe.
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
else
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -b i486-linuxaout"
|
|
|
|
C_SWITCH_X_SITE="$C_SWITCH_X_SITE -b i486-linuxaout"
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
fi
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
CPPFLAGS=$OLD_CPPFLAGS
|
|
|
|
LIBS=$OLD_LIBS
|
2010-12-03 14:45:09 +00:00
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Reportedly, some broken Solaris systems have XKBlib.h but are missing
|
|
|
|
# header files included from there.
|
|
|
|
AC_MSG_CHECKING(for Xkb)
|
2011-03-26 19:29:10 +00:00
|
|
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>
|
|
|
|
#include <X11/XKBlib.h>]],
|
|
|
|
[[XkbDescPtr kb = XkbGetKeyboard (0, XkbAllComponentsMask, XkbUseCoreKbd);]])],
|
2010-12-03 14:45:09 +00:00
|
|
|
emacs_xkb=yes, emacs_xkb=no)
|
|
|
|
AC_MSG_RESULT($emacs_xkb)
|
|
|
|
if test $emacs_xkb = yes; then
|
2013-03-25 17:58:35 +00:00
|
|
|
AC_DEFINE(HAVE_XKB, 1, [Define to 1 if you have the Xkb extension.])
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
AC_CHECK_FUNCS(XrmSetDatabase XScreenResourceString \
|
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 18:04:49 +00:00
|
|
|
XScreenNumberOfScreen)
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
if test "${window_system}" = "x11"; then
|
|
|
|
AC_MSG_CHECKING(X11 version 6)
|
|
|
|
AC_CACHE_VAL(emacs_cv_x11_version_6,
|
2011-03-26 19:29:10 +00:00
|
|
|
[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]],
|
|
|
|
[[#if XlibSpecificationRelease < 6
|
2010-12-03 14:45:09 +00:00
|
|
|
fail;
|
|
|
|
#endif
|
2011-03-26 19:29:10 +00:00
|
|
|
]])], emacs_cv_x11_version_6=yes, emacs_cv_x11_version_6=no)])
|
2010-12-03 14:45:09 +00:00
|
|
|
if test $emacs_cv_x11_version_6 = yes; then
|
|
|
|
AC_MSG_RESULT(6 or newer)
|
|
|
|
AC_DEFINE(HAVE_X11R6, 1,
|
|
|
|
[Define to 1 if you have the X11R6 or newer version of Xlib.])
|
|
|
|
AC_DEFINE(HAVE_X_I18N, 1, [Define if you have usable i18n support.])
|
|
|
|
## inoue@ainet.or.jp says Solaris has a bug related to X11R6-style
|
|
|
|
## XIM support.
|
|
|
|
case "$opsys" in
|
|
|
|
sol2-*) : ;;
|
|
|
|
*) AC_DEFINE(HAVE_X11R6_XIM, 1,
|
|
|
|
[Define if you have usable X11R6-style XIM support.])
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(before 6)
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
### Use -lrsvg-2 if available, unless `--with-rsvg=no' is specified.
|
|
|
|
HAVE_RSVG=no
|
2012-11-23 15:22:47 +00:00
|
|
|
if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${opsys}" = "mingw32"; then
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "${with_rsvg}" != "no"; then
|
|
|
|
RSVG_REQUIRED=2.11.0
|
|
|
|
RSVG_MODULE="librsvg-2.0 >= $RSVG_REQUIRED"
|
|
|
|
|
2014-05-03 08:12:06 +00:00
|
|
|
EMACS_CHECK_MODULES([RSVG], [$RSVG_MODULE])
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_SUBST(RSVG_CFLAGS)
|
|
|
|
AC_SUBST(RSVG_LIBS)
|
|
|
|
|
|
|
|
if test $HAVE_RSVG = yes; then
|
|
|
|
AC_DEFINE(HAVE_RSVG, 1, [Define to 1 if using librsvg.])
|
|
|
|
CFLAGS="$CFLAGS $RSVG_CFLAGS"
|
2013-12-08 19:28:29 +00:00
|
|
|
# Windows loads librsvg dynamically
|
|
|
|
if test "${opsys}" = "mingw32"; then
|
|
|
|
RSVG_LIBS=
|
|
|
|
fi
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
HAVE_IMAGEMAGICK=no
|
2014-02-18 01:47:35 +00:00
|
|
|
if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${HAVE_W32}" = "yes"; then
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "${with_imagemagick}" != "no"; then
|
2014-05-03 21:06:04 +00:00
|
|
|
## 6.3.5 is the earliest version known to work; see Bug#17339.
|
2013-03-18 05:26:56 +00:00
|
|
|
## 6.8.2 makes Emacs crash; see Bug#13867.
|
2014-05-03 21:06:04 +00:00
|
|
|
IMAGEMAGICK_MODULE="Wand >= 6.3.5 Wand != 6.8.2"
|
2014-05-03 08:12:06 +00:00
|
|
|
EMACS_CHECK_MODULES([IMAGEMAGICK], [$IMAGEMAGICK_MODULE])
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_SUBST(IMAGEMAGICK_CFLAGS)
|
|
|
|
AC_SUBST(IMAGEMAGICK_LIBS)
|
2011-01-22 00:12:10 +00:00
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
if test $HAVE_IMAGEMAGICK = yes; then
|
|
|
|
AC_DEFINE(HAVE_IMAGEMAGICK, 1, [Define to 1 if using imagemagick.])
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
OLD_CFLAGS=$CFLAGS
|
|
|
|
OLD_LIBS=$LIBS
|
2010-12-03 14:45:09 +00:00
|
|
|
CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS"
|
|
|
|
LIBS="$IMAGEMAGICK_LIBS $LIBS"
|
2012-06-12 17:27:41 +00:00
|
|
|
AC_CHECK_FUNCS(MagickExportImagePixels MagickMergeImageLayers)
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
CFLAGS=$OLD_CFLAGS
|
|
|
|
LIBS=$OLD_LIBS
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
HAVE_GTK=no
|
2011-06-14 21:08:20 +00:00
|
|
|
GTK_OBJ=
|
2013-06-30 15:24:14 +00:00
|
|
|
gtk_term_header=$term_header
|
2012-09-12 20:21:39 +00:00
|
|
|
check_gtk2=no
|
|
|
|
gtk3_pkg_errors=
|
2012-11-23 15:22:47 +00:00
|
|
|
if test "${opsys}" != "mingw32"; then
|
|
|
|
if test "${with_gtk3}" = "yes" || test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then
|
|
|
|
GLIB_REQUIRED=2.28
|
|
|
|
GTK_REQUIRED=3.0
|
|
|
|
GTK_MODULES="gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
|
|
|
|
|
|
|
|
dnl Checks for libraries.
|
2014-05-03 08:12:06 +00:00
|
|
|
EMACS_CHECK_MODULES([GTK], [$GTK_MODULES],
|
|
|
|
[pkg_check_gtk=yes], [pkg_check_gtk=no])
|
2012-11-23 15:22:47 +00:00
|
|
|
if test "$pkg_check_gtk" = "no" && test "$with_gtk3" = "yes"; then
|
|
|
|
AC_MSG_ERROR($GTK_PKG_ERRORS)
|
|
|
|
fi
|
|
|
|
if test "$pkg_check_gtk" = "yes"; then
|
|
|
|
AC_DEFINE(HAVE_GTK3, 1, [Define to 1 if using GTK 3 or later.])
|
|
|
|
GTK_OBJ=emacsgtkfixed.o
|
2013-06-30 15:24:14 +00:00
|
|
|
gtk_term_header=gtkutil.h
|
2012-11-23 15:22:47 +00:00
|
|
|
USE_GTK_TOOLKIT="GTK3"
|
2013-03-28 18:13:59 +00:00
|
|
|
if test "x$ac_enable_gtk_deprecation_warnings" = x; then
|
2013-12-08 08:53:49 +00:00
|
|
|
AC_DEFINE([GDK_DISABLE_DEPRECATION_WARNINGS], [1],
|
|
|
|
[Define to 1 to disable GTK+/GDK deprecation warnings.])
|
|
|
|
AC_DEFINE([GLIB_DISABLE_DEPRECATION_WARNINGS], [1],
|
|
|
|
[Define to 1 to disable Glib deprecation warnings.])
|
2013-03-28 18:13:59 +00:00
|
|
|
fi
|
2012-11-23 15:22:47 +00:00
|
|
|
else
|
|
|
|
check_gtk2=yes
|
|
|
|
gtk3_pkg_errors="$GTK_PKG_ERRORS "
|
|
|
|
fi
|
2012-09-12 20:21:39 +00:00
|
|
|
fi
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2012-11-23 15:22:47 +00:00
|
|
|
if test "${with_gtk2}" = "yes" || test "$check_gtk2" = "yes"; then
|
|
|
|
GLIB_REQUIRED=2.10
|
|
|
|
GTK_REQUIRED=2.10
|
|
|
|
GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
|
|
|
|
|
|
|
|
dnl Checks for libraries.
|
2014-05-03 08:12:06 +00:00
|
|
|
EMACS_CHECK_MODULES([GTK], [$GTK_MODULES],
|
|
|
|
[pkg_check_gtk=yes], [pkg_check_gtk=no])
|
2012-11-23 15:22:47 +00:00
|
|
|
if test "$pkg_check_gtk" = "no" &&
|
|
|
|
{ test "$with_gtk" = yes || test "$with_gtk2" = "yes"; }
|
|
|
|
then
|
|
|
|
AC_MSG_ERROR($gtk3_pkg_errors$GTK_PKG_ERRORS)
|
|
|
|
fi
|
|
|
|
test "$pkg_check_gtk" = "yes" && USE_GTK_TOOLKIT="GTK2"
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
OLD_CFLAGS=$CFLAGS
|
|
|
|
OLD_LIBS=$LIBS
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
if test x"$pkg_check_gtk" = xyes; then
|
|
|
|
|
|
|
|
AC_SUBST(GTK_LIBS)
|
|
|
|
CFLAGS="$CFLAGS $GTK_CFLAGS"
|
|
|
|
LIBS="$GTK_LIBS $LIBS"
|
|
|
|
dnl Try to compile a simple GTK program.
|
2013-07-02 02:17:12 +00:00
|
|
|
AC_MSG_CHECKING([whether GTK compiles])
|
2010-12-03 14:45:09 +00:00
|
|
|
GTK_COMPILES=no
|
2013-07-02 02:17:12 +00:00
|
|
|
AC_LINK_IFELSE(
|
|
|
|
[AC_LANG_PROGRAM(
|
|
|
|
[[/* Check the Gtk and Glib APIs. */
|
|
|
|
#include <gtk/gtk.h>
|
|
|
|
#include <glib-object.h>
|
|
|
|
static void
|
|
|
|
callback (GObject *go, GParamSpec *spec, gpointer user_data)
|
|
|
|
{}
|
|
|
|
]],
|
|
|
|
[[
|
|
|
|
GtkSettings *gs = 0;
|
|
|
|
/* Use G_CALLBACK to make sure function pointers can be cast to void *;
|
|
|
|
strict C prohibits this. Use gtk_main_iteration to test that the
|
|
|
|
libraries are there. */
|
|
|
|
if (g_signal_handler_find (G_OBJECT (gs), G_SIGNAL_MATCH_FUNC,
|
|
|
|
0, 0, 0, G_CALLBACK (callback), 0))
|
|
|
|
gtk_main_iteration ();
|
|
|
|
]])],
|
|
|
|
[GTK_COMPILES=yes])
|
|
|
|
AC_MSG_RESULT([$GTK_COMPILES])
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "${GTK_COMPILES}" != "yes"; then
|
2013-06-30 15:24:14 +00:00
|
|
|
GTK_OBJ=
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "$USE_X_TOOLKIT" != "maybe"; then
|
|
|
|
AC_MSG_ERROR([Gtk+ wanted, but it does not compile, see config.log. Maybe some x11-devel files missing?]);
|
|
|
|
fi
|
|
|
|
else
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
C_SWITCH_X_SITE="$C_SWITCH_X_SITE $GTK_CFLAGS"
|
2010-12-03 14:45:09 +00:00
|
|
|
HAVE_GTK=yes
|
|
|
|
AC_DEFINE(USE_GTK, 1, [Define to 1 if using GTK.])
|
2011-06-14 21:08:20 +00:00
|
|
|
GTK_OBJ="gtkutil.o $GTK_OBJ"
|
2013-06-30 15:24:14 +00:00
|
|
|
term_header=$gtk_term_header
|
2010-12-03 14:45:09 +00:00
|
|
|
USE_X_TOOLKIT=none
|
2012-12-09 02:22:39 +00:00
|
|
|
if "$PKG_CONFIG" --atleast-version=2.10 gtk+-2.0; then
|
2010-12-03 14:45:09 +00:00
|
|
|
:
|
|
|
|
else
|
|
|
|
AC_MSG_WARN([[Your version of Gtk+ will have problems with
|
|
|
|
closing open displays. This is no problem if you just use
|
|
|
|
one display, but if you use more than one and close one of them
|
|
|
|
Emacs may crash.]])
|
|
|
|
sleep 3
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
fi
|
|
|
|
AC_SUBST(GTK_OBJ)
|
|
|
|
|
|
|
|
|
|
|
|
if test "${HAVE_GTK}" = "yes"; then
|
|
|
|
|
|
|
|
dnl GTK scrollbars resemble toolkit scrollbars a lot, so to avoid
|
|
|
|
dnl a lot if #ifdef:s, say we have toolkit scrollbars.
|
|
|
|
if test "$with_toolkit_scroll_bars" != no; then
|
|
|
|
with_toolkit_scroll_bars=yes
|
|
|
|
fi
|
|
|
|
|
|
|
|
dnl Check if we have the old file selection dialog declared and
|
|
|
|
dnl in the link library. In 2.x it may be in the library,
|
|
|
|
dnl but not declared if deprecated featured has been selected out.
|
|
|
|
dnl AC_CHECK_DECL checks for a macro, so check for GTK_TYPE_FILE_SELECTION.
|
|
|
|
HAVE_GTK_FILE_SELECTION=no
|
|
|
|
AC_CHECK_DECL(GTK_TYPE_FILE_SELECTION, HAVE_GTK_FILE_SELECTION=yes,
|
|
|
|
HAVE_GTK_FILE_SELECTION=no, [AC_INCLUDES_DEFAULT
|
|
|
|
#include <gtk/gtk.h>])
|
|
|
|
if test "$HAVE_GTK_FILE_SELECTION" = yes; then
|
|
|
|
AC_CHECK_FUNCS(gtk_file_selection_new)
|
|
|
|
fi
|
|
|
|
|
2012-12-30 18:44:00 +00:00
|
|
|
dnl Same as above for gtk_handle_box.
|
|
|
|
HAVE_GTK_HANDLE_BOX=no
|
|
|
|
AC_CHECK_DECL(GTK_TYPE_HANDLE_BOX, HAVE_GTK_HANDLE_BOX=yes,
|
|
|
|
HAVE_GTK_HANDLE_BOX=no, [AC_INCLUDES_DEFAULT
|
|
|
|
#include <gtk/gtk.h>])
|
|
|
|
if test "$HAVE_GTK_HANDLE_BOX" = yes; then
|
|
|
|
AC_CHECK_FUNCS(gtk_handle_box_new)
|
|
|
|
fi
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2012-12-30 19:08:15 +00:00
|
|
|
dnl Same as above for gtk_tearoff_menu_item.
|
|
|
|
HAVE_GTK_TEAROFF_MENU_ITEM=no
|
|
|
|
AC_CHECK_DECL(GTK_TYPE_TEAROFF_MENU_ITEM, HAVE_GTK_TEAROFF_MENU_ITEM=yes,
|
|
|
|
HAVE_GTK_TEAROFF_MENU_ITEM=no, [AC_INCLUDES_DEFAULT
|
|
|
|
#include <gtk/gtk.h>])
|
|
|
|
if test "$HAVE_GTK_TEAROFF_MENU_ITEM" = yes; then
|
|
|
|
AC_CHECK_FUNCS(gtk_tearoff_menu_item_new)
|
|
|
|
fi
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
dnl Check for functions introduced in 2.14 and later.
|
|
|
|
AC_CHECK_FUNCS(gtk_widget_get_window gtk_widget_set_has_window \
|
|
|
|
gtk_dialog_get_action_area gtk_widget_get_sensitive \
|
|
|
|
gtk_widget_get_mapped gtk_adjustment_get_page_size \
|
2011-11-27 18:33:17 +00:00
|
|
|
gtk_orientable_set_orientation \
|
|
|
|
gtk_window_set_has_resize_grip)
|
2012-09-01 06:38:52 +00:00
|
|
|
|
|
|
|
term_header=gtkutil.h
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
CFLAGS=$OLD_CFLAGS
|
|
|
|
LIBS=$OLD_LIBS
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
dnl D-Bus has been tested under GNU/Linux only. Must be adapted for
|
Move functions from C to Lisp. Make non-blocking method calls
the default. Implement further D-Bus standard interfaces.
* configure.in (dbus_validate_bus_name, dbus_validate_path)
(dbus_validate_interface, dbus_validate_member): Check also for
these library functions
* dbusbind.c (DBUS_NUM_MESSAGE_TYPES): Declare.
(QCdbus_request_name_allow_replacement)
(QCdbus_request_name_replace_existing)
(QCdbus_request_name_do_not_queue)
(QCdbus_request_name_reply_primary_owner)
(QCdbus_request_name_reply_in_queue)
(QCdbus_request_name_reply_exists)
(QCdbus_request_name_reply_already_owner): Move to dbus.el.
(QCdbus_registered_serial, QCdbus_registered_method)
(QCdbus_registered_signal): New Lisp objects.
(XD_DEBUG_MESSAGE): Use sizeof.
(XD_MESSAGE_TYPE_TO_STRING, XD_OBJECT_TO_STRING)
(XD_DBUS_VALIDATE_BUS_ADDRESS, XD_DBUS_VALIDATE_OBJECT)
(XD_DBUS_VALIDATE_BUS_NAME, XD_DBUS_VALIDATE_PATH)
(XD_DBUS_VALIDATE_INTERFACE, XD_DBUS_VALIDATE_MEMBER): New macros.
(XD_CHECK_DBUS_SERIAL): Rename from CHECK_DBUS_SERIAL_GET_SERIAL.
(xd_signature, xd_append_arg): Allow float for integer types.
(xd_get_connection_references): New function.
(xd_get_connection_address): Rename from xd_initialize. Return
cached address.
(xd_remove_watch): Do not unset $DBUS_SESSION_BUS_ADDRESS.
(xd_close_bus): Rename from Fdbus_close_bus. Not needed on Lisp
level.
(Fdbus_init_bus): New optional arg PRIVATE. Cache address.
Return number of recounts.
(Fdbus_get_unique_name): Make stronger parameter check.
(Fdbus_message_internal): New defun.
(Fdbus_call_method, Fdbus_call_method_asynchronously)
(Fdbus_method_return_internal, Fdbus_method_error_internal)
(Fdbus_send_signal, Fdbus_register_service)
(Fdbus_register_signal, Fdbus_register_method): Move to dbus.el.
(xd_read_message_1): Obey new structure of Vdbus_registered_objects.
(xd_read_queued_messages): Obey new structure of Vdbus_registered_buses.
(Vdbus_compiled_version, Vdbus_runtime_version)
(Vdbus_message_type_invalid, Vdbus_message_type_method_call)
(Vdbus_message_type_method_return, Vdbus_message_type_error)
(Vdbus_message_type_signal): New defvars.
(Vdbus_registered_buses, Vdbus_registered_objects_table): Adapt
docstring.
* net/dbus.el (dbus-message-internal): Declare function. Remove
unneeded function declarations.
(defvar dbus-message-type-invalid, dbus-message-type-method-call)
(dbus-message-type-method-return, dbus-message-type-error)
(dbus-message-type-signal): Declare variables. Remove local
definitions.
(dbus-interface-dbus, dbus-interface-peer)
(dbus-interface-introspectable, dbus-interface-properties)
(dbus-path-emacs, dbus-interface-emacs, dbus-return-values-table):
Adapt docstring.
(dbus-interface-objectmanager): New defconst.
(dbus-call-method, dbus-call-method-asynchronously)
(dbus-send-signal, dbus-method-return-internal)
(dbus-method-error-internal, dbus-register-service)
(dbus-register-signal, dbus-register-method): New defuns, moved
from dbusbind.c
(dbus-call-method-handler, dbus-setenv)
(dbus-get-all-managed-objects, dbus-managed-objects-handler): New
defuns.
(dbus-call-method-non-blocking): Make it an obsolete function.
(dbus-unregister-object, dbus-unregister-service)
(dbus-handle-event, dbus-register-property)
(dbus-property-handler): Obey the new structure of
`bus-registered-objects'.
(dbus-introspect): Use `dbus-call-method'. Use a timeout.
(dbus-get-property, dbus-set-property, dbus-get-all-properties):
Use `dbus-call-method'.
* dbus.texi (Version): New node.
(Properties and Annotations): Mention the object manager
interface. Describe dbus-get-all-managed-objects.
(Type Conversion): Floating point numbers are allowed, if an
anteger does not fit Emacs's integer range.
(Synchronous Methods): Remove obsolete dbus-call-method-non-blocking.
(Asynchronous Methods): Fix description of
dbus-call-method-asynchronously.
(Receiving Method Calls): Fix some minor errors. Add
dbus-interface-emacs.
(Signals): Describe unicast signals and the new match rules.
(Alternative Buses): Add the PRIVATE optional argument to
dbus-init-bus. Describe its new return value. Add dbus-setenv.
2012-04-22 14:11:43 +00:00
|
|
|
dnl other platforms.
|
2010-12-03 14:45:09 +00:00
|
|
|
HAVE_DBUS=no
|
|
|
|
DBUS_OBJ=
|
|
|
|
if test "${with_dbus}" = "yes"; then
|
2014-05-03 08:12:06 +00:00
|
|
|
EMACS_CHECK_MODULES([DBUS], [dbus-1 >= 1.0])
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "$HAVE_DBUS" = yes; then
|
|
|
|
AC_DEFINE(HAVE_DBUS, 1, [Define to 1 if using D-Bus.])
|
Move functions from C to Lisp. Make non-blocking method calls
the default. Implement further D-Bus standard interfaces.
* configure.in (dbus_validate_bus_name, dbus_validate_path)
(dbus_validate_interface, dbus_validate_member): Check also for
these library functions
* dbusbind.c (DBUS_NUM_MESSAGE_TYPES): Declare.
(QCdbus_request_name_allow_replacement)
(QCdbus_request_name_replace_existing)
(QCdbus_request_name_do_not_queue)
(QCdbus_request_name_reply_primary_owner)
(QCdbus_request_name_reply_in_queue)
(QCdbus_request_name_reply_exists)
(QCdbus_request_name_reply_already_owner): Move to dbus.el.
(QCdbus_registered_serial, QCdbus_registered_method)
(QCdbus_registered_signal): New Lisp objects.
(XD_DEBUG_MESSAGE): Use sizeof.
(XD_MESSAGE_TYPE_TO_STRING, XD_OBJECT_TO_STRING)
(XD_DBUS_VALIDATE_BUS_ADDRESS, XD_DBUS_VALIDATE_OBJECT)
(XD_DBUS_VALIDATE_BUS_NAME, XD_DBUS_VALIDATE_PATH)
(XD_DBUS_VALIDATE_INTERFACE, XD_DBUS_VALIDATE_MEMBER): New macros.
(XD_CHECK_DBUS_SERIAL): Rename from CHECK_DBUS_SERIAL_GET_SERIAL.
(xd_signature, xd_append_arg): Allow float for integer types.
(xd_get_connection_references): New function.
(xd_get_connection_address): Rename from xd_initialize. Return
cached address.
(xd_remove_watch): Do not unset $DBUS_SESSION_BUS_ADDRESS.
(xd_close_bus): Rename from Fdbus_close_bus. Not needed on Lisp
level.
(Fdbus_init_bus): New optional arg PRIVATE. Cache address.
Return number of recounts.
(Fdbus_get_unique_name): Make stronger parameter check.
(Fdbus_message_internal): New defun.
(Fdbus_call_method, Fdbus_call_method_asynchronously)
(Fdbus_method_return_internal, Fdbus_method_error_internal)
(Fdbus_send_signal, Fdbus_register_service)
(Fdbus_register_signal, Fdbus_register_method): Move to dbus.el.
(xd_read_message_1): Obey new structure of Vdbus_registered_objects.
(xd_read_queued_messages): Obey new structure of Vdbus_registered_buses.
(Vdbus_compiled_version, Vdbus_runtime_version)
(Vdbus_message_type_invalid, Vdbus_message_type_method_call)
(Vdbus_message_type_method_return, Vdbus_message_type_error)
(Vdbus_message_type_signal): New defvars.
(Vdbus_registered_buses, Vdbus_registered_objects_table): Adapt
docstring.
* net/dbus.el (dbus-message-internal): Declare function. Remove
unneeded function declarations.
(defvar dbus-message-type-invalid, dbus-message-type-method-call)
(dbus-message-type-method-return, dbus-message-type-error)
(dbus-message-type-signal): Declare variables. Remove local
definitions.
(dbus-interface-dbus, dbus-interface-peer)
(dbus-interface-introspectable, dbus-interface-properties)
(dbus-path-emacs, dbus-interface-emacs, dbus-return-values-table):
Adapt docstring.
(dbus-interface-objectmanager): New defconst.
(dbus-call-method, dbus-call-method-asynchronously)
(dbus-send-signal, dbus-method-return-internal)
(dbus-method-error-internal, dbus-register-service)
(dbus-register-signal, dbus-register-method): New defuns, moved
from dbusbind.c
(dbus-call-method-handler, dbus-setenv)
(dbus-get-all-managed-objects, dbus-managed-objects-handler): New
defuns.
(dbus-call-method-non-blocking): Make it an obsolete function.
(dbus-unregister-object, dbus-unregister-service)
(dbus-handle-event, dbus-register-property)
(dbus-property-handler): Obey the new structure of
`bus-registered-objects'.
(dbus-introspect): Use `dbus-call-method'. Use a timeout.
(dbus-get-property, dbus-set-property, dbus-get-all-properties):
Use `dbus-call-method'.
* dbus.texi (Version): New node.
(Properties and Annotations): Mention the object manager
interface. Describe dbus-get-all-managed-objects.
(Type Conversion): Floating point numbers are allowed, if an
anteger does not fit Emacs's integer range.
(Synchronous Methods): Remove obsolete dbus-call-method-non-blocking.
(Asynchronous Methods): Fix description of
dbus-call-method-asynchronously.
(Receiving Method Calls): Fix some minor errors. Add
dbus-interface-emacs.
(Signals): Describe unicast signals and the new match rules.
(Alternative Buses): Add the PRIVATE optional argument to
dbus-init-bus. Describe its new return value. Add dbus-setenv.
2012-04-22 14:11:43 +00:00
|
|
|
dnl dbus_watch_get_unix_fd has been introduced in D-Bus 1.1.1.
|
2012-06-09 11:12:12 +00:00
|
|
|
dnl dbus_type_is_valid and dbus_validate_* have been introduced in
|
|
|
|
dnl D-Bus 1.5.12.
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
OLD_LIBS=$LIBS
|
|
|
|
LIBS="$LIBS $DBUS_LIBS"
|
Move functions from C to Lisp. Make non-blocking method calls
the default. Implement further D-Bus standard interfaces.
* configure.in (dbus_validate_bus_name, dbus_validate_path)
(dbus_validate_interface, dbus_validate_member): Check also for
these library functions
* dbusbind.c (DBUS_NUM_MESSAGE_TYPES): Declare.
(QCdbus_request_name_allow_replacement)
(QCdbus_request_name_replace_existing)
(QCdbus_request_name_do_not_queue)
(QCdbus_request_name_reply_primary_owner)
(QCdbus_request_name_reply_in_queue)
(QCdbus_request_name_reply_exists)
(QCdbus_request_name_reply_already_owner): Move to dbus.el.
(QCdbus_registered_serial, QCdbus_registered_method)
(QCdbus_registered_signal): New Lisp objects.
(XD_DEBUG_MESSAGE): Use sizeof.
(XD_MESSAGE_TYPE_TO_STRING, XD_OBJECT_TO_STRING)
(XD_DBUS_VALIDATE_BUS_ADDRESS, XD_DBUS_VALIDATE_OBJECT)
(XD_DBUS_VALIDATE_BUS_NAME, XD_DBUS_VALIDATE_PATH)
(XD_DBUS_VALIDATE_INTERFACE, XD_DBUS_VALIDATE_MEMBER): New macros.
(XD_CHECK_DBUS_SERIAL): Rename from CHECK_DBUS_SERIAL_GET_SERIAL.
(xd_signature, xd_append_arg): Allow float for integer types.
(xd_get_connection_references): New function.
(xd_get_connection_address): Rename from xd_initialize. Return
cached address.
(xd_remove_watch): Do not unset $DBUS_SESSION_BUS_ADDRESS.
(xd_close_bus): Rename from Fdbus_close_bus. Not needed on Lisp
level.
(Fdbus_init_bus): New optional arg PRIVATE. Cache address.
Return number of recounts.
(Fdbus_get_unique_name): Make stronger parameter check.
(Fdbus_message_internal): New defun.
(Fdbus_call_method, Fdbus_call_method_asynchronously)
(Fdbus_method_return_internal, Fdbus_method_error_internal)
(Fdbus_send_signal, Fdbus_register_service)
(Fdbus_register_signal, Fdbus_register_method): Move to dbus.el.
(xd_read_message_1): Obey new structure of Vdbus_registered_objects.
(xd_read_queued_messages): Obey new structure of Vdbus_registered_buses.
(Vdbus_compiled_version, Vdbus_runtime_version)
(Vdbus_message_type_invalid, Vdbus_message_type_method_call)
(Vdbus_message_type_method_return, Vdbus_message_type_error)
(Vdbus_message_type_signal): New defvars.
(Vdbus_registered_buses, Vdbus_registered_objects_table): Adapt
docstring.
* net/dbus.el (dbus-message-internal): Declare function. Remove
unneeded function declarations.
(defvar dbus-message-type-invalid, dbus-message-type-method-call)
(dbus-message-type-method-return, dbus-message-type-error)
(dbus-message-type-signal): Declare variables. Remove local
definitions.
(dbus-interface-dbus, dbus-interface-peer)
(dbus-interface-introspectable, dbus-interface-properties)
(dbus-path-emacs, dbus-interface-emacs, dbus-return-values-table):
Adapt docstring.
(dbus-interface-objectmanager): New defconst.
(dbus-call-method, dbus-call-method-asynchronously)
(dbus-send-signal, dbus-method-return-internal)
(dbus-method-error-internal, dbus-register-service)
(dbus-register-signal, dbus-register-method): New defuns, moved
from dbusbind.c
(dbus-call-method-handler, dbus-setenv)
(dbus-get-all-managed-objects, dbus-managed-objects-handler): New
defuns.
(dbus-call-method-non-blocking): Make it an obsolete function.
(dbus-unregister-object, dbus-unregister-service)
(dbus-handle-event, dbus-register-property)
(dbus-property-handler): Obey the new structure of
`bus-registered-objects'.
(dbus-introspect): Use `dbus-call-method'. Use a timeout.
(dbus-get-property, dbus-set-property, dbus-get-all-properties):
Use `dbus-call-method'.
* dbus.texi (Version): New node.
(Properties and Annotations): Mention the object manager
interface. Describe dbus-get-all-managed-objects.
(Type Conversion): Floating point numbers are allowed, if an
anteger does not fit Emacs's integer range.
(Synchronous Methods): Remove obsolete dbus-call-method-non-blocking.
(Asynchronous Methods): Fix description of
dbus-call-method-asynchronously.
(Receiving Method Calls): Fix some minor errors. Add
dbus-interface-emacs.
(Signals): Describe unicast signals and the new match rules.
(Alternative Buses): Add the PRIVATE optional argument to
dbus-init-bus. Describe its new return value. Add dbus-setenv.
2012-04-22 14:11:43 +00:00
|
|
|
AC_CHECK_FUNCS(dbus_watch_get_unix_fd \
|
2012-06-09 11:12:12 +00:00
|
|
|
dbus_type_is_valid \
|
Move functions from C to Lisp. Make non-blocking method calls
the default. Implement further D-Bus standard interfaces.
* configure.in (dbus_validate_bus_name, dbus_validate_path)
(dbus_validate_interface, dbus_validate_member): Check also for
these library functions
* dbusbind.c (DBUS_NUM_MESSAGE_TYPES): Declare.
(QCdbus_request_name_allow_replacement)
(QCdbus_request_name_replace_existing)
(QCdbus_request_name_do_not_queue)
(QCdbus_request_name_reply_primary_owner)
(QCdbus_request_name_reply_in_queue)
(QCdbus_request_name_reply_exists)
(QCdbus_request_name_reply_already_owner): Move to dbus.el.
(QCdbus_registered_serial, QCdbus_registered_method)
(QCdbus_registered_signal): New Lisp objects.
(XD_DEBUG_MESSAGE): Use sizeof.
(XD_MESSAGE_TYPE_TO_STRING, XD_OBJECT_TO_STRING)
(XD_DBUS_VALIDATE_BUS_ADDRESS, XD_DBUS_VALIDATE_OBJECT)
(XD_DBUS_VALIDATE_BUS_NAME, XD_DBUS_VALIDATE_PATH)
(XD_DBUS_VALIDATE_INTERFACE, XD_DBUS_VALIDATE_MEMBER): New macros.
(XD_CHECK_DBUS_SERIAL): Rename from CHECK_DBUS_SERIAL_GET_SERIAL.
(xd_signature, xd_append_arg): Allow float for integer types.
(xd_get_connection_references): New function.
(xd_get_connection_address): Rename from xd_initialize. Return
cached address.
(xd_remove_watch): Do not unset $DBUS_SESSION_BUS_ADDRESS.
(xd_close_bus): Rename from Fdbus_close_bus. Not needed on Lisp
level.
(Fdbus_init_bus): New optional arg PRIVATE. Cache address.
Return number of recounts.
(Fdbus_get_unique_name): Make stronger parameter check.
(Fdbus_message_internal): New defun.
(Fdbus_call_method, Fdbus_call_method_asynchronously)
(Fdbus_method_return_internal, Fdbus_method_error_internal)
(Fdbus_send_signal, Fdbus_register_service)
(Fdbus_register_signal, Fdbus_register_method): Move to dbus.el.
(xd_read_message_1): Obey new structure of Vdbus_registered_objects.
(xd_read_queued_messages): Obey new structure of Vdbus_registered_buses.
(Vdbus_compiled_version, Vdbus_runtime_version)
(Vdbus_message_type_invalid, Vdbus_message_type_method_call)
(Vdbus_message_type_method_return, Vdbus_message_type_error)
(Vdbus_message_type_signal): New defvars.
(Vdbus_registered_buses, Vdbus_registered_objects_table): Adapt
docstring.
* net/dbus.el (dbus-message-internal): Declare function. Remove
unneeded function declarations.
(defvar dbus-message-type-invalid, dbus-message-type-method-call)
(dbus-message-type-method-return, dbus-message-type-error)
(dbus-message-type-signal): Declare variables. Remove local
definitions.
(dbus-interface-dbus, dbus-interface-peer)
(dbus-interface-introspectable, dbus-interface-properties)
(dbus-path-emacs, dbus-interface-emacs, dbus-return-values-table):
Adapt docstring.
(dbus-interface-objectmanager): New defconst.
(dbus-call-method, dbus-call-method-asynchronously)
(dbus-send-signal, dbus-method-return-internal)
(dbus-method-error-internal, dbus-register-service)
(dbus-register-signal, dbus-register-method): New defuns, moved
from dbusbind.c
(dbus-call-method-handler, dbus-setenv)
(dbus-get-all-managed-objects, dbus-managed-objects-handler): New
defuns.
(dbus-call-method-non-blocking): Make it an obsolete function.
(dbus-unregister-object, dbus-unregister-service)
(dbus-handle-event, dbus-register-property)
(dbus-property-handler): Obey the new structure of
`bus-registered-objects'.
(dbus-introspect): Use `dbus-call-method'. Use a timeout.
(dbus-get-property, dbus-set-property, dbus-get-all-properties):
Use `dbus-call-method'.
* dbus.texi (Version): New node.
(Properties and Annotations): Mention the object manager
interface. Describe dbus-get-all-managed-objects.
(Type Conversion): Floating point numbers are allowed, if an
anteger does not fit Emacs's integer range.
(Synchronous Methods): Remove obsolete dbus-call-method-non-blocking.
(Asynchronous Methods): Fix description of
dbus-call-method-asynchronously.
(Receiving Method Calls): Fix some minor errors. Add
dbus-interface-emacs.
(Signals): Describe unicast signals and the new match rules.
(Alternative Buses): Add the PRIVATE optional argument to
dbus-init-bus. Describe its new return value. Add dbus-setenv.
2012-04-22 14:11:43 +00:00
|
|
|
dbus_validate_bus_name \
|
|
|
|
dbus_validate_path \
|
|
|
|
dbus_validate_interface \
|
|
|
|
dbus_validate_member)
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
LIBS=$OLD_LIBS
|
2010-12-03 14:45:09 +00:00
|
|
|
DBUS_OBJ=dbusbind.o
|
|
|
|
fi
|
|
|
|
fi
|
2014-05-02 23:18:11 +00:00
|
|
|
AC_SUBST(DBUS_CFLAGS)
|
|
|
|
AC_SUBST(DBUS_LIBS)
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_SUBST(DBUS_OBJ)
|
|
|
|
|
2011-06-30 14:00:26 +00:00
|
|
|
dnl GSettings has been tested under GNU/Linux only.
|
|
|
|
HAVE_GSETTINGS=no
|
|
|
|
if test "${HAVE_X11}" = "yes" && test "${with_gsettings}" = "yes"; then
|
2014-05-03 08:12:06 +00:00
|
|
|
EMACS_CHECK_MODULES([GSETTINGS], [gio-2.0 >= 2.26])
|
2011-06-30 14:32:07 +00:00
|
|
|
if test "$HAVE_GSETTINGS" = "yes"; then
|
2014-03-31 05:02:08 +00:00
|
|
|
old_CFLAGS=$CFLAGS
|
|
|
|
CFLAGS="$CFLAGS $GSETTINGS_CFLAGS"
|
|
|
|
old_LIBS=$LIBS
|
|
|
|
LIBS="$LIBS $GSETTINGS_LIBS"
|
2014-03-29 12:08:47 +00:00
|
|
|
AC_MSG_CHECKING([whether GSettings is in gio])
|
|
|
|
AC_LINK_IFELSE(
|
|
|
|
[AC_LANG_PROGRAM(
|
|
|
|
[[/* Check that gsettings really is present. */
|
|
|
|
#include <glib-object.h>
|
|
|
|
#include <gio/gio.h>
|
|
|
|
]],
|
|
|
|
[[
|
|
|
|
GSettings *settings;
|
|
|
|
GVariant *val = g_settings_get_value (settings, "");
|
|
|
|
]])],
|
2014-03-31 16:22:32 +00:00
|
|
|
[], HAVE_GSETTINGS=no)
|
|
|
|
AC_MSG_RESULT([$HAVE_GSETTINGS])
|
2014-03-29 12:08:47 +00:00
|
|
|
|
2014-03-31 16:22:32 +00:00
|
|
|
if test "$HAVE_GSETTINGS" = "yes"; then
|
2014-03-29 12:08:47 +00:00
|
|
|
AC_DEFINE(HAVE_GSETTINGS, 1, [Define to 1 if using GSettings.])
|
|
|
|
SETTINGS_CFLAGS="$GSETTINGS_CFLAGS"
|
|
|
|
SETTINGS_LIBS="$GSETTINGS_LIBS"
|
|
|
|
fi
|
2014-03-31 05:02:08 +00:00
|
|
|
CFLAGS=$old_CFLAGS
|
|
|
|
LIBS=$old_LIBS
|
2011-06-30 14:00:26 +00:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
dnl GConf has been tested under GNU/Linux only.
|
|
|
|
dnl The version is really arbitrary, it is about the same age as Gtk+ 2.6.
|
|
|
|
HAVE_GCONF=no
|
2011-07-05 08:21:38 +00:00
|
|
|
if test "${HAVE_X11}" = "yes" && test "${with_gconf}" = "yes"; then
|
2014-05-03 08:12:06 +00:00
|
|
|
EMACS_CHECK_MODULES([GCONF], [gconf-2.0 >= 2.13])
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "$HAVE_GCONF" = yes; then
|
|
|
|
AC_DEFINE(HAVE_GCONF, 1, [Define to 1 if using GConf.])
|
|
|
|
dnl Newer GConf doesn't link with g_objects, so this is not defined.
|
2011-07-05 08:21:38 +00:00
|
|
|
SETTINGS_CFLAGS="$SETTINGS_CFLAGS $GCONF_CFLAGS"
|
|
|
|
SETTINGS_LIBS="$SETTINGS_LIBS $GCONF_LIBS"
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2011-06-30 14:32:07 +00:00
|
|
|
if test "$HAVE_GSETTINGS" = "yes" || test "$HAVE_GCONF" = "yes"; then
|
2014-05-03 08:12:06 +00:00
|
|
|
EMACS_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.0])
|
2012-09-02 11:13:24 +00:00
|
|
|
if test "$HAVE_GOBJECT" = "yes"; then
|
|
|
|
SETTINGS_CFLAGS="$SETTINGS_CFLAGS $GOBJECT_CFLAGS"
|
|
|
|
SETTINGS_LIBS="$SETTINGS_LIBS $GOBJECT_LIBS"
|
|
|
|
fi
|
2011-06-30 14:00:26 +00:00
|
|
|
SAVE_CFLAGS="$CFLAGS"
|
2011-12-10 12:33:07 +00:00
|
|
|
SAVE_LIBS="$LIBS"
|
2011-06-30 14:00:26 +00:00
|
|
|
CFLAGS="$SETTINGS_CFLAGS $CFLAGS"
|
2011-12-10 12:33:07 +00:00
|
|
|
LIBS="$SETTINGS_LIBS $LIBS"
|
2011-06-30 14:00:26 +00:00
|
|
|
CFLAGS="$SAVE_CFLAGS"
|
2011-12-10 12:33:07 +00:00
|
|
|
LIBS="$SAVE_LIBS"
|
2011-06-30 14:00:26 +00:00
|
|
|
fi
|
|
|
|
AC_SUBST(SETTINGS_CFLAGS)
|
|
|
|
AC_SUBST(SETTINGS_LIBS)
|
|
|
|
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
dnl SELinux is available for GNU/Linux only.
|
|
|
|
HAVE_LIBSELINUX=no
|
|
|
|
LIBSELINUX_LIBS=
|
|
|
|
if test "${with_selinux}" = "yes"; then
|
|
|
|
AC_CHECK_LIB([selinux], [lgetfilecon], HAVE_LIBSELINUX=yes, HAVE_LIBSELINUX=no)
|
|
|
|
if test "$HAVE_LIBSELINUX" = yes; then
|
|
|
|
AC_DEFINE(HAVE_LIBSELINUX, 1, [Define to 1 if using SELinux.])
|
|
|
|
LIBSELINUX_LIBS=-lselinux
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
AC_SUBST(LIBSELINUX_LIBS)
|
|
|
|
|
|
|
|
HAVE_GNUTLS=no
|
2013-10-11 13:47:35 +00:00
|
|
|
HAVE_GNUTLS3=no
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "${with_gnutls}" = "yes" ; then
|
2014-05-03 08:12:06 +00:00
|
|
|
EMACS_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.0.0],
|
|
|
|
[HAVE_GNUTLS3=yes], [HAVE_GNUTLS3=no])
|
2013-10-11 13:47:35 +00:00
|
|
|
if test "${HAVE_GNUTLS3}" = "yes"; then
|
|
|
|
AC_DEFINE(HAVE_GNUTLS3, 1, [Define if using GnuTLS v3.])
|
2013-10-11 18:29:18 +00:00
|
|
|
HAVE_GNUTLS="yes"
|
|
|
|
else
|
2014-05-03 08:12:06 +00:00
|
|
|
EMACS_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.6.6],
|
|
|
|
[HAVE_GNUTLS=yes], [HAVE_GNUTLS=no])
|
2013-10-11 18:29:18 +00:00
|
|
|
fi
|
|
|
|
if test "${HAVE_GNUTLS}" = "yes"; then
|
|
|
|
AC_DEFINE(HAVE_GNUTLS, 1, [Define if using GnuTLS.])
|
2013-10-11 13:47:35 +00:00
|
|
|
fi
|
|
|
|
|
2012-11-23 17:59:10 +00:00
|
|
|
# Windows loads GnuTLS dynamically
|
|
|
|
if test "${opsys}" = "mingw32"; then
|
|
|
|
LIBGNUTLS_LIBS=
|
|
|
|
fi
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
2011-04-25 01:30:05 +00:00
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_SUBST(LIBGNUTLS_LIBS)
|
|
|
|
AC_SUBST(LIBGNUTLS_CFLAGS)
|
|
|
|
|
2013-06-03 13:03:05 +00:00
|
|
|
NOTIFY_OBJ=
|
|
|
|
NOTIFY_SUMMARY=no
|
|
|
|
|
2013-07-12 17:36:42 +00:00
|
|
|
dnl FIXME? Don't auto-detect on NS, but do allow someone to specify
|
|
|
|
dnl a particular library. This doesn't make much sense?
|
|
|
|
if test "${with_ns}" = yes && test ${with_file_notification} = yes; then
|
|
|
|
with_file_notification=no
|
|
|
|
fi
|
|
|
|
|
2013-07-13 00:01:43 +00:00
|
|
|
dnl MS Windows native file monitor is available for mingw32 only.
|
|
|
|
case $with_file_notification,$opsys in
|
|
|
|
w32,* | yes,mingw32)
|
|
|
|
AC_CHECK_HEADER(windows.h)
|
|
|
|
if test "$ac_cv_header_windows_h" = yes ; then
|
|
|
|
AC_DEFINE(HAVE_W32NOTIFY, 1, [Define to 1 to use w32notify.])
|
|
|
|
NOTIFY_OBJ=w32notify.o
|
|
|
|
NOTIFY_SUMMARY="yes (w32)"
|
|
|
|
fi ;;
|
|
|
|
esac
|
2013-06-03 13:03:05 +00:00
|
|
|
|
2013-07-13 00:01:43 +00:00
|
|
|
dnl g_file_monitor exists since glib 2.18. G_FILE_MONITOR_EVENT_MOVED
|
|
|
|
dnl has been added in glib 2.24. It has been tested under
|
|
|
|
dnl GNU/Linux only. We take precedence over inotify, but this makes
|
|
|
|
dnl only sense when glib has been compiled with inotify support. How
|
|
|
|
dnl to check?
|
|
|
|
case $with_file_notification,$NOTIFY_OBJ in
|
|
|
|
gfile, | yes,)
|
2014-05-03 08:12:06 +00:00
|
|
|
EMACS_CHECK_MODULES([GFILENOTIFY], [gio-2.0 >= 2.24])
|
2013-07-13 00:01:43 +00:00
|
|
|
if test "$HAVE_GFILENOTIFY" = "yes"; then
|
|
|
|
AC_DEFINE(HAVE_GFILENOTIFY, 1, [Define to 1 if using GFile.])
|
|
|
|
NOTIFY_OBJ=gfilenotify.o
|
|
|
|
NOTIFY_SUMMARY="yes -lgio (gfile)"
|
|
|
|
fi ;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
dnl inotify is only available on GNU/Linux.
|
|
|
|
case $with_file_notification,$NOTIFY_OBJ in
|
|
|
|
inotify, | yes,)
|
|
|
|
AC_CHECK_HEADER(sys/inotify.h)
|
|
|
|
if test "$ac_cv_header_sys_inotify_h" = yes ; then
|
|
|
|
AC_CHECK_FUNC(inotify_init1)
|
|
|
|
if test "$ac_cv_func_inotify_init1" = yes; then
|
|
|
|
AC_DEFINE(HAVE_INOTIFY, 1, [Define to 1 to use inotify.])
|
|
|
|
NOTIFY_OBJ=inotify.o
|
|
|
|
NOTIFY_SUMMARY="yes -lglibc (inotify)"
|
|
|
|
fi
|
|
|
|
fi ;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
case $with_file_notification,$NOTIFY_OBJ in
|
|
|
|
yes,* | no,* | *,?*) ;;
|
|
|
|
*) AC_MSG_ERROR([File notification `$with_file_notification' requested but requirements not found.]) ;;
|
|
|
|
esac
|
2013-07-12 17:36:42 +00:00
|
|
|
|
2013-06-03 13:03:05 +00:00
|
|
|
if test -n "$NOTIFY_OBJ"; then
|
|
|
|
AC_DEFINE(USE_FILE_NOTIFY, 1, [Define to 1 if using file notifications.])
|
2012-12-10 11:17:21 +00:00
|
|
|
fi
|
2013-06-03 13:03:05 +00:00
|
|
|
AC_SUBST(NOTIFY_OBJ)
|
2013-06-03 19:06:09 +00:00
|
|
|
AC_SUBST(GFILENOTIFY_CFLAGS)
|
|
|
|
AC_SUBST(GFILENOTIFY_LIBS)
|
2012-12-10 11:17:21 +00:00
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
dnl Do not put whitespace before the #include statements below.
|
|
|
|
dnl Older compilers (eg sunos4 cc) choke on it.
|
|
|
|
HAVE_XAW3D=no
|
|
|
|
LUCID_LIBW=
|
|
|
|
if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
|
|
|
|
if test "$with_xaw3d" != no; then
|
|
|
|
AC_CACHE_VAL(emacs_cv_xaw3d,
|
2011-03-26 19:29:10 +00:00
|
|
|
[AC_LINK_IFELSE([AC_LANG_PROGRAM([[
|
2010-12-03 14:45:09 +00:00
|
|
|
#include <X11/Intrinsic.h>
|
2011-03-26 19:29:10 +00:00
|
|
|
#include <X11/Xaw3d/Simple.h>]],
|
|
|
|
[[]])],
|
2011-01-27 20:49:48 +00:00
|
|
|
[AC_CHECK_LIB(Xaw3d, XawScrollbarSetThumb,
|
|
|
|
emacs_cv_xaw3d=yes, emacs_cv_xaw3d=no)],
|
2010-12-03 14:45:09 +00:00
|
|
|
emacs_cv_xaw3d=no)])
|
|
|
|
else
|
|
|
|
emacs_cv_xaw3d=no
|
|
|
|
fi
|
|
|
|
if test $emacs_cv_xaw3d = yes; then
|
2012-09-13 06:27:21 +00:00
|
|
|
AC_MSG_CHECKING(for xaw3d)
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_MSG_RESULT([yes; using Lucid toolkit])
|
|
|
|
USE_X_TOOLKIT=LUCID
|
|
|
|
HAVE_XAW3D=yes
|
|
|
|
LUCID_LIBW=-lXaw3d
|
|
|
|
AC_DEFINE(HAVE_XAW3D, 1,
|
|
|
|
[Define to 1 if you have the Xaw3d library (-lXaw3d).])
|
|
|
|
else
|
2012-09-13 06:27:21 +00:00
|
|
|
AC_MSG_CHECKING(for xaw3d)
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
AC_MSG_CHECKING(for libXaw)
|
|
|
|
AC_CACHE_VAL(emacs_cv_xaw,
|
2011-03-26 19:29:10 +00:00
|
|
|
[AC_LINK_IFELSE([AC_LANG_PROGRAM([[
|
2010-12-03 14:45:09 +00:00
|
|
|
#include <X11/Intrinsic.h>
|
2011-03-26 19:29:10 +00:00
|
|
|
#include <X11/Xaw/Simple.h>]],
|
|
|
|
[[]])],
|
2010-12-03 14:45:09 +00:00
|
|
|
emacs_cv_xaw=yes,
|
|
|
|
emacs_cv_xaw=no)])
|
|
|
|
if test $emacs_cv_xaw = yes; then
|
|
|
|
AC_MSG_RESULT([yes; using Lucid toolkit])
|
|
|
|
USE_X_TOOLKIT=LUCID
|
|
|
|
LUCID_LIBW=-lXaw
|
|
|
|
elif test x"${USE_X_TOOLKIT}" = xLUCID; then
|
|
|
|
AC_MSG_ERROR([Lucid toolkit requires X11/Xaw include files])
|
|
|
|
else
|
2011-05-14 19:52:13 +00:00
|
|
|
AC_MSG_ERROR([No X toolkit could be found.
|
|
|
|
If you are sure you want Emacs compiled without an X toolkit, pass
|
|
|
|
--with-x-toolkit=no
|
|
|
|
to configure. Otherwise, install the development libraries for the toolkit
|
|
|
|
that you want to use (e.g. Gtk+) and re-run configure.])
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
X_TOOLKIT_TYPE=$USE_X_TOOLKIT
|
|
|
|
|
|
|
|
LIBXTR6=
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
LIBXMU=
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "${USE_X_TOOLKIT}" != "none"; then
|
|
|
|
AC_MSG_CHECKING(X11 toolkit version)
|
|
|
|
AC_CACHE_VAL(emacs_cv_x11_toolkit_version_6,
|
2011-03-26 19:29:10 +00:00
|
|
|
[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <X11/Intrinsic.h>]],
|
|
|
|
[[#if XtSpecificationRelease < 6
|
2010-12-03 14:45:09 +00:00
|
|
|
fail;
|
|
|
|
#endif
|
2011-03-26 19:29:10 +00:00
|
|
|
]])], emacs_cv_x11_toolkit_version_6=yes, emacs_cv_x11_toolkit_version_6=no)])
|
2010-12-03 14:45:09 +00:00
|
|
|
HAVE_X11XTR6=$emacs_cv_x11_toolkit_version_6
|
|
|
|
if test $emacs_cv_x11_toolkit_version_6 = yes; then
|
|
|
|
AC_MSG_RESULT(6 or newer)
|
|
|
|
AC_DEFINE(HAVE_X11XTR6, 1,
|
|
|
|
[Define to 1 if you have the X11R6 or newer version of Xt.])
|
|
|
|
LIBXTR6="-lSM -lICE"
|
|
|
|
case "$opsys" in
|
|
|
|
## Use libw.a along with X11R6 Xt.
|
|
|
|
unixware) LIBXTR6="$LIBXTR6 -lw" ;;
|
|
|
|
esac
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(before 6)
|
|
|
|
fi
|
|
|
|
|
|
|
|
dnl If using toolkit, check whether libXmu.a exists.
|
|
|
|
dnl tranle@intellicorp.com says libXmu.a can need XtMalloc in libXt.a to link.
|
|
|
|
OLDLIBS="$LIBS"
|
|
|
|
if test x$HAVE_X11XTR6 = xyes; then
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
OTHERLIBS='-lXt -lSM -lICE'
|
2010-12-03 14:45:09 +00:00
|
|
|
else
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
OTHERLIBS='-lXt'
|
|
|
|
fi
|
|
|
|
AC_SEARCH_LIBS([XmuConvertStandardSelection], [Xmu], [], [], [$OTHERLIBS])
|
|
|
|
if test "X$LIBS" != "X$OLDLIBS"; then
|
|
|
|
LIBXMU=$ac_cv_search_XmuConvertStandardSelection
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
LIBS=$OLDLIBS
|
|
|
|
dnl ac_cv_search_XmuConvertStandardSelection is also referenced below.
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
AC_SUBST(LIBXTR6)
|
|
|
|
AC_SUBST(LIBXMU)
|
|
|
|
|
|
|
|
LIBXP=
|
|
|
|
if test "${USE_X_TOOLKIT}" = "MOTIF"; then
|
2012-07-31 11:37:38 +00:00
|
|
|
# OpenMotif may be installed in such a way on some GNU/Linux systems.
|
|
|
|
if test -d /usr/include/openmotif; then
|
|
|
|
CPPFLAGS="-I/usr/include/openmotif $CPPFLAGS"
|
|
|
|
emacs_cv_openmotif=yes
|
|
|
|
case "$canonical" in
|
|
|
|
x86_64-*-linux-gnu* | powerpc64-*-linux-gnu* | sparc64-*-linux-gnu*)
|
|
|
|
test -d /usr/lib64/openmotif && LDFLAGS="-L/usr/lib64/openmotif $LDFLAGS"
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
test -d /usr/lib/openmotif && LDFLAGS="-L/usr/lib/openmotif $LDFLAGS"
|
|
|
|
esac
|
|
|
|
else
|
|
|
|
emacs_cv_openmotif=no
|
|
|
|
fi
|
|
|
|
AC_CACHE_CHECK(for (Open)Motif version 2.1, emacs_cv_motif_version_2_1,
|
2011-03-26 19:29:10 +00:00
|
|
|
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <Xm/Xm.h>]],
|
|
|
|
[[#if XmVERSION > 2 || (XmVERSION == 2 && XmREVISION >= 1)
|
2010-12-03 14:45:09 +00:00
|
|
|
int x = 5;
|
|
|
|
#else
|
|
|
|
Motif version prior to 2.1.
|
2011-03-26 19:29:10 +00:00
|
|
|
#endif]])],
|
2010-12-03 14:45:09 +00:00
|
|
|
emacs_cv_motif_version_2_1=yes, emacs_cv_motif_version_2_1=no)])
|
|
|
|
if test $emacs_cv_motif_version_2_1 = yes; then
|
|
|
|
AC_CHECK_LIB(Xp, XpCreateContext, LIBXP=-lXp)
|
2012-07-31 11:37:38 +00:00
|
|
|
if test x$emacs_cv_openmotif = xyes; then
|
|
|
|
REAL_CPPFLAGS="-I/usr/include/openmotif $REAL_CPPFLAGS"
|
|
|
|
fi
|
2010-12-03 14:45:09 +00:00
|
|
|
else
|
|
|
|
AC_CACHE_CHECK(for LessTif where some systems put it, emacs_cv_lesstif,
|
|
|
|
# We put this in CFLAGS temporarily to precede other -I options
|
|
|
|
# that might be in CFLAGS temporarily.
|
|
|
|
# We put this in CPPFLAGS where it precedes the other -I options.
|
|
|
|
OLD_CPPFLAGS=$CPPFLAGS
|
|
|
|
OLD_CFLAGS=$CFLAGS
|
|
|
|
CPPFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CPPFLAGS"
|
|
|
|
CFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $CFLAGS"
|
2011-03-26 19:29:10 +00:00
|
|
|
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include </usr/X11R6/LessTif/Motif1.2/include/Xm/Xm.h>]],
|
|
|
|
[[int x = 5;]])],
|
2010-12-03 14:45:09 +00:00
|
|
|
emacs_cv_lesstif=yes, emacs_cv_lesstif=no)])
|
|
|
|
if test $emacs_cv_lesstif = yes; then
|
|
|
|
# Make sure this -I option remains in CPPFLAGS after it is set
|
|
|
|
# back to REAL_CPPFLAGS.
|
|
|
|
# There is no need to change REAL_CFLAGS, because REAL_CFLAGS does not
|
|
|
|
# have those other -I options anyway. Ultimately, having this
|
|
|
|
# directory ultimately in CPPFLAGS will be enough.
|
|
|
|
REAL_CPPFLAGS="-I/usr/X11R6/LessTif/Motif1.2/include $REAL_CPPFLAGS"
|
|
|
|
LDFLAGS="-L/usr/X11R6/LessTif/Motif1.2/lib $LDFLAGS"
|
|
|
|
else
|
|
|
|
CFLAGS=$OLD_CFLAGS
|
|
|
|
CPPFLAGS=$OLD_CPPFLAGS
|
|
|
|
fi
|
|
|
|
fi
|
2012-01-31 03:47:51 +00:00
|
|
|
AC_CHECK_HEADER([Xm/BulletinB.h], [],
|
|
|
|
[AC_MSG_ERROR([Motif toolkit requested but requirements not found.])])
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
dnl Use toolkit scroll bars if configured for GTK or X toolkit and either
|
|
|
|
dnl using Motif or Xaw3d is available, and unless
|
|
|
|
dnl --with-toolkit-scroll-bars=no was specified.
|
|
|
|
|
|
|
|
AH_TEMPLATE(USE_TOOLKIT_SCROLL_BARS,
|
|
|
|
[Define to 1 if we should use toolkit scroll bars.])dnl
|
|
|
|
USE_TOOLKIT_SCROLL_BARS=no
|
|
|
|
if test "${with_toolkit_scroll_bars}" != "no"; then
|
|
|
|
if test "${USE_X_TOOLKIT}" != "none"; then
|
|
|
|
if test "${USE_X_TOOLKIT}" = "MOTIF"; then
|
|
|
|
AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
|
|
|
|
HAVE_XAW3D=no
|
|
|
|
USE_TOOLKIT_SCROLL_BARS=yes
|
2012-01-31 02:43:59 +00:00
|
|
|
elif test "${HAVE_XAW3D}" = "yes" || test "${USE_X_TOOLKIT}" = "LUCID"; then
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
|
|
|
|
USE_TOOLKIT_SCROLL_BARS=yes
|
|
|
|
fi
|
|
|
|
elif test "${HAVE_GTK}" = "yes"; then
|
|
|
|
AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
|
|
|
|
USE_TOOLKIT_SCROLL_BARS=yes
|
|
|
|
elif test "${HAVE_NS}" = "yes"; then
|
|
|
|
AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
|
|
|
|
USE_TOOLKIT_SCROLL_BARS=yes
|
2012-09-17 11:55:02 +00:00
|
|
|
elif test "${HAVE_W32}" = "yes"; then
|
|
|
|
AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
|
|
|
|
USE_TOOLKIT_SCROLL_BARS=yes
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
dnl See if XIM is available.
|
2011-03-26 19:29:10 +00:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
2010-12-03 14:45:09 +00:00
|
|
|
#include <X11/Xlib.h>
|
2011-03-26 19:29:10 +00:00
|
|
|
#include <X11/Xresource.h>]],
|
|
|
|
[[XIMProc callback;]])],
|
2010-12-03 14:45:09 +00:00
|
|
|
[HAVE_XIM=yes
|
|
|
|
AC_DEFINE(HAVE_XIM, 1, [Define to 1 if XIM is available])],
|
|
|
|
HAVE_XIM=no)
|
|
|
|
|
|
|
|
dnl `--with-xim' now controls only the initial value of use_xim at run time.
|
|
|
|
|
|
|
|
if test "${with_xim}" != "no"; then
|
|
|
|
AC_DEFINE(USE_XIM, 1,
|
|
|
|
[Define to 1 if we should use XIM, if it is available.])
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
if test "${HAVE_XIM}" != "no"; then
|
|
|
|
late_CFLAGS=$CFLAGS
|
|
|
|
if test "$GCC" = yes; then
|
|
|
|
CFLAGS="$CFLAGS --pedantic-errors"
|
|
|
|
fi
|
2011-03-26 19:29:10 +00:00
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
2010-12-03 14:45:09 +00:00
|
|
|
#include <X11/Xlib.h>
|
2011-03-26 19:29:10 +00:00
|
|
|
#include <X11/Xresource.h>]],
|
|
|
|
[[Display *display;
|
2010-12-03 14:45:09 +00:00
|
|
|
XrmDatabase db;
|
|
|
|
char *res_name;
|
|
|
|
char *res_class;
|
|
|
|
XIMProc callback;
|
|
|
|
XPointer *client_data;
|
|
|
|
#ifndef __GNUC__
|
|
|
|
/* If we're not using GCC, it's probably not XFree86, and this is
|
|
|
|
probably right, but we can't use something like --pedantic-errors. */
|
|
|
|
extern Bool XRegisterIMInstantiateCallback(Display*, XrmDatabase, char*,
|
|
|
|
char*, XIMProc, XPointer*);
|
|
|
|
#endif
|
|
|
|
(void)XRegisterIMInstantiateCallback(display, db, res_name, res_class, callback,
|
2011-03-26 19:29:10 +00:00
|
|
|
client_data);]])],
|
2010-12-03 14:45:09 +00:00
|
|
|
[emacs_cv_arg6_star=yes])
|
|
|
|
AH_TEMPLATE(XRegisterIMInstantiateCallback_arg6,
|
|
|
|
[Define to the type of the 6th arg of XRegisterIMInstantiateCallback,
|
|
|
|
either XPointer or XPointer*.])dnl
|
|
|
|
if test "$emacs_cv_arg6_star" = yes; then
|
|
|
|
AC_DEFINE(XRegisterIMInstantiateCallback_arg6, [XPointer*])
|
|
|
|
else
|
|
|
|
AC_DEFINE(XRegisterIMInstantiateCallback_arg6, [XPointer])
|
|
|
|
fi
|
|
|
|
CFLAGS=$late_CFLAGS
|
|
|
|
fi
|
|
|
|
|
|
|
|
### Start of font-backend (under any platform) section.
|
|
|
|
# (nothing here yet -- this is a placeholder)
|
|
|
|
### End of font-backend (under any platform) section.
|
|
|
|
|
|
|
|
### Start of font-backend (under X11) section.
|
|
|
|
if test "${HAVE_X11}" = "yes"; then
|
2014-06-05 00:34:34 +00:00
|
|
|
## Use -lXft if available, unless `--with-xft=no'.
|
|
|
|
HAVE_XFT=maybe
|
|
|
|
if test "x${with_x}" = "xno"; then
|
2010-12-03 14:45:09 +00:00
|
|
|
with_xft="no";
|
|
|
|
fi
|
2014-06-05 00:34:34 +00:00
|
|
|
|
|
|
|
if test "$with_xft" != no; then
|
|
|
|
EMACS_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.2.0])
|
|
|
|
with_xft=$HAVE_FONTCONFIG
|
|
|
|
fi
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "x${with_xft}" != "xno"; then
|
|
|
|
|
2014-05-03 08:12:06 +00:00
|
|
|
EMACS_CHECK_MODULES([XFT], [xft >= 0.13.0], [], [HAVE_XFT=no])
|
2010-12-03 14:45:09 +00:00
|
|
|
## Because xftfont.c uses XRenderQueryExtension, we also
|
|
|
|
## need to link to -lXrender.
|
|
|
|
HAVE_XRENDER=no
|
|
|
|
AC_CHECK_LIB(Xrender, XRenderQueryExtension, HAVE_XRENDER=yes)
|
|
|
|
if test "$HAVE_XFT" != no && test "$HAVE_XRENDER" != no; then
|
|
|
|
OLD_CPPFLAGS="$CPPFLAGS"
|
|
|
|
OLD_CFLAGS="$CFLAGS"
|
|
|
|
OLD_LIBS="$LIBS"
|
|
|
|
CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
|
|
|
|
CFLAGS="$CFLAGS $XFT_CFLAGS"
|
|
|
|
XFT_LIBS="-lXrender $XFT_LIBS"
|
|
|
|
LIBS="$XFT_LIBS $LIBS"
|
|
|
|
AC_CHECK_HEADER(X11/Xft/Xft.h,
|
2013-06-22 00:28:07 +00:00
|
|
|
AC_CHECK_LIB(Xft, XftFontOpen, HAVE_XFT=yes, , $XFT_LIBS) , ,
|
|
|
|
[[#include <X11/X.h>]])
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
if test "${HAVE_XFT}" = "yes"; then
|
|
|
|
AC_DEFINE(HAVE_XFT, 1, [Define to 1 if you have the Xft library.])
|
|
|
|
AC_SUBST(XFT_LIBS)
|
|
|
|
C_SWITCH_X_SITE="$C_SWITCH_X_SITE $XFT_CFLAGS"
|
|
|
|
fi # "${HAVE_XFT}" = "yes"
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
CPPFLAGS=$OLD_CPPFLAGS
|
|
|
|
CFLAGS=$OLD_CFLAGS
|
|
|
|
LIBS=$OLD_LIBS
|
2010-12-03 14:45:09 +00:00
|
|
|
fi # "$HAVE_XFT" != no
|
|
|
|
fi # "x${with_xft}" != "xno"
|
|
|
|
|
2011-03-06 01:42:13 +00:00
|
|
|
## We used to allow building with FreeType and without Xft.
|
|
|
|
## However, the ftx font backend driver is not in good shape.
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "$HAVE_XFT" != "yes"; then
|
2011-03-06 01:42:13 +00:00
|
|
|
dnl For the "Does Emacs use" message at the end.
|
2010-12-03 14:45:09 +00:00
|
|
|
HAVE_XFT=no
|
2011-03-06 01:42:13 +00:00
|
|
|
HAVE_FREETYPE=no
|
|
|
|
else
|
|
|
|
dnl Strict linkers fail with
|
|
|
|
dnl ftfont.o: undefined reference to symbol 'FT_New_Face'
|
|
|
|
dnl if -lfreetype is not specified.
|
|
|
|
dnl The following is needed to set FREETYPE_LIBS.
|
2014-05-03 08:12:06 +00:00
|
|
|
EMACS_CHECK_MODULES([FREETYPE], [freetype2])
|
2011-03-06 01:42:13 +00:00
|
|
|
|
|
|
|
test "$HAVE_FREETYPE" = "no" && AC_MSG_ERROR(libxft requires libfreetype)
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
HAVE_LIBOTF=no
|
|
|
|
if test "${HAVE_FREETYPE}" = "yes"; then
|
|
|
|
AC_DEFINE(HAVE_FREETYPE, 1,
|
|
|
|
[Define to 1 if using the freetype and fontconfig libraries.])
|
|
|
|
if test "${with_libotf}" != "no"; then
|
2014-05-03 08:12:06 +00:00
|
|
|
EMACS_CHECK_MODULES([LIBOTF], [libotf])
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "$HAVE_LIBOTF" = "yes"; then
|
|
|
|
AC_DEFINE(HAVE_LIBOTF, 1, [Define to 1 if using libotf.])
|
|
|
|
AC_CHECK_LIB(otf, OTF_get_variation_glyphs,
|
|
|
|
HAVE_OTF_GET_VARIATION_GLYPHS=yes,
|
|
|
|
HAVE_OTF_GET_VARIATION_GLYPHS=no)
|
|
|
|
if test "${HAVE_OTF_GET_VARIATION_GLYPHS}" = "yes"; then
|
|
|
|
AC_DEFINE(HAVE_OTF_GET_VARIATION_GLYPHS, 1,
|
|
|
|
[Define to 1 if libotf has OTF_get_variation_glyphs.])
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
dnl FIXME should there be an error if HAVE_FREETYPE != yes?
|
|
|
|
dnl Does the new font backend require it, or can it work without it?
|
|
|
|
fi
|
|
|
|
|
|
|
|
HAVE_M17N_FLT=no
|
|
|
|
if test "${HAVE_LIBOTF}" = yes; then
|
|
|
|
if test "${with_m17n_flt}" != "no"; then
|
2014-05-03 08:12:06 +00:00
|
|
|
EMACS_CHECK_MODULES([M17N_FLT], [m17n-flt])
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "$HAVE_M17N_FLT" = "yes"; then
|
|
|
|
AC_DEFINE(HAVE_M17N_FLT, 1, [Define to 1 if using libm17n-flt.])
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
HAVE_XFT=no
|
|
|
|
HAVE_FREETYPE=no
|
|
|
|
HAVE_LIBOTF=no
|
|
|
|
HAVE_M17N_FLT=no
|
|
|
|
fi
|
|
|
|
|
|
|
|
### End of font-backend (under X11) section.
|
|
|
|
|
|
|
|
AC_SUBST(FREETYPE_CFLAGS)
|
|
|
|
AC_SUBST(FREETYPE_LIBS)
|
|
|
|
AC_SUBST(FONTCONFIG_CFLAGS)
|
|
|
|
AC_SUBST(FONTCONFIG_LIBS)
|
|
|
|
AC_SUBST(LIBOTF_CFLAGS)
|
|
|
|
AC_SUBST(LIBOTF_LIBS)
|
|
|
|
AC_SUBST(M17N_FLT_CFLAGS)
|
|
|
|
AC_SUBST(M17N_FLT_LIBS)
|
|
|
|
|
|
|
|
### Use -lXpm if available, unless `--with-xpm=no'.
|
2012-11-23 15:22:47 +00:00
|
|
|
### mingw32 doesn't use -lXpm, since it loads the library dynamically.
|
2014-08-21 21:52:26 +00:00
|
|
|
### In the Cygwin-w32 build, we need to use /usr/include/noX/X11/xpm.h
|
|
|
|
### rather than /usr/include/X11/xpm.h, so we set CPPFLAGS (and
|
|
|
|
### LDFLAGS) accordingly.
|
2010-12-03 14:45:09 +00:00
|
|
|
HAVE_XPM=no
|
|
|
|
LIBXPM=
|
2012-11-23 15:22:47 +00:00
|
|
|
if test "${HAVE_W32}" = "yes" && test "${opsys}" = "cygwin"; then
|
2012-09-17 11:55:02 +00:00
|
|
|
if test "${with_xpm}" != "no"; then
|
|
|
|
SAVE_CPPFLAGS="$CPPFLAGS"
|
|
|
|
SAVE_LDFLAGS="$LDFLAGS"
|
|
|
|
CPPFLAGS="$CPPFLAGS -I/usr/include/noX"
|
|
|
|
LDFLAGS="$LDFLAGS -L/usr/lib/noX"
|
|
|
|
AC_CHECK_HEADER(X11/xpm.h,
|
|
|
|
[AC_CHECK_LIB(Xpm, XpmReadFileToImage, HAVE_XPM=yes)])
|
|
|
|
if test "${HAVE_XPM}" = "yes"; then
|
|
|
|
AC_MSG_CHECKING(for XpmReturnAllocPixels preprocessor define)
|
|
|
|
AC_EGREP_CPP(no_return_alloc_pixels,
|
|
|
|
[#include "X11/xpm.h"
|
|
|
|
#ifndef XpmReturnAllocPixels
|
|
|
|
no_return_alloc_pixels
|
|
|
|
#endif
|
|
|
|
], HAVE_XPM=no, HAVE_XPM=yes)
|
|
|
|
|
|
|
|
if test "${HAVE_XPM}" = "yes"; then
|
|
|
|
REAL_CPPFLAGS="$REAL_CPPFLAGS -I/usr/include/noX"
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
CPPFLAGS="$SAVE_CPPFLAGS"
|
|
|
|
LDFLAGS="$SAVE_LDFLAGS"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test "${HAVE_XPM}" = "yes"; then
|
2012-10-21 07:23:34 +00:00
|
|
|
AC_DEFINE(HAVE_XPM, 1, [Define to 1 if you have the Xpm library (-lXpm).])
|
2012-09-17 11:55:02 +00:00
|
|
|
LIBXPM=-lXpm
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "${HAVE_X11}" = "yes"; then
|
2014-06-07 06:10:39 +00:00
|
|
|
dnl Avoid Xpm on AIX unless requested, as it crashes; see Bug#17598.
|
|
|
|
test "$opsys$with_xpm_set" = aix4-2 && with_xpm=no
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "${with_xpm}" != "no"; then
|
|
|
|
AC_CHECK_HEADER(X11/xpm.h,
|
|
|
|
[AC_CHECK_LIB(Xpm, XpmReadFileToPixmap, HAVE_XPM=yes, , -lX11)])
|
|
|
|
if test "${HAVE_XPM}" = "yes"; then
|
|
|
|
AC_MSG_CHECKING(for XpmReturnAllocPixels preprocessor define)
|
|
|
|
AC_EGREP_CPP(no_return_alloc_pixels,
|
|
|
|
[#include "X11/xpm.h"
|
|
|
|
#ifndef XpmReturnAllocPixels
|
|
|
|
no_return_alloc_pixels
|
|
|
|
#endif
|
|
|
|
], HAVE_XPM=no, HAVE_XPM=yes)
|
|
|
|
|
|
|
|
if test "${HAVE_XPM}" = "yes"; then
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test "${HAVE_XPM}" = "yes"; then
|
2011-11-24 01:58:14 +00:00
|
|
|
AC_DEFINE(HAVE_XPM, 1, [Define to 1 if you have the Xpm library (-lXpm).])
|
2010-12-03 14:45:09 +00:00
|
|
|
LIBXPM=-lXpm
|
2014-06-07 06:10:39 +00:00
|
|
|
elif test "$opsys,$LUCID_LIBW" = aix4-2,-lXaw; then
|
|
|
|
dnl AIX -lXaw needs -lXpm linked too; see Bug#17598 Message#152.
|
|
|
|
LIBXPM=-lXpm
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
fi
|
2012-09-17 11:55:02 +00:00
|
|
|
|
2013-04-18 18:02:48 +00:00
|
|
|
### FIXME: Perhaps regroup to minimize code duplication due to MinGW's
|
|
|
|
### slightly different requirements wrt image libraries (it doesn't
|
|
|
|
### use -lXpm because it loads the xpm shared library dynamically at
|
|
|
|
### run time).
|
2012-11-23 15:22:47 +00:00
|
|
|
if test "${opsys}" = "mingw32"; then
|
|
|
|
if test "${with_xpm}" != "no"; then
|
2012-11-24 12:39:36 +00:00
|
|
|
AC_CHECK_HEADER(X11/xpm.h, HAVE_XPM=yes, HAVE_XPM=no, [
|
2012-11-23 15:22:47 +00:00
|
|
|
#define FOR_MSW 1])
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test "${HAVE_XPM}" = "yes"; then
|
|
|
|
AC_DEFINE(HAVE_XPM, 1, [Define to 1 if you have the Xpm library (-lXpm).])
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_SUBST(LIBXPM)
|
|
|
|
|
|
|
|
### Use -ljpeg if available, unless `--with-jpeg=no'.
|
2012-11-23 15:22:47 +00:00
|
|
|
### mingw32 doesn't use -ljpeg, since it loads the library dynamically.
|
2010-12-03 14:45:09 +00:00
|
|
|
HAVE_JPEG=no
|
|
|
|
LIBJPEG=
|
2012-11-23 15:22:47 +00:00
|
|
|
if test "${opsys}" = "mingw32"; then
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "${with_jpeg}" != "no"; then
|
|
|
|
dnl Checking for jpeglib.h can lose because of a redefinition of
|
2012-11-23 15:22:47 +00:00
|
|
|
dnl HAVE_STDLIB_H.
|
|
|
|
AC_CHECK_HEADER(jerror.h, HAVE_JPEG=yes, HAVE_JPEG=no)
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
AH_TEMPLATE(HAVE_JPEG, [Define to 1 if you have the jpeg library (-ljpeg).])dnl
|
|
|
|
if test "${HAVE_JPEG}" = "yes"; then
|
|
|
|
AC_DEFINE(HAVE_JPEG)
|
|
|
|
AC_EGREP_CPP([version= *(6[2-9]|[7-9][0-9])],
|
|
|
|
[#include <jpeglib.h>
|
|
|
|
version=JPEG_LIB_VERSION
|
|
|
|
],
|
|
|
|
[AC_DEFINE(HAVE_JPEG)],
|
|
|
|
[AC_MSG_WARN([libjpeg found, but not version 6b or later])
|
|
|
|
HAVE_JPEG=no])
|
|
|
|
fi
|
2012-11-23 15:22:47 +00:00
|
|
|
elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then
|
|
|
|
if test "${with_jpeg}" != "no"; then
|
|
|
|
dnl Checking for jpeglib.h can lose because of a redefinition of
|
|
|
|
dnl HAVE_STDLIB_H.
|
|
|
|
AC_CHECK_HEADER(jerror.h,
|
|
|
|
[AC_CHECK_LIB(jpeg, jpeg_destroy_compress, HAVE_JPEG=yes)])
|
|
|
|
fi
|
|
|
|
|
|
|
|
AH_TEMPLATE(HAVE_JPEG, [Define to 1 if you have the jpeg library (-ljpeg).])dnl
|
|
|
|
if test "${HAVE_JPEG}" = "yes"; then
|
|
|
|
AC_DEFINE(HAVE_JPEG)
|
|
|
|
AC_EGREP_CPP([version= *(6[2-9]|[7-9][0-9])],
|
|
|
|
[#include <jpeglib.h>
|
|
|
|
version=JPEG_LIB_VERSION
|
|
|
|
],
|
|
|
|
[AC_DEFINE(HAVE_JPEG)],
|
|
|
|
[AC_MSG_WARN([libjpeg found, but not version 6b or later])
|
|
|
|
HAVE_JPEG=no])
|
|
|
|
fi
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "${HAVE_JPEG}" = "yes"; then
|
|
|
|
LIBJPEG=-ljpeg
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
AC_SUBST(LIBJPEG)
|
|
|
|
|
2013-08-11 19:43:36 +00:00
|
|
|
HAVE_ZLIB=no
|
|
|
|
LIBZ=
|
2013-08-11 22:58:47 +00:00
|
|
|
if test "${with_zlib}" != "no"; then
|
2013-08-12 16:05:58 +00:00
|
|
|
OLIBS=$LIBS
|
|
|
|
AC_SEARCH_LIBS([inflateEnd], [z], [HAVE_ZLIB=yes])
|
|
|
|
LIBS=$OLIBS
|
|
|
|
case $ac_cv_search_inflateEnd in
|
|
|
|
-*) LIBZ=$ac_cv_search_inflateEnd ;;
|
|
|
|
esac
|
2013-08-11 19:43:36 +00:00
|
|
|
fi
|
2013-08-11 22:58:47 +00:00
|
|
|
if test "${HAVE_ZLIB}" = "yes"; then
|
|
|
|
AC_DEFINE([HAVE_ZLIB], 1, [Define to 1 if you have the zlib library (-lz).])
|
2013-08-12 19:48:04 +00:00
|
|
|
### mingw32 doesn't use -lz, since it loads the library dynamically.
|
|
|
|
if test "${opsys}" = "mingw32"; then
|
|
|
|
LIBZ=
|
|
|
|
fi
|
2013-08-11 22:58:47 +00:00
|
|
|
fi
|
2013-08-11 19:43:36 +00:00
|
|
|
AC_SUBST(LIBZ)
|
|
|
|
|
2014-05-04 21:28:08 +00:00
|
|
|
### Use -lpng if available, unless `--with-png=no'.
|
|
|
|
HAVE_PNG=no
|
|
|
|
LIBPNG=
|
|
|
|
PNG_CFLAGS=
|
2014-05-15 16:54:44 +00:00
|
|
|
if test "${NS_IMPL_COCOA}" = yes; then
|
|
|
|
: # Nothing to do
|
|
|
|
elif test "${with_png}" != no; then
|
2014-05-04 21:28:08 +00:00
|
|
|
# mingw32 loads the library dynamically.
|
|
|
|
if test "$opsys" = mingw32; then
|
|
|
|
AC_CHECK_HEADER([png.h], [HAVE_PNG=yes])
|
2014-05-18 23:02:29 +00:00
|
|
|
elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then
|
2014-05-18 05:50:17 +00:00
|
|
|
AC_MSG_CHECKING([for png])
|
|
|
|
png_cflags=`(libpng-config --cflags) 2>&AS_MESSAGE_LOG_FD` &&
|
|
|
|
png_libs=`(libpng-config --libs) 2>&AS_MESSAGE_LOG_FD` || {
|
|
|
|
# libpng-config does not work; configure by hand.
|
|
|
|
# Debian unstable as of July 2003 has multiple libpngs, and puts png.h
|
|
|
|
# in /usr/include/libpng.
|
|
|
|
if test -r /usr/include/libpng/png.h &&
|
|
|
|
test ! -r /usr/include/png.h; then
|
|
|
|
png_cflags=-I/usr/include/libpng
|
|
|
|
else
|
|
|
|
png_cflags=
|
|
|
|
fi
|
|
|
|
png_libs='-lpng'
|
|
|
|
}
|
|
|
|
SAVE_CFLAGS=$CFLAGS
|
|
|
|
SAVE_LIBS=$LIBS
|
|
|
|
CFLAGS="$CFLAGS $png_cflags"
|
|
|
|
LIBS="$png_libs -lz -lm $LIBS"
|
|
|
|
AC_LINK_IFELSE(
|
|
|
|
[AC_LANG_PROGRAM([[#include <png.h>]],
|
|
|
|
[[return !png_get_channels (0, 0);]])],
|
|
|
|
[HAVE_PNG=yes
|
|
|
|
PNG_CFLAGS=`AS_ECHO(["$png_cflags"]) | sed -e "$edit_cflags"`
|
|
|
|
LIBPNG=$png_libs
|
|
|
|
# $LIBPNG requires explicit -lz in some cases.
|
|
|
|
# We don't know what those cases are, exactly, so play it safe and
|
|
|
|
# append -lz to any nonempty $LIBPNG, unless we're already using LIBZ.
|
|
|
|
if test -n "$LIBPNG" && test -z "$LIBZ"; then
|
|
|
|
LIBPNG="$LIBPNG -lz"
|
|
|
|
fi])
|
|
|
|
CFLAGS=$SAVE_CFLAGS
|
|
|
|
LIBS=$SAVE_LIBS
|
|
|
|
AC_MSG_RESULT([$HAVE_PNG])
|
2014-05-04 21:28:08 +00:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test $HAVE_PNG = yes; then
|
|
|
|
AC_DEFINE([HAVE_PNG], [1], [Define to 1 if you have the png library.])
|
|
|
|
|
|
|
|
SAVE_CFLAGS=$CFLAGS
|
|
|
|
CFLAGS="$CFLAGS $PNG_CFLAGS"
|
|
|
|
AC_CHECK_DECL([png_longjmp],
|
|
|
|
[],
|
|
|
|
[AC_DEFINE([PNG_DEPSTRUCT], [],
|
|
|
|
[Define to empty to suppress deprecation warnings when building
|
|
|
|
with --enable-gcc-warnings and with libpng versions before 1.5,
|
|
|
|
which lack png_longjmp.])],
|
|
|
|
[[#include <png.h>
|
|
|
|
]])
|
|
|
|
CFLAGS=$SAVE_CFLAGS
|
|
|
|
fi
|
|
|
|
AC_SUBST(LIBPNG)
|
|
|
|
AC_SUBST(PNG_CFLAGS)
|
2013-08-11 19:43:36 +00:00
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
### Use -ltiff if available, unless `--with-tiff=no'.
|
2012-11-23 15:22:47 +00:00
|
|
|
### mingw32 doesn't use -ltiff, since it loads the library dynamically.
|
2010-12-03 14:45:09 +00:00
|
|
|
HAVE_TIFF=no
|
|
|
|
LIBTIFF=
|
2012-11-23 15:22:47 +00:00
|
|
|
if test "${opsys}" = "mingw32"; then
|
|
|
|
if test "${with_tiff}" != "no"; then
|
|
|
|
AC_CHECK_HEADER(tiffio.h, HAVE_TIFF=yes, HAVE_TIFF=no)
|
|
|
|
fi
|
|
|
|
if test "${HAVE_TIFF}" = "yes"; then
|
|
|
|
AC_DEFINE(HAVE_TIFF, 1, [Define to 1 if you have the tiff library (-ltiff).])
|
|
|
|
fi
|
|
|
|
elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "${with_tiff}" != "no"; then
|
|
|
|
AC_CHECK_HEADER(tiffio.h,
|
|
|
|
[tifflibs="-lz -lm"
|
|
|
|
# At least one tiff package requires the jpeg library.
|
|
|
|
if test "${HAVE_JPEG}" = yes; then tifflibs="-ljpeg $tifflibs"; fi
|
|
|
|
AC_CHECK_LIB(tiff, TIFFGetVersion, HAVE_TIFF=yes, , $tifflibs)])
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test "${HAVE_TIFF}" = "yes"; then
|
|
|
|
AC_DEFINE(HAVE_TIFF, 1, [Define to 1 if you have the tiff library (-ltiff).])
|
|
|
|
dnl FIXME -lz -lm, as per libpng?
|
|
|
|
LIBTIFF=-ltiff
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
AC_SUBST(LIBTIFF)
|
|
|
|
|
|
|
|
### Use -lgif or -lungif if available, unless `--with-gif=no'.
|
2012-11-23 15:22:47 +00:00
|
|
|
### mingw32 doesn't use -lgif/-lungif, since it loads the library dynamically.
|
2010-12-03 14:45:09 +00:00
|
|
|
HAVE_GIF=no
|
|
|
|
LIBGIF=
|
2012-11-23 15:22:47 +00:00
|
|
|
if test "${opsys}" = "mingw32"; then
|
|
|
|
if test "${with_gif}" != "no"; then
|
|
|
|
AC_CHECK_HEADER(gif_lib.h, HAVE_GIF=yes, HAVE_GIF=no)
|
|
|
|
fi
|
|
|
|
if test "${HAVE_GIF}" = "yes"; then
|
|
|
|
AC_DEFINE(HAVE_GIF, 1, [Define to 1 if you have a gif (or ungif) library.])
|
|
|
|
fi
|
|
|
|
elif test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no" \
|
2012-09-17 11:55:02 +00:00
|
|
|
|| test "${HAVE_W32}" = "yes"; then
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_CHECK_HEADER(gif_lib.h,
|
|
|
|
# EGifPutExtensionLast only exists from version libungif-4.1.0b1.
|
2013-10-10 00:37:44 +00:00
|
|
|
# Earlier versions can crash Emacs, but version 5.0 removes EGifPutExtensionLast.
|
|
|
|
[AC_CHECK_LIB(gif, GifMakeMapObject, HAVE_GIF=yes,
|
|
|
|
[AC_CHECK_LIB(gif, EGifPutExtensionLast, HAVE_GIF=yes, HAVE_GIF=maybe)])])
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
if test "$HAVE_GIF" = yes; then
|
|
|
|
LIBGIF=-lgif
|
|
|
|
elif test "$HAVE_GIF" = maybe; then
|
|
|
|
# If gif_lib.h but no libgif, try libungif.
|
|
|
|
AC_CHECK_LIB(ungif, EGifPutExtensionLast, HAVE_GIF=yes, HAVE_GIF=no)
|
|
|
|
test "$HAVE_GIF" = yes && LIBGIF=-lungif
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test "${HAVE_GIF}" = "yes"; then
|
|
|
|
AC_DEFINE(HAVE_GIF, 1, [Define to 1 if you have a gif (or ungif) library.])
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
AC_SUBST(LIBGIF)
|
|
|
|
|
2013-12-12 04:53:59 +00:00
|
|
|
dnl Check for required libraries.
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "${HAVE_X11}" = "yes"; then
|
|
|
|
MISSING=""
|
|
|
|
WITH_NO=""
|
|
|
|
test "${with_xpm}" != "no" && test "${HAVE_XPM}" != "yes" &&
|
|
|
|
MISSING="libXpm" && WITH_NO="--with-xpm=no"
|
|
|
|
test "${with_jpeg}" != "no" && test "${HAVE_JPEG}" != "yes" &&
|
|
|
|
MISSING="$MISSING libjpeg" && WITH_NO="$WITH_NO --with-jpeg=no"
|
|
|
|
test "${with_png}" != "no" && test "${HAVE_PNG}" != "yes" &&
|
|
|
|
MISSING="$MISSING libpng" && WITH_NO="$WITH_NO --with-png=no"
|
|
|
|
test "${with_gif}" != "no" && test "${HAVE_GIF}" != "yes" &&
|
|
|
|
MISSING="$MISSING libgif/libungif" && WITH_NO="$WITH_NO --with-gif=no"
|
|
|
|
test "${with_tiff}" != "no" && test "${HAVE_TIFF}" != "yes" &&
|
|
|
|
MISSING="$MISSING libtiff" && WITH_NO="$WITH_NO --with-tiff=no"
|
|
|
|
|
|
|
|
if test "X${MISSING}" != X; then
|
2013-12-12 04:53:59 +00:00
|
|
|
AC_MSG_ERROR([The following required libraries were not found:
|
2010-12-03 14:45:09 +00:00
|
|
|
$MISSING
|
|
|
|
Maybe some development libraries/packages are missing?
|
2013-12-12 04:53:59 +00:00
|
|
|
If you don't want to link with them give
|
2010-12-03 14:45:09 +00:00
|
|
|
$WITH_NO
|
2013-12-12 04:53:59 +00:00
|
|
|
as options to configure])
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
### Use -lgpm if available, unless `--with-gpm=no'.
|
|
|
|
HAVE_GPM=no
|
|
|
|
LIBGPM=
|
|
|
|
if test "${with_gpm}" != "no"; then
|
|
|
|
AC_CHECK_HEADER(gpm.h,
|
|
|
|
[AC_CHECK_LIB(gpm, Gpm_Open, HAVE_GPM=yes)])
|
|
|
|
|
|
|
|
if test "${HAVE_GPM}" = "yes"; then
|
|
|
|
AC_DEFINE(HAVE_GPM, 1, [Define to 1 if you have the gpm library (-lgpm).])
|
|
|
|
LIBGPM=-lgpm
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
AC_SUBST(LIBGPM)
|
|
|
|
|
|
|
|
dnl Check for malloc/malloc.h on darwin
|
2012-05-28 00:46:33 +00:00
|
|
|
AC_CHECK_HEADERS_ONCE(malloc/malloc.h)
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2012-04-11 01:25:51 +00:00
|
|
|
GNUSTEP_CFLAGS=
|
2010-12-03 14:45:09 +00:00
|
|
|
### Use NeXTstep API to implement GUI.
|
|
|
|
if test "${HAVE_NS}" = "yes"; then
|
|
|
|
AC_DEFINE(HAVE_NS, 1, [Define to 1 if you are using the NeXTstep API, either GNUstep or Cocoa on Mac OS X.])
|
|
|
|
if test "${NS_IMPL_COCOA}" = "yes"; then
|
|
|
|
AC_DEFINE(NS_IMPL_COCOA, 1, [Define to 1 if you are using NS windowing under MacOS X.])
|
|
|
|
fi
|
|
|
|
if test "${NS_IMPL_GNUSTEP}" = "yes"; then
|
|
|
|
AC_DEFINE(NS_IMPL_GNUSTEP, 1, [Define to 1 if you are using NS windowing under GNUstep.])
|
|
|
|
# See also .m.o rule in Makefile.in */
|
|
|
|
# FIXME: are all these flags really needed? Document here why. */
|
2012-04-11 01:25:51 +00:00
|
|
|
GNUSTEP_CFLAGS="-D_REENTRANT -fPIC -fno-strict-aliasing -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
|
2011-09-15 02:32:55 +00:00
|
|
|
## Extra CFLAGS applied to src/*.m files.
|
|
|
|
GNU_OBJC_CFLAGS="$GNU_OBJC_CFLAGS -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 -DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE"
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
OTHER_FILES=ns-app
|
|
|
|
fi
|
|
|
|
|
|
|
|
### Use session management (-lSM -lICE) if available
|
|
|
|
HAVE_X_SM=no
|
|
|
|
LIBXSM=
|
|
|
|
if test "${HAVE_X11}" = "yes"; then
|
|
|
|
AC_CHECK_HEADER(X11/SM/SMlib.h,
|
|
|
|
[AC_CHECK_LIB(SM, SmcOpenConnection, HAVE_X_SM=yes, , -lICE)])
|
|
|
|
|
|
|
|
if test "${HAVE_X_SM}" = "yes"; then
|
|
|
|
AC_DEFINE(HAVE_X_SM, 1, [Define to 1 if you have the SM library (-lSM).])
|
|
|
|
LIBXSM="-lSM -lICE"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
AC_SUBST(LIBXSM)
|
|
|
|
|
2013-05-07 01:12:22 +00:00
|
|
|
### Use XRandr (-lXrandr) if available
|
|
|
|
HAVE_XRANDR=no
|
|
|
|
if test "${HAVE_X11}" = "yes"; then
|
|
|
|
XRANDR_REQUIRED=1.2.2
|
|
|
|
XRANDR_MODULES="xrandr >= $XRANDR_REQUIRED"
|
2014-05-03 08:12:06 +00:00
|
|
|
EMACS_CHECK_MODULES([XRANDR], [$XRANDR_MODULES])
|
2013-05-07 01:12:22 +00:00
|
|
|
if test $HAVE_XRANDR = no; then
|
|
|
|
# Test old way in case pkg-config doesn't have it (older machines).
|
2014-10-04 07:22:51 +00:00
|
|
|
# Include Xrender.h by hand to work around bug in older Xrandr.h
|
|
|
|
# (e.g. RHEL5) and silence (harmless) configure warning (bug#18465).
|
2013-05-07 01:12:22 +00:00
|
|
|
AC_CHECK_HEADER(X11/extensions/Xrandr.h,
|
2014-10-04 07:22:51 +00:00
|
|
|
[AC_CHECK_LIB(Xrandr, XRRGetScreenResources, HAVE_XRANDR=yes)],
|
|
|
|
[], [AC_INCLUDES_DEFAULT
|
|
|
|
#include <X11/extensions/Xrender.h>])
|
2013-05-07 01:12:22 +00:00
|
|
|
if test $HAVE_XRANDR = yes; then
|
|
|
|
XRANDR_LIBS=-lXrandr
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test $HAVE_XRANDR = yes; then
|
|
|
|
SAVE_CFLAGS="$CFLAGS"
|
|
|
|
SAVE_LIBS="$LIBS"
|
|
|
|
CFLAGS="$XRANDR_CFLAGS $CFLAGS"
|
|
|
|
LIBS="$XRANDR_LIBS $LIBS"
|
|
|
|
AC_CHECK_FUNCS(XRRGetOutputPrimary XRRGetScreenResourcesCurrent)
|
|
|
|
CFLAGS="$SAVE_CFLAGS"
|
|
|
|
LIBS="$SAVE_LIBS"
|
|
|
|
|
|
|
|
AC_DEFINE(HAVE_XRANDR, 1, [Define to 1 if you have the XRandr extension.])
|
|
|
|
fi
|
|
|
|
fi
|
2014-05-02 23:18:11 +00:00
|
|
|
AC_SUBST(XRANDR_CFLAGS)
|
|
|
|
AC_SUBST(XRANDR_LIBS)
|
2013-05-07 01:12:22 +00:00
|
|
|
|
|
|
|
### Use Xinerama (-lXinerama) if available
|
|
|
|
HAVE_XINERAMA=no
|
|
|
|
if test "${HAVE_X11}" = "yes"; then
|
|
|
|
XINERAMA_REQUIRED=1.0.2
|
|
|
|
XINERAMA_MODULES="xinerama >= $XINERAMA_REQUIRED"
|
2014-05-03 08:12:06 +00:00
|
|
|
EMACS_CHECK_MODULES([XINERAMA], [$XINERAMA_MODULES])
|
2013-05-07 01:12:22 +00:00
|
|
|
if test $HAVE_XINERAMA = no; then
|
|
|
|
# Test old way in case pkg-config doesn't have it (older machines).
|
|
|
|
AC_CHECK_HEADER(X11/extensions/Xinerama.h,
|
|
|
|
[AC_CHECK_LIB(Xinerama, XineramaQueryExtension, HAVE_XINERAMA=yes)])
|
|
|
|
if test $HAVE_XINERAMA = yes; then
|
|
|
|
XINERAMA_LIBS=-lXinerama
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test $HAVE_XINERAMA = yes; then
|
|
|
|
AC_DEFINE(HAVE_XINERAMA, 1, [Define to 1 if you have the Xinerama extension.])
|
|
|
|
fi
|
|
|
|
fi
|
2014-05-02 23:18:11 +00:00
|
|
|
AC_SUBST(XINERAMA_CFLAGS)
|
|
|
|
AC_SUBST(XINERAMA_LIBS)
|
2013-05-07 01:12:22 +00:00
|
|
|
|
2014-05-13 14:18:54 +00:00
|
|
|
### Use Xfixes (-lXfixes) if available
|
|
|
|
HAVE_XFIXES=no
|
|
|
|
if test "${HAVE_X11}" = "yes"; then
|
|
|
|
XFIXES_REQUIRED=4.0.0
|
|
|
|
XFIXES_MODULES="xfixes >= $XFIXES_REQUIRED"
|
|
|
|
EMACS_CHECK_MODULES([XFIXES], [$XFIXES_MODULES])
|
|
|
|
if test $HAVE_XFIXES = no; then
|
|
|
|
# Test old way in case pkg-config doesn't have it (older machines).
|
|
|
|
AC_CHECK_HEADER(X11/extensions/Xfixes.h,
|
|
|
|
[AC_CHECK_LIB(Xfixes, XFixesHideCursor, HAVE_XFIXES=yes)])
|
|
|
|
if test $HAVE_XFIXES = yes; then
|
|
|
|
XFIXES_LIBS=-lXfixes
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test $HAVE_XFIXES = yes; then
|
|
|
|
AC_DEFINE(HAVE_XFIXES, 1, [Define to 1 if you have the Xfixes extension.])
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
AC_SUBST(XFIXES_CFLAGS)
|
|
|
|
AC_SUBST(XFIXES_LIBS)
|
2013-05-07 01:12:22 +00:00
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
### Use libxml (-lxml2) if available
|
2012-11-23 15:22:47 +00:00
|
|
|
### mingw32 doesn't use -lxml2, since it loads the library dynamically.
|
2011-09-26 18:38:31 +00:00
|
|
|
HAVE_LIBXML2=no
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "${with_xml2}" != "no"; then
|
|
|
|
### I'm not sure what the version number should be, so I just guessed.
|
2014-05-03 08:12:06 +00:00
|
|
|
EMACS_CHECK_MODULES([LIBXML2], [libxml-2.0 > 2.6.17])
|
2013-06-21 01:03:23 +00:00
|
|
|
# Built-in libxml2 on OS X 10.8 lacks libxml-2.0.pc.
|
|
|
|
if test "${HAVE_LIBXML2}" != "yes" -a "$opsys" = "darwin"; then
|
|
|
|
SAVE_CPPFLAGS="$CPPFLAGS"
|
2013-12-29 07:52:53 +00:00
|
|
|
CPPFLAGS="$CPPFLAGS -I$xcsdkdir/usr/include/libxml2"
|
2013-06-21 01:03:23 +00:00
|
|
|
AC_CHECK_HEADER(libxml/HTMLparser.h,
|
|
|
|
[AC_CHECK_DECL(HTML_PARSE_RECOVER, HAVE_LIBXML2=yes, ,
|
|
|
|
[#include <libxml/HTMLparser.h>])])
|
|
|
|
CPPFLAGS="$SAVE_CPPFLAGS"
|
|
|
|
if test "${HAVE_LIBXML2}" = "yes"; then
|
2013-12-27 16:57:52 +00:00
|
|
|
LIBXML2_CFLAGS="-I'$xcsdkdir/usr/include/libxml2'"
|
2013-06-21 01:03:23 +00:00
|
|
|
LIBXML2_LIBS="-lxml2"
|
|
|
|
fi
|
|
|
|
fi
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "${HAVE_LIBXML2}" = "yes"; then
|
2012-11-23 15:22:47 +00:00
|
|
|
if test "${opsys}" != "mingw32"; then
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
AC_CHECK_LIB(xml2, htmlReadMemory, HAVE_LIBXML2=yes, HAVE_LIBXML2=no
|
|
|
|
[$LIBXML2_LIBS])
|
2012-11-23 17:59:10 +00:00
|
|
|
else
|
|
|
|
LIBXML2_LIBS=""
|
2012-11-23 15:22:47 +00:00
|
|
|
fi
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "${HAVE_LIBXML2}" = "yes"; then
|
|
|
|
AC_DEFINE(HAVE_LIBXML2, 1, [Define to 1 if you have the libxml library (-lxml2).])
|
|
|
|
else
|
|
|
|
LIBXML2_LIBS=""
|
|
|
|
LIBXML2_CFLAGS=""
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
AC_SUBST(LIBXML2_LIBS)
|
|
|
|
AC_SUBST(LIBXML2_CFLAGS)
|
|
|
|
|
|
|
|
# If netdb.h doesn't declare h_errno, we must declare it by hand.
|
2012-11-24 16:02:07 +00:00
|
|
|
# On MinGW, that is provided by nt/inc/sys/socket.h and w32.c.
|
2012-11-23 15:22:47 +00:00
|
|
|
if test "${opsys}" = "mingw32"; then
|
|
|
|
emacs_cv_netdb_declares_h_errno=yes
|
|
|
|
fi
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_CACHE_CHECK(whether netdb declares h_errno,
|
|
|
|
emacs_cv_netdb_declares_h_errno,
|
2011-03-26 19:29:10 +00:00
|
|
|
[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]],
|
|
|
|
[[return h_errno;]])],
|
2010-12-03 14:45:09 +00:00
|
|
|
emacs_cv_netdb_declares_h_errno=yes, emacs_cv_netdb_declares_h_errno=no)])
|
|
|
|
if test $emacs_cv_netdb_declares_h_errno = yes; then
|
|
|
|
AC_DEFINE(HAVE_H_ERRNO, 1, [Define to 1 if netdb.h declares h_errno.])
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Check for mail-locking functions in a "mail" library. Probably this should
|
|
|
|
# have the same check as for liblockfile below.
|
|
|
|
AC_CHECK_LIB(mail, maillock, have_mail=yes, have_mail=no)
|
|
|
|
if test $have_mail = yes; then
|
|
|
|
LIBS_MAIL=-lmail
|
|
|
|
AC_DEFINE(HAVE_LIBMAIL, 1, [Define to 1 if you have the `mail' library (-lmail).])
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
|
|
|
|
OLD_LIBS=$LIBS
|
|
|
|
LIBS="$LIBS_MAIL $LIBS"
|
|
|
|
AC_CHECK_FUNCS(touchlock)
|
|
|
|
LIBS=$OLD_LIBS
|
2010-12-03 14:45:09 +00:00
|
|
|
else
|
|
|
|
LIBS_MAIL=
|
|
|
|
fi
|
|
|
|
dnl Debian, at least:
|
|
|
|
AC_CHECK_LIB(lockfile, maillock, have_lockfile=yes, have_lockfile=no)
|
|
|
|
if test $have_lockfile = yes; then
|
|
|
|
LIBS_MAIL=-llockfile
|
|
|
|
AC_DEFINE(HAVE_LIBLOCKFILE, 1, [Define to 1 if you have the `lockfile' library (-llockfile).])
|
|
|
|
else
|
|
|
|
# If we have the shared liblockfile, assume we must use it for mail
|
|
|
|
# locking (e.g. Debian). If we couldn't link against liblockfile
|
|
|
|
# (no liblockfile.a installed), ensure that we don't need to.
|
|
|
|
dnl This works for files generally, not just executables.
|
|
|
|
dnl Should we look elsewhere for it? Maybe examine /etc/ld.so.conf?
|
|
|
|
AC_CHECK_PROG(liblockfile, liblockfile.so, yes, no,
|
|
|
|
/usr/lib:/lib:/usr/local/lib:$LD_LIBRARY_PATH)
|
|
|
|
if test $ac_cv_prog_liblockfile = yes; then
|
|
|
|
AC_MSG_ERROR([Shared liblockfile found but can't link against it.
|
|
|
|
This probably means that movemail could lose mail.
|
|
|
|
There may be a `development' package to install containing liblockfile.])
|
|
|
|
fi
|
|
|
|
fi
|
2012-05-28 00:46:33 +00:00
|
|
|
AC_CHECK_HEADERS_ONCE(maillock.h)
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_SUBST(LIBS_MAIL)
|
|
|
|
|
|
|
|
## Define MAIL_USE_FLOCK (or LOCKF) if the mailer uses flock (or lockf) to
|
|
|
|
## interlock access to the mail spool. The alternative is a lock file named
|
|
|
|
## /usr/spool/mail/$USER.lock.
|
|
|
|
mail_lock=no
|
|
|
|
case "$opsys" in
|
|
|
|
aix4-2) mail_lock="lockf" ;;
|
|
|
|
|
2013-04-18 17:12:21 +00:00
|
|
|
gnu|freebsd|dragonfly|netbsd|openbsd|darwin|irix6-5) mail_lock="flock" ;;
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
## On GNU/Linux systems, both methods are used by various mail programs.
|
|
|
|
## I assume most people are using newer mailers that have heard of flock.
|
|
|
|
## Change this if you need to.
|
|
|
|
## Debian contains a patch which says: ``On Debian/GNU/Linux systems,
|
|
|
|
## configure gets the right answers, and that means *NOT* using flock.
|
|
|
|
## Using flock is guaranteed to be the wrong thing. See Debian Policy
|
|
|
|
## for details.'' and then uses `#ifdef DEBIAN'. Unfortunately the
|
|
|
|
## Debian maintainer hasn't provided a clean fix for Emacs.
|
|
|
|
## movemail.c will use `maillock' when MAILDIR, HAVE_LIBMAIL and
|
|
|
|
## HAVE_MAILLOCK_H are defined, so the following appears to be the
|
|
|
|
## correct logic. -- fx
|
|
|
|
## We must check for HAVE_LIBLOCKFILE too, as movemail does.
|
|
|
|
## liblockfile is a Free Software replacement for libmail, used on
|
|
|
|
## Debian systems and elsewhere. -rfr.
|
|
|
|
gnu-*)
|
|
|
|
mail_lock="flock"
|
|
|
|
if test $have_mail = yes || test $have_lockfile = yes; then
|
|
|
|
test $ac_cv_header_maillock_h = yes && mail_lock=no
|
|
|
|
fi
|
|
|
|
;;
|
2013-04-14 16:36:49 +00:00
|
|
|
|
|
|
|
mingw32)
|
|
|
|
mail_lock="none-needed" ;;
|
2010-12-03 14:45:09 +00:00
|
|
|
esac
|
|
|
|
|
|
|
|
BLESSMAIL_TARGET=
|
|
|
|
case "$mail_lock" in
|
|
|
|
flock) AC_DEFINE(MAIL_USE_FLOCK, 1, [Define if the mailer uses flock to interlock the mail spool.]) ;;
|
|
|
|
|
|
|
|
lockf) AC_DEFINE(MAIL_USE_LOCKF, 1, [Define if the mailer uses lockf to interlock the mail spool.]) ;;
|
|
|
|
|
2013-04-14 16:36:49 +00:00
|
|
|
none-needed) ;;
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
*) BLESSMAIL_TARGET="need-blessmail" ;;
|
|
|
|
esac
|
|
|
|
AC_SUBST(BLESSMAIL_TARGET)
|
|
|
|
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
OLD_LIBS=$LIBS
|
2014-05-29 23:13:32 +00:00
|
|
|
LIBS="$LIB_PTHREAD $LIB_MATH $LIBS"
|
2014-08-10 20:40:57 +00:00
|
|
|
AC_CHECK_FUNCS(accept4 fchdir gethostname \
|
2012-11-23 07:48:43 +00:00
|
|
|
getrusage get_current_dir_name \
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
lrand48 random rint \
|
Improve robustness of new string-collation code.
* configure.ac (newlocale): Check for this, not for uselocale.
* src/sysdep.c (LC_COLLATE, LC_COLLATE_MASK, freelocale, locale_t)
(newlocale, wcscoll_l): Define substitutes for platforms that
lack them, so as to simplify the mainline code.
(str_collate): Simplify the code by assuming the above definitions.
Use wcscoll_l, not uselocale, as uselocale is too fragile. For
example, the old version left the Emacs in the wrong locale if
wcscoll reported an error. Use 'int', not ptrdiff_t, for the int
result. Report an error if newlocale fails.
Fixes: debbugs:18051
2014-08-27 18:56:47 +00:00
|
|
|
select getpagesize setlocale newlocale \
|
Remove some unused macros from 'configure'.
* configure.ac (HAVE_SOUNDCARD_H, HAVE_LINUX_VERSION_H, HAVE_SPEED_T)
(HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY)
(HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION, HAVE_UTIMES)
(HAVE_LIBHESIOD, HAVE_LIBRESOLV, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB, HAVE_DES_H, HAVE_KERBEROSIV_DES_H)
(HAVE_DEV_PTMX, DEVICE_SEP, USG5):
Remove these macros, as they are not used.
(sys_siglist): Remove macro; src/sysdep.c now does this.
* src/sysdep.c (sys_siglist) [HAVE_DECL___SYS_SIGLIST]:
Define to __sys_siglist.
2013-07-02 16:56:29 +00:00
|
|
|
getrlimit setrlimit shutdown getaddrinfo \
|
2014-05-29 23:13:32 +00:00
|
|
|
pthread_sigmask strsignal setitimer \
|
2012-06-12 17:27:41 +00:00
|
|
|
sendto recvfrom getsockname getpeername getifaddrs freeifaddrs \
|
Vector-sorting fixes.
It's not safe to call qsort or qsort_r, since they have undefined
behavior if the user-specified predicate is not a total order.
Also, watch out for garbage-collection while sorting vectors.
* admin/merge-gnulib (GNULIB_MODULES): Add vla.
* configure.ac (qsort_r): Remove, as we no longer use qsort-like
functions.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib/vla.h, m4/vararrays.m4: New files, copied from gnulib.
* lib/stdlib.in.h, m4/stdlib_h.m4: Sync from gnulib, incorporating:
2014-08-29 qsort_r: new module, for GNU-style qsort_r
The previous two files' changes are boilerplate generated by
admin/merge-gnulib, and should not affect Emacs.
* src/fns.c: Include <vla.h>.
(sort_vector_predicate) [!HAVE_QSORT_R]: Remove.
(sort_vector_compare): Remove, replacing with ....
(inorder, merge_vectors, sort_vector_inplace, sort_vector_copy):
... these new functions.
(sort_vector): Rewrite to use the new functions.
GCPRO locals, since the predicate can invoke the GC.
Since it's in-place return void; caller changed.
(merge): Use 'inorder', for clarity.
Fixes: debbugs:18361
2014-08-30 22:59:39 +00:00
|
|
|
gai_strerror sync \
|
2012-04-17 01:29:58 +00:00
|
|
|
getpwent endpwent getgrent endgrent \
|
2013-06-20 14:15:42 +00:00
|
|
|
cfmakeraw cfsetspeed copysign __executable_start log2)
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
LIBS=$OLD_LIBS
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2013-11-07 05:31:04 +00:00
|
|
|
dnl No need to check for aligned_alloc and posix_memalign if using
|
Add support for HYBRID_MALLOC, allowing the use of gmalloc before
dumping and the system malloc after dumping. (Bug#18222)
* configure.ac (HYBRID_MALLOC): New macro; define to use gmalloc
before dumping and the system malloc after dumping. Define on Cygwin.
* src/conf_post.h (malloc, realloc, calloc, free) [HYBRID_MALLOC]:
Define as macros, expanding to hybrid_malloc, etc.
(HYBRID_GET_CURRENT_DIR_NAME): New macro.
(get_current_dir_name) [HYBRID_GET_CURRENT_DIR_NAME]: Define as
macro.
* src/gmalloc.c: Set up the infrastructure for HYBRID_MALLOC, with a
full implementation on Cygwin. Remove Cygwin-specific code that
is no longer needed.
(malloc, realloc, calloc, free, aligned_alloc) [HYBRID_MALLOC]:
Redefine as macros expanding to gmalloc, grealloc, etc.
(DUMPED, ALLOCATED_BEFORE_DUMPING) [CYGWIN]: New macros.
(get_current_dir_name) [HYBRID_GET_CURRENT_DIR_NAME]: Undefine.
(USE_PTHREAD, posix_memalign) [HYBRID_MALLOC]: Don't define.
(hybrid_malloc, hybrid_calloc, hybrid_free, hybrid_realloc)
[HYBRID_MALLOC]:
(hybrid_get_current_dir_name) [HYBRID_GET_CURRENT_DIR_NAME]:
(hybrid_aligned_alloc) [HYBRID_MALLOC && (HAVE_ALIGNED_ALLOC ||
HAVE_POSIX_MEMALIGN)]: New functions.
* src/alloc.c (aligned_alloc) [HYBRID_MALLOC && (ALIGNED_ALLOC ||
HAVE_POSIX_MEMALIGN)]: Define as macro expanding to
hybrid_aligned_alloc; declare.
(USE_ALIGNED_ALLOC) [HYBRID_MALLOC && (ALIGNED_ALLOC ||
HAVE_POSIX_MEMALIGN)]: Define.
(refill_memory_reserve) [HYBRID_MALLOC]: Do nothing.
* src/sysdep.c (get_current_dir_name) [HYBRID_GET_CURRENT_DIR_NAME]:
Define as macro, expanding to gget_current_dir_name, and define
the latter.
* src/emacs.c (main) [HYBRID_MALLOC]: Don't call memory_warnings() or
malloc_enable_thread(). Don't initialize malloc.
* src/lisp.h (NONPOINTER_BITS) [CYGWIN]: Define (because GNU_MALLOC is
no longer defined on Cygwin).
(refill_memory_reserve) [HYBRID_MALLOC]: Don't declare.
* src/sheap.c (bss_sbrk_buffer_end): New variable.
* src/unexcw.c (__malloc_initialized): Remove variable.
* src/ralloc.c: Throughout, treat HYBRID_MALLOC the same as
SYSTEM_MALLOC.
* src/xdisp.c (decode_mode_spec) [HYBRID_MALLOC]: Don't check
Vmemory_full.
2014-08-28 14:48:02 +00:00
|
|
|
dnl gmalloc.o, as it supplies them, unless we're using hybrid_malloc.
|
|
|
|
dnl Don't use these functions on Darwin as they are incompatible with
|
|
|
|
dnl unexmacosx.c.
|
|
|
|
if (test -z "$GMALLOC_OBJ" || test "$hybrid_malloc" = yes) \
|
|
|
|
&& test "$opsys" != darwin; then
|
2013-11-07 05:31:04 +00:00
|
|
|
AC_CHECK_FUNCS([aligned_alloc posix_memalign], [break])
|
|
|
|
fi
|
|
|
|
|
2011-01-05 13:09:07 +00:00
|
|
|
dnl Cannot use AC_CHECK_FUNCS
|
|
|
|
AC_CACHE_CHECK([for __builtin_unwind_init],
|
|
|
|
emacs_cv_func___builtin_unwind_init,
|
|
|
|
[AC_LINK_IFELSE([AC_LANG_PROGRAM([], [__builtin_unwind_init ();])],
|
|
|
|
emacs_cv_func___builtin_unwind_init=yes,
|
|
|
|
emacs_cv_func___builtin_unwind_init=no)])
|
|
|
|
if test $emacs_cv_func___builtin_unwind_init = yes; then
|
|
|
|
AC_DEFINE(HAVE___BUILTIN_UNWIND_INIT, 1,
|
|
|
|
[Define to 1 if you have the `__builtin_unwind_init' function.])
|
|
|
|
fi
|
|
|
|
|
2012-05-28 00:46:33 +00:00
|
|
|
AC_CHECK_HEADERS_ONCE(sys/un.h)
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
AC_FUNC_FSEEKO
|
|
|
|
|
|
|
|
# UNIX98 PTYs.
|
2012-06-23 09:55:13 +00:00
|
|
|
AC_CHECK_FUNCS(grantpt)
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
# PTY-related GNU extensions.
|
2012-08-17 07:20:10 +00:00
|
|
|
AC_CHECK_FUNCS(getpt posix_openpt)
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
# Check this now, so that we will NOT find the above functions in ncurses.
|
|
|
|
# That is because we have not set up to link ncurses in lib-src.
|
|
|
|
# It's better to believe a function is not available
|
|
|
|
# than to expect to find it in ncurses.
|
|
|
|
# Also we need tputs and friends to be able to build at all.
|
2012-03-04 18:07:33 +00:00
|
|
|
AC_MSG_CHECKING([for library containing tputs])
|
|
|
|
# Run a test program that contains a call to tputs, a call that is
|
|
|
|
# never executed. This tests whether a pre-'main' dynamic linker
|
|
|
|
# works with the library. It's too much trouble to actually call
|
|
|
|
# tputs in the test program, due to portability hassles. When
|
|
|
|
# cross-compiling, assume the test program will run if it links.
|
|
|
|
AC_DEFUN([tputs_link_source], [
|
|
|
|
AC_LANG_SOURCE(
|
|
|
|
[[extern void tputs (const char *, int, int (*)(int));
|
|
|
|
int main (int argc, char **argv)
|
|
|
|
{
|
|
|
|
if (argc == 10000)
|
|
|
|
tputs (argv[0], 0, 0);
|
|
|
|
return 0;
|
|
|
|
}]])
|
|
|
|
])
|
2012-11-23 17:59:10 +00:00
|
|
|
if test "${opsys}" = "mingw32"; then
|
2012-11-23 15:22:47 +00:00
|
|
|
msg='none required'
|
|
|
|
else
|
|
|
|
# Maybe curses should be tried earlier?
|
|
|
|
# See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9736#35
|
|
|
|
for tputs_library in '' tinfo ncurses terminfo termcap curses; do
|
|
|
|
OLIBS=$LIBS
|
|
|
|
if test -z "$tputs_library"; then
|
|
|
|
LIBS_TERMCAP=
|
|
|
|
msg='none required'
|
|
|
|
else
|
|
|
|
LIBS_TERMCAP=-l$tputs_library
|
|
|
|
msg=$LIBS_TERMCAP
|
|
|
|
LIBS="$LIBS_TERMCAP $LIBS"
|
|
|
|
fi
|
|
|
|
AC_RUN_IFELSE([tputs_link_source], [], [msg=no],
|
|
|
|
[AC_LINK_IFELSE([tputs_link_source], [], [msg=no])])
|
|
|
|
LIBS=$OLIBS
|
|
|
|
if test "X$msg" != Xno; then
|
|
|
|
break
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
fi
|
2012-03-04 18:07:33 +00:00
|
|
|
AC_MSG_RESULT([$msg])
|
|
|
|
if test "X$msg" = Xno; then
|
2011-10-13 02:16:59 +00:00
|
|
|
AC_MSG_ERROR([The required function `tputs' was not found in any library.
|
2012-05-01 01:07:14 +00:00
|
|
|
The following libraries were tried (in order):
|
|
|
|
libtinfo, libncurses, libterminfo, libtermcap, libcurses
|
2011-10-13 02:16:59 +00:00
|
|
|
Please try installing whichever of these libraries is most appropriate
|
|
|
|
for your system, together with its header files.
|
|
|
|
For example, a libncurses-dev(el) or similar package.])
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
|
2012-05-01 00:46:02 +00:00
|
|
|
## Use termcap instead of terminfo?
|
|
|
|
## Only true for: freebsd < 40000, ms-w32, msdos, netbsd < 599002500.
|
|
|
|
TERMINFO=yes
|
2012-05-01 01:07:14 +00:00
|
|
|
## FIXME? In the cases below where we unconditionally set
|
|
|
|
## LIBS_TERMCAP="-lncurses", this overrides LIBS_TERMCAP = -ltinfo,
|
|
|
|
## if that was found above to have tputs.
|
|
|
|
## Should we use the gnu* logic everywhere?
|
2010-12-03 14:45:09 +00:00
|
|
|
case "$opsys" in
|
|
|
|
## darwin: Prevents crashes when running Emacs in Terminal.app under 10.2.
|
|
|
|
## The ncurses library has been moved out of the System framework in
|
|
|
|
## Mac OS X 10.2. So if configure detects it, set the command-line
|
|
|
|
## option to use it.
|
2012-05-01 01:07:14 +00:00
|
|
|
darwin) LIBS_TERMCAP="-lncurses" ;;
|
|
|
|
|
2012-05-05 10:34:06 +00:00
|
|
|
gnu*) test -z "$LIBS_TERMCAP" && LIBS_TERMCAP="-lncurses" ;;
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
freebsd)
|
|
|
|
AC_MSG_CHECKING([whether FreeBSD is new enough to use terminfo])
|
|
|
|
AC_CACHE_VAL(emacs_cv_freebsd_terminfo,
|
2011-03-26 19:29:10 +00:00
|
|
|
[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <osreldate.h>]],
|
|
|
|
[[#if __FreeBSD_version < 400000
|
2010-12-03 14:45:09 +00:00
|
|
|
fail;
|
|
|
|
#endif
|
2011-03-26 19:29:10 +00:00
|
|
|
]])], emacs_cv_freebsd_terminfo=yes, emacs_cv_freebsd_terminfo=no)])
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
AC_MSG_RESULT($emacs_cv_freebsd_terminfo)
|
|
|
|
|
|
|
|
if test $emacs_cv_freebsd_terminfo = yes; then
|
|
|
|
LIBS_TERMCAP="-lncurses"
|
|
|
|
else
|
2012-05-01 00:46:02 +00:00
|
|
|
TERMINFO=no
|
2010-12-03 14:45:09 +00:00
|
|
|
LIBS_TERMCAP="-ltermcap"
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
|
2012-11-23 15:22:47 +00:00
|
|
|
mingw32)
|
|
|
|
TERMINFO=no
|
|
|
|
LIBS_TERMCAP=
|
|
|
|
;;
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
netbsd)
|
2012-05-05 10:34:06 +00:00
|
|
|
if test "x$LIBS_TERMCAP" != "x-lterminfo"; then
|
2012-05-01 00:46:02 +00:00
|
|
|
TERMINFO=no
|
2010-12-03 14:45:09 +00:00
|
|
|
LIBS_TERMCAP="-ltermcap"
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
|
2013-04-18 17:12:21 +00:00
|
|
|
openbsd | dragonfly) LIBS_TERMCAP="-lncurses" ;;
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
## hpux: Make sure we get select from libc rather than from libcurses
|
|
|
|
## because libcurses on HPUX 10.10 has a broken version of select.
|
|
|
|
## We used to use -lc -lcurses, but this may be cleaner.
|
2012-05-01 00:50:55 +00:00
|
|
|
## FIXME? But TERMINFO = yes on hpux (it used to be explicitly
|
|
|
|
# set that way, now it uses the default). Isn't this a contradiction?
|
2010-12-03 14:45:09 +00:00
|
|
|
hpux*) LIBS_TERMCAP="-ltermcap" ;;
|
|
|
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
TERMCAP_OBJ=tparam.o
|
|
|
|
if test $TERMINFO = yes; then
|
|
|
|
AC_DEFINE(TERMINFO, 1, [Define to 1 if you use terminfo instead of termcap.])
|
|
|
|
TERMCAP_OBJ=terminfo.o
|
|
|
|
fi
|
2013-07-23 08:08:57 +00:00
|
|
|
if test "X$LIBS_TERMCAP" = "X-lncurses"; then
|
|
|
|
AC_DEFINE(USE_NCURSES, 1, [Define to 1 if you use ncurses.])
|
|
|
|
fi
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_SUBST(LIBS_TERMCAP)
|
|
|
|
AC_SUBST(TERMCAP_OBJ)
|
|
|
|
|
2014-07-28 06:28:15 +00:00
|
|
|
# GNU/Linux-specific timer functions.
|
2014-07-31 20:17:01 +00:00
|
|
|
AC_CACHE_CHECK([for timerfd interface], [emacs_cv_have_timerfd],
|
|
|
|
[AC_COMPILE_IFELSE(
|
|
|
|
[AC_LANG_PROGRAM([[#include <sys/timerfd.h>
|
2014-08-02 21:50:13 +00:00
|
|
|
]],
|
|
|
|
[[timerfd_create (CLOCK_REALTIME,
|
|
|
|
TFD_CLOEXEC | TFD_NONBLOCK);
|
|
|
|
timerfd_settime (0, TFD_TIMER_ABSTIME, 0, 0);]])],
|
2014-07-31 20:17:01 +00:00
|
|
|
[emacs_cv_have_timerfd=yes],
|
|
|
|
[emacs_cv_have_timerfd=no])])
|
|
|
|
if test "$emacs_cv_have_timerfd" = yes; then
|
|
|
|
AC_DEFINE([HAVE_TIMERFD], 1,
|
|
|
|
[Define to 1 if timerfd functions are supported as in GNU/Linux.])
|
|
|
|
fi
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2014-08-26 06:25:59 +00:00
|
|
|
# Alternate stack for signal handlers.
|
|
|
|
AC_CACHE_CHECK([whether signals can be handled on alternate stack],
|
|
|
|
[emacs_cv_alternate_stack],
|
|
|
|
[AC_COMPILE_IFELSE(
|
|
|
|
[AC_LANG_PROGRAM([[#include <signal.h>
|
|
|
|
]],
|
|
|
|
[[stack_t ss;
|
|
|
|
struct sigaction sa;
|
|
|
|
ss.ss_sp = malloc (SIGSTKSZ);
|
|
|
|
ss.ss_size = SIGSTKSZ;
|
|
|
|
sa.sa_flags = SA_SIGINFO | SA_ONSTACK;
|
|
|
|
sigaltstack (&ss, 0);
|
|
|
|
sigaction (SIGSEGV, &sa, 0);]])],
|
|
|
|
[emacs_cv_alternate_stack=yes],
|
|
|
|
[emacs_cv_alternate_stack=no])])
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
# Do we have res_init, for detecting changes in /etc/resolv.conf?
|
2012-07-07 01:03:46 +00:00
|
|
|
# On Darwin, res_init appears not to be useful: see bug#562 and
|
|
|
|
# http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01467.html
|
2010-12-03 14:45:09 +00:00
|
|
|
resolv=no
|
2012-07-07 01:03:46 +00:00
|
|
|
|
|
|
|
if test $opsys != darwin; then
|
|
|
|
|
|
|
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netinet/in.h>
|
2010-12-03 14:45:09 +00:00
|
|
|
#include <arpa/nameser.h>
|
2011-03-26 19:29:10 +00:00
|
|
|
#include <resolv.h>]],
|
|
|
|
[[return res_init();]])],
|
2010-12-03 14:45:09 +00:00
|
|
|
have_res_init=yes, have_res_init=no)
|
2012-07-07 01:03:46 +00:00
|
|
|
if test "$have_res_init" = no; then
|
|
|
|
OLIBS="$LIBS"
|
|
|
|
LIBS="$LIBS -lresolv"
|
|
|
|
AC_MSG_CHECKING(for res_init with -lresolv)
|
|
|
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netinet/in.h>
|
2010-12-03 14:45:09 +00:00
|
|
|
#include <arpa/nameser.h>
|
2011-03-26 19:29:10 +00:00
|
|
|
#include <resolv.h>]],
|
2012-07-07 01:03:46 +00:00
|
|
|
[[return res_init();]])],
|
|
|
|
have_res_init=yes, have_res_init=no)
|
|
|
|
AC_MSG_RESULT($have_res_init)
|
|
|
|
if test "$have_res_init" = yes ; then
|
|
|
|
resolv=yes
|
|
|
|
fi
|
|
|
|
LIBS="$OLIBS"
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
|
2012-07-07 01:03:46 +00:00
|
|
|
if test "$have_res_init" = yes; then
|
|
|
|
AC_DEFINE(HAVE_RES_INIT, 1, [Define to 1 if res_init is available.])
|
|
|
|
fi
|
|
|
|
fi dnl !darwin
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
# Do we need the Hesiod library to provide the support routines?
|
2012-07-07 01:03:46 +00:00
|
|
|
dnl FIXME? Should we be skipping this on Darwin too?
|
2010-12-03 14:45:09 +00:00
|
|
|
LIBHESIOD=
|
|
|
|
if test "$with_hesiod" != no ; then
|
|
|
|
# Don't set $LIBS here -- see comments above. FIXME which comments?
|
|
|
|
AC_CHECK_FUNC(res_send, , [AC_CHECK_FUNC(__res_send, ,
|
|
|
|
[AC_CHECK_LIB(resolv, res_send, resolv=yes,
|
|
|
|
[AC_CHECK_LIB(resolv, __res_send, resolv=yes)])])])
|
|
|
|
if test "$resolv" = yes ; then
|
|
|
|
RESOLVLIB=-lresolv
|
|
|
|
else
|
|
|
|
RESOLVLIB=
|
|
|
|
fi
|
|
|
|
AC_CHECK_FUNC(hes_getmailhost, , [AC_CHECK_LIB(hesiod, hes_getmailhost,
|
|
|
|
hesiod=yes, :, $RESOLVLIB)])
|
|
|
|
|
|
|
|
if test x"$hesiod" = xyes; then
|
|
|
|
LIBHESIOD=-lhesiod
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
AC_SUBST(LIBHESIOD)
|
|
|
|
|
|
|
|
# Do we need libresolv (due to res_init or Hesiod)?
|
2012-07-07 01:03:46 +00:00
|
|
|
if test "$resolv" = yes && test $opsys != darwin; then
|
2010-12-03 14:45:09 +00:00
|
|
|
LIBRESOLV=-lresolv
|
|
|
|
else
|
|
|
|
LIBRESOLV=
|
|
|
|
fi
|
|
|
|
AC_SUBST(LIBRESOLV)
|
|
|
|
|
|
|
|
# These tell us which Kerberos-related libraries to use.
|
|
|
|
COM_ERRLIB=
|
|
|
|
CRYPTOLIB=
|
|
|
|
KRB5LIB=
|
|
|
|
DESLIB=
|
|
|
|
KRB4LIB=
|
|
|
|
|
|
|
|
if test "${with_kerberos}" != no; then
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
OLD_LIBS=$LIBS
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_CHECK_LIB(com_err, com_err, have_com_err=yes, have_com_err=no)
|
|
|
|
if test $have_com_err = yes; then
|
|
|
|
COM_ERRLIB=-lcom_err
|
|
|
|
LIBS="$COM_ERRLIB $LIBS"
|
|
|
|
fi
|
|
|
|
AC_CHECK_LIB(crypto, mit_des_cbc_encrypt, have_crypto=yes, have_crypto=no)
|
|
|
|
if test $have_crypto = yes; then
|
|
|
|
CRYPTOLIB=-lcrypto
|
|
|
|
LIBS="$CRYPTOLIB $LIBS"
|
|
|
|
fi
|
|
|
|
AC_CHECK_LIB(k5crypto, mit_des_cbc_encrypt, have_k5crypto=yes, have_k5crypto=no)
|
|
|
|
if test $have_k5crypto = yes; then
|
|
|
|
CRYPTOLIB=-lk5crypto
|
|
|
|
LIBS="$CRYPTOLIB $LIBS"
|
|
|
|
fi
|
|
|
|
AC_CHECK_LIB(krb5, krb5_init_context, have_krb5=yes, have_krb5=no)
|
|
|
|
if test $have_krb5=yes; then
|
|
|
|
KRB5LIB=-lkrb5
|
|
|
|
LIBS="$KRB5LIB $LIBS"
|
|
|
|
fi
|
|
|
|
dnl FIXME Simplify. Does not match 22 logic, thanks to default_off?
|
|
|
|
if test "${with_kerberos5}" = no; then
|
|
|
|
AC_CHECK_LIB(des425, des_cbc_encrypt, have_des425=yes, have_des425=no )
|
|
|
|
if test $have_des425 = yes; then
|
|
|
|
DESLIB=-ldes425
|
|
|
|
LIBS="$DESLIB $LIBS"
|
|
|
|
else
|
|
|
|
AC_CHECK_LIB(des, des_cbc_encrypt, have_des=yes, have_des=no)
|
|
|
|
if test $have_des = yes; then
|
|
|
|
DESLIB=-ldes
|
|
|
|
LIBS="$DESLIB $LIBS"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
AC_CHECK_LIB(krb4, krb_get_cred, have_krb4=yes, have_krb4=no)
|
|
|
|
if test $have_krb4 = yes; then
|
|
|
|
KRB4LIB=-lkrb4
|
|
|
|
LIBS="$KRB4LIB $LIBS"
|
|
|
|
else
|
|
|
|
AC_CHECK_LIB(krb, krb_get_cred, have_krb=yes, have_krb=no)
|
|
|
|
if test $have_krb = yes; then
|
|
|
|
KRB4LIB=-lkrb
|
|
|
|
LIBS="$KRB4LIB $LIBS"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test "${with_kerberos5}" != no; then
|
|
|
|
AC_CHECK_HEADERS(krb5.h,
|
|
|
|
[AC_CHECK_MEMBERS([krb5_error.text, krb5_error.e_text],,,
|
|
|
|
[#include <krb5.h>])])
|
|
|
|
else
|
|
|
|
AC_CHECK_HEADERS(krb.h,,
|
|
|
|
[AC_CHECK_HEADERS(kerberosIV/krb.h,,
|
|
|
|
[AC_CHECK_HEADERS(kerberos/krb.h)])])
|
|
|
|
fi
|
|
|
|
AC_CHECK_HEADERS(com_err.h)
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
LIBS=$OLD_LIBS
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
AC_SUBST(COM_ERRLIB)
|
|
|
|
AC_SUBST(CRYPTOLIB)
|
|
|
|
AC_SUBST(KRB5LIB)
|
|
|
|
AC_SUBST(DESLIB)
|
|
|
|
AC_SUBST(KRB4LIB)
|
|
|
|
|
2013-09-23 02:34:52 +00:00
|
|
|
AC_CHECK_HEADERS(valgrind/valgrind.h)
|
|
|
|
|
Fix putenv race conditions with undefined behavior.
Do all putenv calls before Emacs creates any threads.
Use a safer way to modify the TZ environment variable in the
presence of multiple threads. For further thread-safety,
prefer localtime_r and gmtime_r to localtime and gmtime,
and prefer struct tm's tm_gmtoff (if available) to calling
both localtime_r and gmtime_r.
* configure.ac (LOCALTIME_CACHE): Remove.
We needn't worry about SunOS 4 any more; Sun dropped support in 2003.
All uses of LOCALTIME_CACHE removed. This simplifies the fix.
(tzalloc): Add check for this function.
* admin/merge-gnulib (GNULIB_MODULES): Add time_r, since Emacs now
calls localtime_r and gmtime_r directly.
* src/dbusbind.c (Fdbus__init_bus): Move xputenv call from here ...
(init_dbusbind): ... to this new function.
* src/emacs.c (main) [HAVE_DBUS]: Call it before creating threads.
* src/xterm.c (x_term_init): Move xputenv call from here ...
(init_xterm): ... to this new function.
* src/emacs.c (main) [USE_GTK]: Call it before creating threads.
* src/editfns.c (HAVE_TM_GMTOFF): Default to false.
(dump_tz_string): New constant.
(init_editfns): Use it. This centralizes the dump_tz stuff.
Call set_time_zone_rule here, so that its xputenv is done
before Emacs goes multithreaded.
(mktime_z) [!HAVE_TZALLOC]: New function, which is typically
thread-safe enough for Emacs.
(format_time_string, Fdecode_time, Fcurrent_time_string)
(Fcurrent_time_zone):
Prefer localtime_r and gmtime_r, which are more thread-safe, to
localtime and gmtime. Remove now-unnecessary calls to block_input.
(tm_gmtoff): New static function.
(Fdecode_time, Fcurrent_time_zone): Use it.
(Fencode_time): Use mktime_z, for better thread-safety.
(set_time_zone_rule): Now static. Rewrite to be mostly thread-safe,
i.e., not quite thread-safe but good enough for Emacs typical usage.
Do not reclaim storage that is in the environment; let it leak.
Always call tzset, since localtime_r does not.
* src/emacs.c (dump_tz, Fdump_emacs) [HAVE_TZSET]: Remove dump_tz stuff.
This is now done in init_editfns.
* src/systime.h (mktime_z, timezone_t, tzalloc, tzfree) [!HAVE_TZALLOC]:
New macros and declarations, for platforms lacking tzalloc & friends.
Fixes: debbugs:8705
2014-10-12 06:09:50 +00:00
|
|
|
AC_CHECK_FUNCS_ONCE(tzalloc tzset)
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
ok_so_far=yes
|
|
|
|
AC_CHECK_FUNC(socket, , ok_so_far=no)
|
|
|
|
if test $ok_so_far = yes; then
|
|
|
|
AC_CHECK_HEADER(netinet/in.h, , ok_so_far=no)
|
|
|
|
fi
|
|
|
|
if test $ok_so_far = yes; then
|
|
|
|
AC_CHECK_HEADER(arpa/inet.h, , ok_so_far=no)
|
|
|
|
fi
|
|
|
|
if test $ok_so_far = yes; then
|
|
|
|
dnl Fixme: Not used. Should this be HAVE_SOCKETS?
|
|
|
|
AC_DEFINE(HAVE_INET_SOCKETS, 1,
|
|
|
|
[Define to 1 if you have inet sockets.])
|
|
|
|
fi
|
|
|
|
|
|
|
|
AC_FUNC_FORK
|
|
|
|
|
2012-06-23 09:55:13 +00:00
|
|
|
AC_CHECK_FUNCS(snprintf)
|
2011-08-31 22:18:16 +00:00
|
|
|
|
2014-04-19 22:19:54 +00:00
|
|
|
dnl Check for glib. This differs from other library checks in that
|
|
|
|
dnl Emacs need not link to glib unless some other library is already
|
|
|
|
dnl linking to glib. Although glib provides no facilities that Emacs
|
|
|
|
dnl needs for its own purposes, when glib is present Emacs needs to
|
|
|
|
dnl use primitives like g_main_context_query to avoid clashing with
|
|
|
|
dnl glib at a low level.
|
|
|
|
dnl
|
2014-04-19 17:45:20 +00:00
|
|
|
dnl Check this late, since it depends on $GTK_CFLAGS etc.
|
2013-06-03 18:47:35 +00:00
|
|
|
XGSELOBJ=
|
2014-03-23 09:17:29 +00:00
|
|
|
OLDCFLAGS="$CFLAGS"
|
|
|
|
OLDLIBS="$LIBS"
|
2014-04-19 17:45:20 +00:00
|
|
|
CFLAGS="$CFLAGS $GTK_CFLAGS $RSVG_CFLAGS $DBUS_CFLAGS $SETTINGS_CFLAGS"
|
|
|
|
LIBS="$LIBS $GTK_LIBS $RSVG_LIBS $DBUS_LIBS $SETTINGS_LIBS"
|
2014-03-23 09:17:29 +00:00
|
|
|
CFLAGS="$CFLAGS $GFILENOTIFY_CFLAGS"
|
|
|
|
LIBS="$LIBS $GFILENOTIFY_LIBS"
|
2013-06-03 18:47:35 +00:00
|
|
|
AC_MSG_CHECKING([whether GLib is linked in])
|
|
|
|
AC_LINK_IFELSE([AC_LANG_PROGRAM(
|
|
|
|
[[#include <glib.h>
|
|
|
|
]],
|
|
|
|
[[g_print ("Hello world");]])],
|
|
|
|
[links_glib=yes],
|
|
|
|
[links_glib=no])
|
|
|
|
AC_MSG_RESULT([$links_glib])
|
|
|
|
if test "${links_glib}" = "yes"; then
|
|
|
|
AC_DEFINE(HAVE_GLIB, 1, [Define to 1 if GLib is linked in.])
|
2013-06-08 18:13:24 +00:00
|
|
|
if test "$HAVE_NS" = no;then
|
|
|
|
XGSELOBJ=xgselect.o
|
|
|
|
fi
|
2013-06-03 18:47:35 +00:00
|
|
|
fi
|
2014-03-23 09:17:29 +00:00
|
|
|
CFLAGS="$OLDCFLAGS"
|
|
|
|
LIBS="$OLDLIBS"
|
2013-06-03 18:47:35 +00:00
|
|
|
AC_SUBST(XGSELOBJ)
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
dnl Adapted from Haible's version.
|
|
|
|
AC_CACHE_CHECK([for nl_langinfo and CODESET], emacs_cv_langinfo_codeset,
|
2011-03-26 19:29:10 +00:00
|
|
|
[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]],
|
|
|
|
[[char* cs = nl_langinfo(CODESET);]])],
|
2010-12-03 14:45:09 +00:00
|
|
|
emacs_cv_langinfo_codeset=yes,
|
|
|
|
emacs_cv_langinfo_codeset=no)
|
|
|
|
])
|
|
|
|
if test $emacs_cv_langinfo_codeset = yes; then
|
|
|
|
AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
|
|
|
|
[Define if you have <langinfo.h> and nl_langinfo(CODESET).])
|
|
|
|
fi
|
|
|
|
|
|
|
|
AC_TYPE_MBSTATE_T
|
|
|
|
|
|
|
|
dnl Fixme: AC_SYS_POSIX_TERMIOS should probably be used, but it's not clear
|
|
|
|
dnl how the tty code is related to POSIX and/or other versions of termios.
|
|
|
|
dnl The following looks like a useful start.
|
|
|
|
dnl
|
|
|
|
dnl AC_SYS_POSIX_TERMIOS
|
|
|
|
dnl if test $ac_cv_sys_posix_termios = yes; then
|
|
|
|
dnl AC_DEFINE(HAVE_TERMIOS, 1, [Define to 1 if you have POSIX-style functions
|
|
|
|
dnl and macros for terminal control.])
|
|
|
|
dnl AC_DEFINE(HAVE_TCATTR, 1, [Define to 1 if you have tcgetattr and tcsetattr.])
|
|
|
|
dnl fi
|
|
|
|
|
2012-07-31 17:50:52 +00:00
|
|
|
dnl Turned on June 1996 supposing nobody will mind it.
|
2013-03-29 19:53:25 +00:00
|
|
|
dnl MinGW emulates passwd database, so this feature doesn't make sense there.
|
|
|
|
if test "${opsys}" != "mingw32"; then
|
|
|
|
AC_DEFINE(AMPERSAND_FULL_NAME, 1, [Define to use the convention that &
|
|
|
|
in the full name stands for the login id.])
|
|
|
|
fi
|
2012-07-31 17:50:52 +00:00
|
|
|
|
2012-07-11 23:40:59 +00:00
|
|
|
dnl Everybody supports this, except MS.
|
|
|
|
dnl Seems like the kind of thing we should be testing for, though.
|
|
|
|
## Note: PTYs are broken on darwin <6. Use at your own risk.
|
2012-11-23 15:22:47 +00:00
|
|
|
if test "${opsys}" != "mingw32"; then
|
|
|
|
AC_DEFINE(HAVE_PTYS, 1, [Define if the system supports pty devices.])
|
|
|
|
fi
|
2012-07-11 23:40:59 +00:00
|
|
|
|
|
|
|
dnl Everybody supports this, except MS-DOS.
|
|
|
|
dnl Seems like the kind of thing we should be testing for, though.
|
|
|
|
dnl Compare with HAVE_INET_SOCKETS (which is unused...) above.
|
|
|
|
AC_DEFINE(HAVE_SOCKETS, 1, [Define if the system supports
|
|
|
|
4.2-compatible sockets.])
|
|
|
|
|
2012-08-01 02:02:47 +00:00
|
|
|
AH_TEMPLATE(INTERNAL_TERMINAL, [This is substituted when $TERM is "internal".])
|
|
|
|
|
2013-04-18 18:29:04 +00:00
|
|
|
AH_TEMPLATE(NULL_DEVICE, [Name of the file to open to get
|
|
|
|
a null file, or a data sink.])
|
2012-11-23 15:22:47 +00:00
|
|
|
if test "${opsys}" = "mingw32"; then
|
2013-04-18 18:29:04 +00:00
|
|
|
AC_DEFINE(NULL_DEVICE, ["NUL:"])
|
2012-11-23 15:22:47 +00:00
|
|
|
else
|
2013-04-18 18:29:04 +00:00
|
|
|
AC_DEFINE(NULL_DEVICE, ["/dev/null"])
|
2012-11-23 15:22:47 +00:00
|
|
|
fi
|
2012-07-31 22:24:49 +00:00
|
|
|
|
2012-11-23 15:22:47 +00:00
|
|
|
if test "${opsys}" = "mingw32"; then
|
2013-11-28 23:50:09 +00:00
|
|
|
SEPCHAR=';'
|
2012-11-23 15:22:47 +00:00
|
|
|
else
|
2013-11-28 23:50:09 +00:00
|
|
|
SEPCHAR=':'
|
2012-11-23 15:22:47 +00:00
|
|
|
fi
|
2013-11-28 23:50:09 +00:00
|
|
|
AC_DEFINE_UNQUOTED(SEPCHAR, ['$SEPCHAR'], [Character that separates PATH elements.])
|
|
|
|
dnl This is for MinGW, and is used in test/automated/Makefile.in.
|
|
|
|
dnl The MSYS Bash has heuristics for replacing ':' with ';' when it
|
|
|
|
dnl decides that a command-line argument to be passed to a MinGW program
|
|
|
|
dnl is a PATH-style list of directories. But that heuristics plays it
|
|
|
|
dnl safe, and only does the replacement when it is _absolutely_ sure it
|
2013-12-01 22:33:13 +00:00
|
|
|
dnl sees a colon-separated list of file names; e.g. ":." is left alone,
|
2013-11-28 23:50:09 +00:00
|
|
|
dnl which breaks in-tree builds. So we do this manually instead.
|
|
|
|
dnl Note that we cannot rely on PATH_SEPARATOR, as that one will always
|
|
|
|
dnl be computed as ':' in MSYS Bash.
|
|
|
|
AC_SUBST(SEPCHAR)
|
2012-07-31 22:24:49 +00:00
|
|
|
|
2012-07-31 17:50:52 +00:00
|
|
|
dnl Everybody supports this, except MS-DOS.
|
|
|
|
AC_DEFINE(subprocesses, 1, [Define to enable asynchronous subprocesses.])
|
|
|
|
|
2012-07-31 22:24:49 +00:00
|
|
|
AC_DEFINE(USER_FULL_NAME, [pw->pw_gecos], [How to get a user's full name.])
|
|
|
|
|
2012-07-11 23:40:59 +00:00
|
|
|
|
2012-08-10 00:02:10 +00:00
|
|
|
AC_DEFINE(DIRECTORY_SEP, ['/'],
|
|
|
|
[Character that separates directories in a file name.])
|
|
|
|
|
2012-11-23 15:22:47 +00:00
|
|
|
if test "${opsys}" = "mingw32"; then
|
Remove some unused macros from 'configure'.
* configure.ac (HAVE_SOUNDCARD_H, HAVE_LINUX_VERSION_H, HAVE_SPEED_T)
(HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY)
(HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION, HAVE_UTIMES)
(HAVE_LIBHESIOD, HAVE_LIBRESOLV, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB, HAVE_DES_H, HAVE_KERBEROSIV_DES_H)
(HAVE_DEV_PTMX, DEVICE_SEP, USG5):
Remove these macros, as they are not used.
(sys_siglist): Remove macro; src/sysdep.c now does this.
* src/sysdep.c (sys_siglist) [HAVE_DECL___SYS_SIGLIST]:
Define to __sys_siglist.
2013-07-02 16:56:29 +00:00
|
|
|
AC_DEFINE(IS_DEVICE_SEP(_c_), [((_c_) == ':')],
|
2012-11-23 15:22:47 +00:00
|
|
|
[Returns true if character is a device separator.])
|
2012-08-01 01:43:08 +00:00
|
|
|
|
2012-11-23 15:22:47 +00:00
|
|
|
AC_DEFINE(IS_DIRECTORY_SEP(_c_), [((_c_) == '/' || (_c_) == '\\')],
|
|
|
|
[Returns true if character is a directory separator.])
|
2012-08-01 01:43:08 +00:00
|
|
|
|
2012-11-23 15:22:47 +00:00
|
|
|
AC_DEFINE(IS_ANY_SEP(_c_), [(IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP(_c_))],
|
|
|
|
[Returns true if character is any form of separator.])
|
|
|
|
else
|
|
|
|
AC_DEFINE(IS_DEVICE_SEP(_c_), 0,
|
|
|
|
[Returns true if character is a device separator.])
|
2012-08-01 01:43:08 +00:00
|
|
|
|
2012-11-23 15:22:47 +00:00
|
|
|
AC_DEFINE(IS_DIRECTORY_SEP(_c_), [((_c_) == DIRECTORY_SEP)],
|
|
|
|
[Returns true if character is a directory separator.])
|
|
|
|
|
|
|
|
AC_DEFINE(IS_ANY_SEP(_c_), [(IS_DIRECTORY_SEP (_c_))],
|
|
|
|
[Returns true if character is any form of separator.])
|
|
|
|
fi
|
2012-08-01 01:43:08 +00:00
|
|
|
|
2012-07-12 21:14:13 +00:00
|
|
|
AH_TEMPLATE(NO_EDITRES, [Define if XEditRes should not be used.])
|
|
|
|
|
|
|
|
case $opsys in
|
|
|
|
aix4-2)
|
|
|
|
dnl Unfortunately without libXmu we cannot support EditRes.
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
if test "x$ac_cv_search_XmuConvertStandardSelection" = xno; then
|
2012-07-17 02:09:58 +00:00
|
|
|
AC_DEFINE(NO_EDITRES, 1)
|
2012-07-12 21:14:13 +00:00
|
|
|
fi
|
|
|
|
;;
|
|
|
|
|
|
|
|
hpux*)
|
|
|
|
dnl Assar Westerlund <assar@sics.se> says this is necessary for
|
|
|
|
dnl HP-UX 10.20, and that it works for HP-UX 0 as well.
|
|
|
|
AC_DEFINE(NO_EDITRES, 1)
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
2012-06-12 17:43:09 +00:00
|
|
|
case $opsys in
|
2012-07-13 01:19:06 +00:00
|
|
|
irix6-5 | sol2* | unixware )
|
|
|
|
dnl Some SVr4s don't define NSIG in sys/signal.h for ANSI environments;
|
|
|
|
dnl instead, there's a system variable _sys_nsig. Unfortunately, we
|
|
|
|
dnl need the constant to dimension an array. So wire in the appropriate
|
|
|
|
dnl value here.
|
|
|
|
AC_DEFINE(NSIG_MINIMUM, 32, [Minimum value of NSIG.])
|
|
|
|
;;
|
2012-06-12 17:43:09 +00:00
|
|
|
esac
|
|
|
|
|
Simplify SIGIO usage.
The code that dealt with SIGIO was crufty and confusing, e.g., it
played tricks like "#undef SIGIO" but these tricks were not used
consistently. Simplify mostly by not #undeffing standard symbols,
e.g., use "defined USABLE_SIGIO" (our symbol, which we can define
or not as we please) rather than "defined SIGIO" (standard symbol
that we probably shouldn't #undef).
* configure.ac (NO_TERMIO, BROKEN_FIONREAD, BROKEN_SIGAIO)
(BROKEN_SIGPOLL, BROKEN_SIGPTY): Remove.
(USABLE_FIONREAD, USABLE_SIGIO): New symbols. All uses of
'defined SIGIO' replaced with 'defined USABLE_SIGIO', with no need
to #undef SIGIO now (which was error-prone). Likewise, all uses
of 'defined FIONREAD' replaced with 'defined USABLE_FIONREAD'.
* src/admin/CPP_DEFINES (BROKEN_SIGAIO, BROKEN_SIGIO, BROKEN_SIGPOLL)
(BROKEN_SIGPTY, NO_TERMIO): Remove.
* src/conf_post.h [USG5_4]: Do not include <sys/wait.h> here.
Modules that need it can include it.
[USG5_4 && emacs]: Likewise, do not include the streams stuff here.
* src/dispextern.h (ignore_sigio): New decl.
* src/emacs.c (shut_down_emacs): Invoke unrequest_sigio
unconditionally, since it's now a no-op if !USABLE_SIGIO.
* src/emacs.c (shut_down_emacs):
* src/keyboard.c (kbd_buffer_store_event_hold):
Use ignore_sigio rather than invoking 'signal' directly.
* src/keyboard.c (USABLE_FIONREAD && USG5_4): Include <sys/filio.h>,
for FIONREAD.
(FIONREAD, SIGIO): Do not #undef.
(tty_read_avail_input): Use #error rather than a syntax error.
* src/process.c [USG5_4]: Include <sys/stream.h> and <sys/stropts.h>,
for I_PIPE, used by SETUP_SLAVE_PTY.
(DATAGRAM_SOCKETS): Simplify defn, based on USABLE_FIONREAD.
* src/sysdep.c (croak): Remove; no longer needed. This bit of
temporary code, with Fred N. Fish's comment that it's temporary,
has been in Emacs since at least 1992!
(init_sigio, reset_sigio, request_sigio, unrequest_sigio):
Arrange for them to be no-ops in all cases when ! USABLE_SIGIO.
* src/syssignal.h (croak): Remove decl.
(SIGIO, SIGPOO, SIGAIO, SIGPTY): Do not #undef; that's too fragile.
* src/systty.h [!NO_TERMIO]: Do not include <termio.h>; no longer needed
now that we're termios-only.
(FIONREAD, ASYNC) [BROKEN_FIONREAD]: Do not #undef.
* src/term.c (dissociate_if_controlling_tty): Use #error rather than
a run-time error.
Fixes: debbugs:12408
2012-09-13 02:21:28 +00:00
|
|
|
emacs_broken_SIGIO=no
|
2012-07-12 01:18:45 +00:00
|
|
|
|
2012-06-12 17:43:09 +00:00
|
|
|
case $opsys in
|
2012-07-12 01:18:45 +00:00
|
|
|
dnl SIGIO exists, but the feature doesn't work in the way Emacs needs.
|
|
|
|
dnl See eg <http://article.gmane.org/gmane.os.openbsd.ports/46831>.
|
2013-08-23 06:44:59 +00:00
|
|
|
hpux* | irix6-5 | openbsd | sol2* | unixware )
|
Simplify SIGIO usage.
The code that dealt with SIGIO was crufty and confusing, e.g., it
played tricks like "#undef SIGIO" but these tricks were not used
consistently. Simplify mostly by not #undeffing standard symbols,
e.g., use "defined USABLE_SIGIO" (our symbol, which we can define
or not as we please) rather than "defined SIGIO" (standard symbol
that we probably shouldn't #undef).
* configure.ac (NO_TERMIO, BROKEN_FIONREAD, BROKEN_SIGAIO)
(BROKEN_SIGPOLL, BROKEN_SIGPTY): Remove.
(USABLE_FIONREAD, USABLE_SIGIO): New symbols. All uses of
'defined SIGIO' replaced with 'defined USABLE_SIGIO', with no need
to #undef SIGIO now (which was error-prone). Likewise, all uses
of 'defined FIONREAD' replaced with 'defined USABLE_FIONREAD'.
* src/admin/CPP_DEFINES (BROKEN_SIGAIO, BROKEN_SIGIO, BROKEN_SIGPOLL)
(BROKEN_SIGPTY, NO_TERMIO): Remove.
* src/conf_post.h [USG5_4]: Do not include <sys/wait.h> here.
Modules that need it can include it.
[USG5_4 && emacs]: Likewise, do not include the streams stuff here.
* src/dispextern.h (ignore_sigio): New decl.
* src/emacs.c (shut_down_emacs): Invoke unrequest_sigio
unconditionally, since it's now a no-op if !USABLE_SIGIO.
* src/emacs.c (shut_down_emacs):
* src/keyboard.c (kbd_buffer_store_event_hold):
Use ignore_sigio rather than invoking 'signal' directly.
* src/keyboard.c (USABLE_FIONREAD && USG5_4): Include <sys/filio.h>,
for FIONREAD.
(FIONREAD, SIGIO): Do not #undef.
(tty_read_avail_input): Use #error rather than a syntax error.
* src/process.c [USG5_4]: Include <sys/stream.h> and <sys/stropts.h>,
for I_PIPE, used by SETUP_SLAVE_PTY.
(DATAGRAM_SOCKETS): Simplify defn, based on USABLE_FIONREAD.
* src/sysdep.c (croak): Remove; no longer needed. This bit of
temporary code, with Fred N. Fish's comment that it's temporary,
has been in Emacs since at least 1992!
(init_sigio, reset_sigio, request_sigio, unrequest_sigio):
Arrange for them to be no-ops in all cases when ! USABLE_SIGIO.
* src/syssignal.h (croak): Remove decl.
(SIGIO, SIGPOO, SIGAIO, SIGPTY): Do not #undef; that's too fragile.
* src/systty.h [!NO_TERMIO]: Do not include <termio.h>; no longer needed
now that we're termios-only.
(FIONREAD, ASYNC) [BROKEN_FIONREAD]: Do not #undef.
* src/term.c (dissociate_if_controlling_tty): Use #error rather than
a run-time error.
Fixes: debbugs:12408
2012-09-13 02:21:28 +00:00
|
|
|
emacs_broken_SIGIO=yes
|
2012-07-12 01:14:56 +00:00
|
|
|
;;
|
|
|
|
|
2012-07-12 01:18:45 +00:00
|
|
|
aix4-2)
|
2012-07-12 02:14:29 +00:00
|
|
|
dnl On AIX Emacs uses the gmalloc.c malloc implementation. But given
|
|
|
|
dnl the way this system works, libc functions that return malloced
|
|
|
|
dnl memory use the libc malloc implementation. Calling xfree or
|
|
|
|
dnl xrealloc on the results of such functions results in a crash.
|
|
|
|
dnl
|
|
|
|
dnl One solution for this could be to define SYSTEM_MALLOC in configure,
|
|
|
|
dnl but that does not currently work on this system.
|
|
|
|
dnl
|
|
|
|
dnl It is possible to completely override the malloc implementation on
|
|
|
|
dnl AIX, but that involves putting the malloc functions in a shared
|
|
|
|
dnl library and setting the MALLOCTYPE environment variable to point to
|
|
|
|
dnl that shared library.
|
|
|
|
dnl
|
|
|
|
dnl Emacs currently calls xrealloc on the results of get_current_dir name,
|
|
|
|
dnl to avoid a crash just use the Emacs implementation for that function.
|
|
|
|
dnl
|
|
|
|
dnl FIXME We could change the AC_CHECK_FUNCS call near the start
|
|
|
|
dnl of this file, so that we do not check for get_current_dir_name
|
|
|
|
dnl on AIX. But that might be fragile if something else ends
|
|
|
|
dnl up testing for get_current_dir_name as a dependency.
|
|
|
|
AC_DEFINE(BROKEN_GET_CURRENT_DIR_NAME, 1, [Define if
|
|
|
|
get_current_dir_name should not be used.])
|
|
|
|
;;
|
|
|
|
|
|
|
|
freebsd)
|
|
|
|
dnl Circumvent a bug in FreeBSD. In the following sequence of
|
|
|
|
dnl writes/reads on a PTY, read(2) returns bogus data:
|
|
|
|
dnl
|
|
|
|
dnl write(2) 1022 bytes
|
|
|
|
dnl write(2) 954 bytes, get EAGAIN
|
|
|
|
dnl read(2) 1024 bytes in process_read_output
|
|
|
|
dnl read(2) 11 bytes in process_read_output
|
|
|
|
dnl
|
|
|
|
dnl That is, read(2) returns more bytes than have ever been written
|
|
|
|
dnl successfully. The 1033 bytes read are the 1022 bytes written
|
|
|
|
dnl successfully after processing (for example with CRs added if the
|
|
|
|
dnl terminal is set up that way which it is here). The same bytes will
|
|
|
|
dnl be seen again in a later read(2), without the CRs.
|
|
|
|
AC_DEFINE(BROKEN_PTY_READ_AFTER_EAGAIN, 1, [Define on FreeBSD to
|
|
|
|
work around an issue when reading from a PTY.])
|
2012-07-12 01:18:45 +00:00
|
|
|
;;
|
2012-06-12 17:43:09 +00:00
|
|
|
esac
|
|
|
|
|
2012-06-12 19:03:32 +00:00
|
|
|
case $opsys in
|
|
|
|
gnu-* | sol2-10 )
|
|
|
|
dnl FIXME Can't we test if this exists (eg /proc/$$)?
|
|
|
|
AC_DEFINE(HAVE_PROCFS, 1, [Define if you have the /proc filesystem.])
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
2012-07-11 02:29:13 +00:00
|
|
|
case $opsys in
|
2013-04-18 17:12:21 +00:00
|
|
|
darwin | dragonfly | freebsd | netbsd | openbsd )
|
2012-07-11 02:29:13 +00:00
|
|
|
AC_DEFINE(DONT_REOPEN_PTY, 1, [Define if process.c does not need to
|
|
|
|
close a pty to make it a controlling terminal (it is already a
|
|
|
|
controlling terminal of the subprocess, because we did ioctl TIOCSCTTY).])
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
2012-07-11 02:16:25 +00:00
|
|
|
dnl FIXME Surely we can test for this rather than hard-code it.
|
|
|
|
case $opsys in
|
|
|
|
netbsd | openbsd) sound_device="/dev/audio" ;;
|
|
|
|
*) sound_device="/dev/dsp" ;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
dnl Used in sound.c
|
|
|
|
AC_DEFINE_UNQUOTED(DEFAULT_SOUND_DEVICE, "$sound_device",
|
|
|
|
[Name of the default sound device.])
|
|
|
|
|
2012-07-11 07:28:27 +00:00
|
|
|
|
2012-07-11 17:04:19 +00:00
|
|
|
dnl Emacs can read input using SIGIO and buffering characters itself,
|
|
|
|
dnl or using CBREAK mode and making C-g cause SIGINT.
|
|
|
|
dnl The choice is controlled by the variable interrupt_input.
|
|
|
|
dnl
|
|
|
|
dnl Define INTERRUPT_INPUT to make interrupt_input = 1 the default (use SIGIO)
|
|
|
|
dnl
|
Simplify SIGIO usage.
The code that dealt with SIGIO was crufty and confusing, e.g., it
played tricks like "#undef SIGIO" but these tricks were not used
consistently. Simplify mostly by not #undeffing standard symbols,
e.g., use "defined USABLE_SIGIO" (our symbol, which we can define
or not as we please) rather than "defined SIGIO" (standard symbol
that we probably shouldn't #undef).
* configure.ac (NO_TERMIO, BROKEN_FIONREAD, BROKEN_SIGAIO)
(BROKEN_SIGPOLL, BROKEN_SIGPTY): Remove.
(USABLE_FIONREAD, USABLE_SIGIO): New symbols. All uses of
'defined SIGIO' replaced with 'defined USABLE_SIGIO', with no need
to #undef SIGIO now (which was error-prone). Likewise, all uses
of 'defined FIONREAD' replaced with 'defined USABLE_FIONREAD'.
* src/admin/CPP_DEFINES (BROKEN_SIGAIO, BROKEN_SIGIO, BROKEN_SIGPOLL)
(BROKEN_SIGPTY, NO_TERMIO): Remove.
* src/conf_post.h [USG5_4]: Do not include <sys/wait.h> here.
Modules that need it can include it.
[USG5_4 && emacs]: Likewise, do not include the streams stuff here.
* src/dispextern.h (ignore_sigio): New decl.
* src/emacs.c (shut_down_emacs): Invoke unrequest_sigio
unconditionally, since it's now a no-op if !USABLE_SIGIO.
* src/emacs.c (shut_down_emacs):
* src/keyboard.c (kbd_buffer_store_event_hold):
Use ignore_sigio rather than invoking 'signal' directly.
* src/keyboard.c (USABLE_FIONREAD && USG5_4): Include <sys/filio.h>,
for FIONREAD.
(FIONREAD, SIGIO): Do not #undef.
(tty_read_avail_input): Use #error rather than a syntax error.
* src/process.c [USG5_4]: Include <sys/stream.h> and <sys/stropts.h>,
for I_PIPE, used by SETUP_SLAVE_PTY.
(DATAGRAM_SOCKETS): Simplify defn, based on USABLE_FIONREAD.
* src/sysdep.c (croak): Remove; no longer needed. This bit of
temporary code, with Fred N. Fish's comment that it's temporary,
has been in Emacs since at least 1992!
(init_sigio, reset_sigio, request_sigio, unrequest_sigio):
Arrange for them to be no-ops in all cases when ! USABLE_SIGIO.
* src/syssignal.h (croak): Remove decl.
(SIGIO, SIGPOO, SIGAIO, SIGPTY): Do not #undef; that's too fragile.
* src/systty.h [!NO_TERMIO]: Do not include <termio.h>; no longer needed
now that we're termios-only.
(FIONREAD, ASYNC) [BROKEN_FIONREAD]: Do not #undef.
* src/term.c (dissociate_if_controlling_tty): Use #error rather than
a run-time error.
Fixes: debbugs:12408
2012-09-13 02:21:28 +00:00
|
|
|
dnl Emacs uses the presence of the USABLE_SIGIO macro
|
2012-07-11 17:04:19 +00:00
|
|
|
dnl to indicate whether or not signal-driven I/O is possible. It uses
|
|
|
|
dnl INTERRUPT_INPUT to decide whether to use it by default.
|
|
|
|
dnl
|
|
|
|
dnl SIGIO can be used only on systems that implement it (4.2 and 4.3).
|
|
|
|
dnl CBREAK mode has two disadvantages
|
|
|
|
dnl 1) At least in 4.2, it is impossible to handle the Meta key properly.
|
|
|
|
dnl I hear that in system V this problem does not exist.
|
|
|
|
dnl 2) Control-G causes output to be discarded.
|
|
|
|
dnl I do not know whether this can be fixed in system V.
|
|
|
|
dnl
|
|
|
|
dnl Another method of doing input is planned but not implemented.
|
|
|
|
dnl It would have Emacs fork off a separate process
|
|
|
|
dnl to read the input and send it to the true Emacs process
|
|
|
|
dnl through a pipe.
|
|
|
|
case $opsys in
|
|
|
|
darwin | gnu-linux | gnu-kfreebsd )
|
|
|
|
AC_DEFINE(INTERRUPT_INPUT, 1, [Define to read input using SIGIO.])
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
2012-07-12 00:49:24 +00:00
|
|
|
dnl If the system's imake configuration file defines `NeedWidePrototypes'
|
|
|
|
dnl as `NO', we must define NARROWPROTO manually. Such a define is
|
|
|
|
dnl generated in the Makefile generated by `xmkmf'. If we don't define
|
|
|
|
dnl NARROWPROTO, we will see the wrong function prototypes for X functions
|
|
|
|
dnl taking float or double parameters.
|
|
|
|
case $opsys in
|
|
|
|
cygwin|gnu|gnu-linux|gnu-kfreebsd|irix6-5|freebsd|netbsd|openbsd)
|
|
|
|
AC_DEFINE(NARROWPROTO, 1, [Define if system's imake configuration
|
|
|
|
file defines `NeedWidePrototypes' as `NO'.])
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
2012-07-12 06:34:40 +00:00
|
|
|
dnl Used in process.c, this must be a loop, even if it only runs once.
|
|
|
|
dnl (Except on SGI; see below. Take that, clarity and consistency!)
|
|
|
|
AH_TEMPLATE(PTY_ITERATION, [How to iterate over PTYs.])
|
|
|
|
dnl Only used if !PTY_ITERATION. Iterate from FIRST_PTY_LETTER to z,
|
|
|
|
dnl trying suffixes 0-16.
|
|
|
|
AH_TEMPLATE(FIRST_PTY_LETTER, [Letter to use in finding device name of
|
|
|
|
first PTY, if PTYs are supported.])
|
2012-07-12 07:10:44 +00:00
|
|
|
AH_TEMPLATE(PTY_OPEN, [How to open a PTY, if non-standard.])
|
2012-07-12 07:43:05 +00:00
|
|
|
AH_TEMPLATE(PTY_NAME_SPRINTF, [How to get the device name of the control
|
|
|
|
end of a PTY, if non-standard.])
|
|
|
|
AH_TEMPLATE(PTY_TTY_NAME_SPRINTF, [How to get device name of the tty
|
|
|
|
end of a PTY, if non-standard.])
|
2012-07-12 06:34:40 +00:00
|
|
|
|
|
|
|
case $opsys in
|
|
|
|
aix4-2 )
|
2012-08-03 20:34:35 +00:00
|
|
|
AC_DEFINE(PTY_ITERATION, [int c; for (c = 0; !c ; c++)])
|
2012-07-12 07:43:05 +00:00
|
|
|
dnl You allocate a pty by opening /dev/ptc to get the master side.
|
|
|
|
dnl To get the name of the slave side, you just ttyname() the master side.
|
2012-08-03 20:34:35 +00:00
|
|
|
AC_DEFINE(PTY_NAME_SPRINTF, [strcpy (pty_name, "/dev/ptc");])
|
|
|
|
AC_DEFINE(PTY_TTY_NAME_SPRINTF, [strcpy (pty_name, ttyname (fd));])
|
2012-07-12 06:34:40 +00:00
|
|
|
;;
|
|
|
|
|
|
|
|
cygwin )
|
2012-08-03 20:34:35 +00:00
|
|
|
AC_DEFINE(PTY_ITERATION, [int i; for (i = 0; i < 1; i++)])
|
2012-07-12 07:10:44 +00:00
|
|
|
dnl multi-line AC_DEFINEs are hard. :(
|
Use bool for boolean, focusing on headers.
* configure.ac (PTY_OPEN, GC_MARK_SECONDARY_STACK):
Use bool for boolean.
* lib-src/emacsclient.c, lib-src/etags.c, lib-src/hexl.c (FALSE, TRUE):
Remove. All uses replaced with uncapitalized version.
* lib-src/emacsclient.c (message):
* lib-src/etags.c (make_tag, pfnote, consider_token, make_C_tag, lang_names):
* lib-src/hexl.c (un_flag, iso_flag, endian):
* lib-src/pop.c (pop_debug, pop_open, pop_multi_first, pop_multi_next)
(pop_trash):
Use bool for boolean.
* lib-src/etags.c (bool): Remove.
* lib-src/etags.c (globals, members, declarations, no_line_directive)
(no_duplicates): Use 'int' for boolean values that getopt requires
to be 'int'. Formerly, these were 'bool' and 'bool' was 'int',
but we can no longer rely on this implementation.
* lib-src/pop.h (struct _popserver): Use bool_bf for boolean bit-fields.
* lwlib/xlwmenuP.h (XlwMenu_part): Use bool_bf for boolean bit-fields.
* src/atimer.h, src/lisp.h, src/syssignal.h, src/syswait.h, src/unexelf.c:
No need to include <stdbool.h>, since conf_post.h does it now.
* src/buffer.h (BUF_COMPUTE_UNCHANGED, DECODE_POSITION)
(BUFFER_CHECK_INDIRECTION, GET_OVERLAYS_AT, PER_BUFFER_VALUE_P)
(SET_PER_BUFFER_VALUE_P):
* src/ccl.c, src/ccl.h (setup_ccl_program):
* src/ccl.h (CHECK_CCL_PROGRAM):
* src/character.h (MAKE_CHAR_UNIBYTE, CHECK_CHARACTER_CAR)
(CHECK_CHARACTER_CDR, CHAR_STRING_ADVANCE, NEXT_CHAR_BOUNDARY)
(PREV_CHAR_BOUNDARY, FETCH_STRING_CHAR_ADVANCE)
(FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE)
(FETCH_STRING_CHAR_ADVANCE_NO_CHECK, FETCH_CHAR_ADVANCE)
(FETCH_CHAR_ADVANCE_NO_CHECK, INC_POS, DEC_POS, INC_BOTH)
(DEC_BOTH, BUF_INC_POS, BUF_DEC_POS):
* src/charset.h (CHECK_CHARSET, CHECK_CHARSET_GET_ID)
(CHECK_CHARSET_GET_ATTR, CHECK_CHARSET_GET_CHARSET)
(CHARSET_FAST_MAP_SET):
* src/coding.c (decode_coding_ccl, encode_coding_ccl):
* src/coding.h (CHECK_CODING_SYSTEM, CHECK_CODING_SYSTEM_GET_SPEC)
(CHECK_CODING_SYSTEM_GET_ID, SJIS_TO_JIS, SJIS_TO_JIS2)
(JIS_TO_SJIS, JIS_TO_SJIS2, ENCODE_FILE, DECODE_FILE)
(ENCODE_SYSTEM, DECODE_SYSTEM, ENCODE_UTF_8)
(decode_coding_c_string):
* src/composite.h (COMPOSITION_DECODE_REFS, COMPOSITION_DECODE_RULE):
* src/conf_post.h (has_attribute):
* src/dispextern.h (trace_redisplay_p):
(INC_TEXT_POS, DEC_TEXT_POS, SET_GLYPH_FROM_GLYPH_CODE)
(SET_CHAR_GLYPH, SET_CHAR_GLYPH_FROM_GLYPH)
(SET_GLYPH_FROM_CHAR_GLYPH):
(WINDOW_WANTS_MODELINE_P, WINDOW_WANTS_HEADER_LINE_P)
(FACE_SUITABLE_FOR_ASCII_CHAR_P, FACE_SUITABLE_FOR_CHAR_P)
(PRODUCE_GLYPHS, reset_mouse_highlight, in_display_vector_p)
(cursor_in_mouse_face_p):
* src/dispnew.c (adjust_glyph_matrix, clear_glyph_matrix_rows)
(blank_row, prepare_desired_row)
(build_frame_matrix_from_leaf_window, make_current)
(mirror_make_current, mirrored_line_dance, mirror_line_dance)
(update_window, scrolling_window, update_frame_line):
* src/disptab.h (GLYPH_FOLLOW_ALIASES):
* src/editfns.c (Fformat):
* src/font.h (FONT_WEIGHT_SYMBOLIC, FONT_SLANT_SYMBOLIC)
(FONT_WIDTH_SYMBOLIC, FONT_WEIGHT_FOR_FACE, FONT_SLANT_FOR_FACE)
(FONT_WIDTH_FOR_FACE, FONT_WEIGHT_NAME_NUMERIC)
(FONT_SLANT_NAME_NUMERIC, FONT_WIDTH_NAME_NUMERIC)
(FONT_SET_STYLE, CHECK_FONT, CHECK_FONT_SPEC, CHECK_FONT_ENTITY)
(CHECK_FONT_OBJECT, CHECK_FONT_GET_OBJECT, FONT_ADD_LOG)
(FONT_DEFERRED_LOG):
* src/frame.h (FRAME_W32_P, FRAME_MSDOS_P, FRAME_WINDOW_P):
(FRAME_EXTERNAL_TOOL_BAR, FRAME_EXTERNAL_MENU_BAR, FOR_EACH_FRAME)
(FRAME_MOUSE_UPDATE):
* src/fringe.c (Fdefine_fringe_bitmap):
* src/image.c (x_create_bitmap_from_data, x_create_bitmap_mask)
(x_create_bitmap_from_xpm_data, xpm_load_image):
* src/intervals.h (INTERVAL_HAS_PARENT, INTERVAL_PARENT)
(set_interval_parent, RESET_INTERVAL, COPY_INTERVAL_CACHE)
(MERGE_INTERVAL_CACHE):
* src/keymap.h (KEYMAPP):
* src/lisp.h (eassert, USE_LSB_TAG, CHECK_LISP_OBJECT_TYPE)
(STRING_SET_UNIBYTE, STRING_SET_MULTIBYTE, DEFSYM, PSEUDOVECTORP)
(CHECK_RANGED_INTEGER, CHECK_TYPE_RANGED_INTEGER)
(CHECK_NUMBER_COERCE_MARKER, CHECK_NUMBER_OR_FLOAT_COERCE_MARKER)
(DEFVAR_LISP, DEFVAR_LISP_NOPRO, DEFVAR_BOOL, DEFVAR_INT)
(DEFVAR_BUFFER_DEFAULTS, DEFVAR_KBOARD, QUIT)
(RETURN_UNGCPRO, USE_SAFE_ALLOCA, SAFE_NALLOCA, SAFE_FREE)
(SAFE_ALLOCA_LISP, FOR_EACH_ALIST_VALUE, functionp):
* src/syntax.h (SYNTAX_ENTRY, SYNTAX_WITH_FLAGS, SYNTAX)
(UPDATE_SYNTAX_TABLE_FORWARD, UPDATE_SYNTAX_TABLE_BACKWARD)
(SETUP_BUFFER_SYNTAX_TABLE):
* src/systime.h (timespec_valid_p):
* src/term.c (save_and_enable_current_matrix):
* src/window.h (WINDOW_MENU_BAR_P, WINDOW_TOOL_BAR_P):
* src/xdisp.c (in_display_vector_p, display_tool_bar_line)
(redisplay_internal, try_window_reusing_current_matrix)
(sync_frame_with_window_matrix_rows, try_window_id)
(display_menu_bar, display_tty_menu_item, display_mode_line)
(coords_in_mouse_face_p, cursor_in_mouse_face_p):
* src/xmenu.c (xmenu_show):
* src/xterm.c (use_xim, x_term_init):
* src/xterm.h (XSync, GTK_CHECK_VERSION, use_xim, SET_SCROLL_BAR_X_WIDGET)
(struct x_bitmap_record):
Use bool for booleans.
* src/ccl.c (struct buffer_text):
* src/ccl.h (struct ccl_program):
* src/charset.h (struct charset):
* src/cm.h (struct cm):
* src/coding.h (struct iso_2022_spec, struct coding_system):
* src/dispextern.h (struct glyph, struct glyph_matrix, struct glyph_row)
(struct glyph_string, struct face, struct face_cache)
(struct bidi_string_data, struct bidi_it)
(struct draw_fringe_bitmap_params, struct it, Mouse_HLInfo)
(struct image):
* src/editfns.c (Fformat):
* src/frame.h (struct frame):
* src/fringe.c (struct fringe_bitmap):
* src/intervals.h (struct interval):
* src/keyboard.h (struct kboard):
* src/lisp.h (struct Lisp_Symbol, struct Lisp_Misc_Any, struct Lisp_Marker)
(struct Lisp_Overlay, struct Lisp_Save_Value, struct Lisp_Free)
(struct Lisp_Buffer_Local_Value, union specbinding):
* src/macfont.m (struct macfont_info):
* src/process.h (struct Lisp_Process):
* src/termchar.h (struct tty_display_info):
* src/window.h (struct window):
* src/xterm.h (struct x_output):
Use bool_bf for boolean bit-fields.
* src/ccl.c (setup_ccl_program): Now returns bool instead of -1 or 0.
All callers changed.
* src/ccl.h (struct ccl_program): Remove unused members private_state,
src_multibyte, dst_multibyte, cr_consumed, suppress_error,
eight_bit_control.
(struct ccl_spec): Remove unused members cr_carryover,
eight_bit_carryover.
* src/conf_post.h: Include <stdbool.h>.
(bool_bf): New type.
* src/dispextern.h (TRACE, PREPARE_FACE_FOR_DISPLAY):
* src/interval.h (RESET_INTERVAL, COPY_INTERVAL_CACHE, MERGE_INTERVAL_CACHE)
Surround statement macro with proper 'do { ... } while (false)' brackets.
(SET_MATRIX_ROW_ENABLED_P): Assume 2nd arg is bool.
(PRODUCE_GLYPHS): Simplify use of boolean.
* src/fileio.c (Fcopy_file):
If I is an integer, prefer 'if (I != 0)' to 'if (I)'.
* src/lisp.h (UNGCPRO): Return void, not int.
(FOR_EACH_TAIL): Use void expression, not int expression.
* src/region-cache.c: Reindent.
* src/region-cache.h: Copy comments from region-cache.c, to fix
incorrect remarks about booleans.
2013-12-14 21:36:44 +00:00
|
|
|
AC_DEFINE(PTY_OPEN, [ do { int dummy; sigset_t blocked, procmask; sigemptyset (&blocked); sigaddset (&blocked, SIGCHLD); pthread_sigmask (SIG_BLOCK, &blocked, &procmask); if (-1 == openpty (&fd, &dummy, pty_name, 0, 0)) fd = -1; pthread_sigmask (SIG_SETMASK, &procmask, 0); if (fd >= 0) emacs_close (dummy); } while (false)])
|
2012-08-03 20:34:35 +00:00
|
|
|
AC_DEFINE(PTY_NAME_SPRINTF, [])
|
|
|
|
AC_DEFINE(PTY_TTY_NAME_SPRINTF, [])
|
2012-07-12 06:34:40 +00:00
|
|
|
;;
|
|
|
|
|
2012-08-17 07:20:10 +00:00
|
|
|
dnl FIXME? Maybe use same as freebsd - see bug#12040.
|
2012-07-12 06:34:40 +00:00
|
|
|
darwin )
|
2012-08-03 20:34:35 +00:00
|
|
|
AC_DEFINE(PTY_ITERATION, [int i; for (i = 0; i < 1; i++)])
|
2012-07-12 06:34:40 +00:00
|
|
|
dnl Not used, because PTY_ITERATION is defined.
|
|
|
|
AC_DEFINE(FIRST_PTY_LETTER, ['p'])
|
2012-07-12 07:10:44 +00:00
|
|
|
dnl Note that openpty may fork via grantpt on Mac OS X 10.4/Darwin 8.
|
|
|
|
dnl But we don't have to block SIGCHLD because it is blocked in the
|
|
|
|
dnl implementation of grantpt.
|
Use bool for boolean, focusing on headers.
* configure.ac (PTY_OPEN, GC_MARK_SECONDARY_STACK):
Use bool for boolean.
* lib-src/emacsclient.c, lib-src/etags.c, lib-src/hexl.c (FALSE, TRUE):
Remove. All uses replaced with uncapitalized version.
* lib-src/emacsclient.c (message):
* lib-src/etags.c (make_tag, pfnote, consider_token, make_C_tag, lang_names):
* lib-src/hexl.c (un_flag, iso_flag, endian):
* lib-src/pop.c (pop_debug, pop_open, pop_multi_first, pop_multi_next)
(pop_trash):
Use bool for boolean.
* lib-src/etags.c (bool): Remove.
* lib-src/etags.c (globals, members, declarations, no_line_directive)
(no_duplicates): Use 'int' for boolean values that getopt requires
to be 'int'. Formerly, these were 'bool' and 'bool' was 'int',
but we can no longer rely on this implementation.
* lib-src/pop.h (struct _popserver): Use bool_bf for boolean bit-fields.
* lwlib/xlwmenuP.h (XlwMenu_part): Use bool_bf for boolean bit-fields.
* src/atimer.h, src/lisp.h, src/syssignal.h, src/syswait.h, src/unexelf.c:
No need to include <stdbool.h>, since conf_post.h does it now.
* src/buffer.h (BUF_COMPUTE_UNCHANGED, DECODE_POSITION)
(BUFFER_CHECK_INDIRECTION, GET_OVERLAYS_AT, PER_BUFFER_VALUE_P)
(SET_PER_BUFFER_VALUE_P):
* src/ccl.c, src/ccl.h (setup_ccl_program):
* src/ccl.h (CHECK_CCL_PROGRAM):
* src/character.h (MAKE_CHAR_UNIBYTE, CHECK_CHARACTER_CAR)
(CHECK_CHARACTER_CDR, CHAR_STRING_ADVANCE, NEXT_CHAR_BOUNDARY)
(PREV_CHAR_BOUNDARY, FETCH_STRING_CHAR_ADVANCE)
(FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE)
(FETCH_STRING_CHAR_ADVANCE_NO_CHECK, FETCH_CHAR_ADVANCE)
(FETCH_CHAR_ADVANCE_NO_CHECK, INC_POS, DEC_POS, INC_BOTH)
(DEC_BOTH, BUF_INC_POS, BUF_DEC_POS):
* src/charset.h (CHECK_CHARSET, CHECK_CHARSET_GET_ID)
(CHECK_CHARSET_GET_ATTR, CHECK_CHARSET_GET_CHARSET)
(CHARSET_FAST_MAP_SET):
* src/coding.c (decode_coding_ccl, encode_coding_ccl):
* src/coding.h (CHECK_CODING_SYSTEM, CHECK_CODING_SYSTEM_GET_SPEC)
(CHECK_CODING_SYSTEM_GET_ID, SJIS_TO_JIS, SJIS_TO_JIS2)
(JIS_TO_SJIS, JIS_TO_SJIS2, ENCODE_FILE, DECODE_FILE)
(ENCODE_SYSTEM, DECODE_SYSTEM, ENCODE_UTF_8)
(decode_coding_c_string):
* src/composite.h (COMPOSITION_DECODE_REFS, COMPOSITION_DECODE_RULE):
* src/conf_post.h (has_attribute):
* src/dispextern.h (trace_redisplay_p):
(INC_TEXT_POS, DEC_TEXT_POS, SET_GLYPH_FROM_GLYPH_CODE)
(SET_CHAR_GLYPH, SET_CHAR_GLYPH_FROM_GLYPH)
(SET_GLYPH_FROM_CHAR_GLYPH):
(WINDOW_WANTS_MODELINE_P, WINDOW_WANTS_HEADER_LINE_P)
(FACE_SUITABLE_FOR_ASCII_CHAR_P, FACE_SUITABLE_FOR_CHAR_P)
(PRODUCE_GLYPHS, reset_mouse_highlight, in_display_vector_p)
(cursor_in_mouse_face_p):
* src/dispnew.c (adjust_glyph_matrix, clear_glyph_matrix_rows)
(blank_row, prepare_desired_row)
(build_frame_matrix_from_leaf_window, make_current)
(mirror_make_current, mirrored_line_dance, mirror_line_dance)
(update_window, scrolling_window, update_frame_line):
* src/disptab.h (GLYPH_FOLLOW_ALIASES):
* src/editfns.c (Fformat):
* src/font.h (FONT_WEIGHT_SYMBOLIC, FONT_SLANT_SYMBOLIC)
(FONT_WIDTH_SYMBOLIC, FONT_WEIGHT_FOR_FACE, FONT_SLANT_FOR_FACE)
(FONT_WIDTH_FOR_FACE, FONT_WEIGHT_NAME_NUMERIC)
(FONT_SLANT_NAME_NUMERIC, FONT_WIDTH_NAME_NUMERIC)
(FONT_SET_STYLE, CHECK_FONT, CHECK_FONT_SPEC, CHECK_FONT_ENTITY)
(CHECK_FONT_OBJECT, CHECK_FONT_GET_OBJECT, FONT_ADD_LOG)
(FONT_DEFERRED_LOG):
* src/frame.h (FRAME_W32_P, FRAME_MSDOS_P, FRAME_WINDOW_P):
(FRAME_EXTERNAL_TOOL_BAR, FRAME_EXTERNAL_MENU_BAR, FOR_EACH_FRAME)
(FRAME_MOUSE_UPDATE):
* src/fringe.c (Fdefine_fringe_bitmap):
* src/image.c (x_create_bitmap_from_data, x_create_bitmap_mask)
(x_create_bitmap_from_xpm_data, xpm_load_image):
* src/intervals.h (INTERVAL_HAS_PARENT, INTERVAL_PARENT)
(set_interval_parent, RESET_INTERVAL, COPY_INTERVAL_CACHE)
(MERGE_INTERVAL_CACHE):
* src/keymap.h (KEYMAPP):
* src/lisp.h (eassert, USE_LSB_TAG, CHECK_LISP_OBJECT_TYPE)
(STRING_SET_UNIBYTE, STRING_SET_MULTIBYTE, DEFSYM, PSEUDOVECTORP)
(CHECK_RANGED_INTEGER, CHECK_TYPE_RANGED_INTEGER)
(CHECK_NUMBER_COERCE_MARKER, CHECK_NUMBER_OR_FLOAT_COERCE_MARKER)
(DEFVAR_LISP, DEFVAR_LISP_NOPRO, DEFVAR_BOOL, DEFVAR_INT)
(DEFVAR_BUFFER_DEFAULTS, DEFVAR_KBOARD, QUIT)
(RETURN_UNGCPRO, USE_SAFE_ALLOCA, SAFE_NALLOCA, SAFE_FREE)
(SAFE_ALLOCA_LISP, FOR_EACH_ALIST_VALUE, functionp):
* src/syntax.h (SYNTAX_ENTRY, SYNTAX_WITH_FLAGS, SYNTAX)
(UPDATE_SYNTAX_TABLE_FORWARD, UPDATE_SYNTAX_TABLE_BACKWARD)
(SETUP_BUFFER_SYNTAX_TABLE):
* src/systime.h (timespec_valid_p):
* src/term.c (save_and_enable_current_matrix):
* src/window.h (WINDOW_MENU_BAR_P, WINDOW_TOOL_BAR_P):
* src/xdisp.c (in_display_vector_p, display_tool_bar_line)
(redisplay_internal, try_window_reusing_current_matrix)
(sync_frame_with_window_matrix_rows, try_window_id)
(display_menu_bar, display_tty_menu_item, display_mode_line)
(coords_in_mouse_face_p, cursor_in_mouse_face_p):
* src/xmenu.c (xmenu_show):
* src/xterm.c (use_xim, x_term_init):
* src/xterm.h (XSync, GTK_CHECK_VERSION, use_xim, SET_SCROLL_BAR_X_WIDGET)
(struct x_bitmap_record):
Use bool for booleans.
* src/ccl.c (struct buffer_text):
* src/ccl.h (struct ccl_program):
* src/charset.h (struct charset):
* src/cm.h (struct cm):
* src/coding.h (struct iso_2022_spec, struct coding_system):
* src/dispextern.h (struct glyph, struct glyph_matrix, struct glyph_row)
(struct glyph_string, struct face, struct face_cache)
(struct bidi_string_data, struct bidi_it)
(struct draw_fringe_bitmap_params, struct it, Mouse_HLInfo)
(struct image):
* src/editfns.c (Fformat):
* src/frame.h (struct frame):
* src/fringe.c (struct fringe_bitmap):
* src/intervals.h (struct interval):
* src/keyboard.h (struct kboard):
* src/lisp.h (struct Lisp_Symbol, struct Lisp_Misc_Any, struct Lisp_Marker)
(struct Lisp_Overlay, struct Lisp_Save_Value, struct Lisp_Free)
(struct Lisp_Buffer_Local_Value, union specbinding):
* src/macfont.m (struct macfont_info):
* src/process.h (struct Lisp_Process):
* src/termchar.h (struct tty_display_info):
* src/window.h (struct window):
* src/xterm.h (struct x_output):
Use bool_bf for boolean bit-fields.
* src/ccl.c (setup_ccl_program): Now returns bool instead of -1 or 0.
All callers changed.
* src/ccl.h (struct ccl_program): Remove unused members private_state,
src_multibyte, dst_multibyte, cr_consumed, suppress_error,
eight_bit_control.
(struct ccl_spec): Remove unused members cr_carryover,
eight_bit_carryover.
* src/conf_post.h: Include <stdbool.h>.
(bool_bf): New type.
* src/dispextern.h (TRACE, PREPARE_FACE_FOR_DISPLAY):
* src/interval.h (RESET_INTERVAL, COPY_INTERVAL_CACHE, MERGE_INTERVAL_CACHE)
Surround statement macro with proper 'do { ... } while (false)' brackets.
(SET_MATRIX_ROW_ENABLED_P): Assume 2nd arg is bool.
(PRODUCE_GLYPHS): Simplify use of boolean.
* src/fileio.c (Fcopy_file):
If I is an integer, prefer 'if (I != 0)' to 'if (I)'.
* src/lisp.h (UNGCPRO): Return void, not int.
(FOR_EACH_TAIL): Use void expression, not int expression.
* src/region-cache.c: Reindent.
* src/region-cache.h: Copy comments from region-cache.c, to fix
incorrect remarks about booleans.
2013-12-14 21:36:44 +00:00
|
|
|
AC_DEFINE(PTY_OPEN, [ do { int slave; if (openpty (&fd, &slave, pty_name, NULL, NULL) == -1) fd = -1; else emacs_close (slave); } while (false)])
|
2012-08-03 20:34:35 +00:00
|
|
|
AC_DEFINE(PTY_NAME_SPRINTF, [])
|
|
|
|
AC_DEFINE(PTY_TTY_NAME_SPRINTF, [])
|
2012-07-12 06:34:40 +00:00
|
|
|
;;
|
|
|
|
|
2012-08-17 07:20:10 +00:00
|
|
|
gnu | openbsd )
|
2012-07-12 06:34:40 +00:00
|
|
|
AC_DEFINE(FIRST_PTY_LETTER, ['p'])
|
|
|
|
;;
|
|
|
|
|
2013-04-18 17:12:21 +00:00
|
|
|
gnu-linux | gnu-kfreebsd | dragonfly | freebsd | netbsd )
|
2012-07-12 06:34:40 +00:00
|
|
|
dnl if HAVE_GRANTPT
|
|
|
|
if test "x$ac_cv_func_grantpt" = xyes; then
|
2012-07-12 19:48:21 +00:00
|
|
|
AC_DEFINE(UNIX98_PTYS, 1, [Define if the system has Unix98 PTYs.])
|
2012-08-03 20:34:35 +00:00
|
|
|
AC_DEFINE(PTY_ITERATION, [int i; for (i = 0; i < 1; i++)])
|
2012-07-12 07:43:05 +00:00
|
|
|
dnl Note that grantpt and unlockpt may fork. We must block SIGCHLD
|
|
|
|
dnl to prevent sigchld_handler from intercepting the child's death.
|
2013-07-20 15:33:00 +00:00
|
|
|
AC_DEFINE(PTY_TTY_NAME_SPRINTF, [{ char *ptyname = 0; sigset_t blocked; sigemptyset (&blocked); sigaddset (&blocked, SIGCHLD); pthread_sigmask (SIG_BLOCK, &blocked, 0); if (grantpt (fd) != -1 && unlockpt (fd) != -1) ptyname = ptsname(fd); pthread_sigmask (SIG_UNBLOCK, &blocked, 0); if (!ptyname) { emacs_close (fd); return -1; } snprintf (pty_name, PTY_NAME_SIZE, "%s", ptyname); }])
|
2012-08-17 07:20:10 +00:00
|
|
|
dnl if HAVE_POSIX_OPENPT
|
|
|
|
if test "x$ac_cv_func_posix_openpt" = xyes; then
|
Use bool for boolean, focusing on headers.
* configure.ac (PTY_OPEN, GC_MARK_SECONDARY_STACK):
Use bool for boolean.
* lib-src/emacsclient.c, lib-src/etags.c, lib-src/hexl.c (FALSE, TRUE):
Remove. All uses replaced with uncapitalized version.
* lib-src/emacsclient.c (message):
* lib-src/etags.c (make_tag, pfnote, consider_token, make_C_tag, lang_names):
* lib-src/hexl.c (un_flag, iso_flag, endian):
* lib-src/pop.c (pop_debug, pop_open, pop_multi_first, pop_multi_next)
(pop_trash):
Use bool for boolean.
* lib-src/etags.c (bool): Remove.
* lib-src/etags.c (globals, members, declarations, no_line_directive)
(no_duplicates): Use 'int' for boolean values that getopt requires
to be 'int'. Formerly, these were 'bool' and 'bool' was 'int',
but we can no longer rely on this implementation.
* lib-src/pop.h (struct _popserver): Use bool_bf for boolean bit-fields.
* lwlib/xlwmenuP.h (XlwMenu_part): Use bool_bf for boolean bit-fields.
* src/atimer.h, src/lisp.h, src/syssignal.h, src/syswait.h, src/unexelf.c:
No need to include <stdbool.h>, since conf_post.h does it now.
* src/buffer.h (BUF_COMPUTE_UNCHANGED, DECODE_POSITION)
(BUFFER_CHECK_INDIRECTION, GET_OVERLAYS_AT, PER_BUFFER_VALUE_P)
(SET_PER_BUFFER_VALUE_P):
* src/ccl.c, src/ccl.h (setup_ccl_program):
* src/ccl.h (CHECK_CCL_PROGRAM):
* src/character.h (MAKE_CHAR_UNIBYTE, CHECK_CHARACTER_CAR)
(CHECK_CHARACTER_CDR, CHAR_STRING_ADVANCE, NEXT_CHAR_BOUNDARY)
(PREV_CHAR_BOUNDARY, FETCH_STRING_CHAR_ADVANCE)
(FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE)
(FETCH_STRING_CHAR_ADVANCE_NO_CHECK, FETCH_CHAR_ADVANCE)
(FETCH_CHAR_ADVANCE_NO_CHECK, INC_POS, DEC_POS, INC_BOTH)
(DEC_BOTH, BUF_INC_POS, BUF_DEC_POS):
* src/charset.h (CHECK_CHARSET, CHECK_CHARSET_GET_ID)
(CHECK_CHARSET_GET_ATTR, CHECK_CHARSET_GET_CHARSET)
(CHARSET_FAST_MAP_SET):
* src/coding.c (decode_coding_ccl, encode_coding_ccl):
* src/coding.h (CHECK_CODING_SYSTEM, CHECK_CODING_SYSTEM_GET_SPEC)
(CHECK_CODING_SYSTEM_GET_ID, SJIS_TO_JIS, SJIS_TO_JIS2)
(JIS_TO_SJIS, JIS_TO_SJIS2, ENCODE_FILE, DECODE_FILE)
(ENCODE_SYSTEM, DECODE_SYSTEM, ENCODE_UTF_8)
(decode_coding_c_string):
* src/composite.h (COMPOSITION_DECODE_REFS, COMPOSITION_DECODE_RULE):
* src/conf_post.h (has_attribute):
* src/dispextern.h (trace_redisplay_p):
(INC_TEXT_POS, DEC_TEXT_POS, SET_GLYPH_FROM_GLYPH_CODE)
(SET_CHAR_GLYPH, SET_CHAR_GLYPH_FROM_GLYPH)
(SET_GLYPH_FROM_CHAR_GLYPH):
(WINDOW_WANTS_MODELINE_P, WINDOW_WANTS_HEADER_LINE_P)
(FACE_SUITABLE_FOR_ASCII_CHAR_P, FACE_SUITABLE_FOR_CHAR_P)
(PRODUCE_GLYPHS, reset_mouse_highlight, in_display_vector_p)
(cursor_in_mouse_face_p):
* src/dispnew.c (adjust_glyph_matrix, clear_glyph_matrix_rows)
(blank_row, prepare_desired_row)
(build_frame_matrix_from_leaf_window, make_current)
(mirror_make_current, mirrored_line_dance, mirror_line_dance)
(update_window, scrolling_window, update_frame_line):
* src/disptab.h (GLYPH_FOLLOW_ALIASES):
* src/editfns.c (Fformat):
* src/font.h (FONT_WEIGHT_SYMBOLIC, FONT_SLANT_SYMBOLIC)
(FONT_WIDTH_SYMBOLIC, FONT_WEIGHT_FOR_FACE, FONT_SLANT_FOR_FACE)
(FONT_WIDTH_FOR_FACE, FONT_WEIGHT_NAME_NUMERIC)
(FONT_SLANT_NAME_NUMERIC, FONT_WIDTH_NAME_NUMERIC)
(FONT_SET_STYLE, CHECK_FONT, CHECK_FONT_SPEC, CHECK_FONT_ENTITY)
(CHECK_FONT_OBJECT, CHECK_FONT_GET_OBJECT, FONT_ADD_LOG)
(FONT_DEFERRED_LOG):
* src/frame.h (FRAME_W32_P, FRAME_MSDOS_P, FRAME_WINDOW_P):
(FRAME_EXTERNAL_TOOL_BAR, FRAME_EXTERNAL_MENU_BAR, FOR_EACH_FRAME)
(FRAME_MOUSE_UPDATE):
* src/fringe.c (Fdefine_fringe_bitmap):
* src/image.c (x_create_bitmap_from_data, x_create_bitmap_mask)
(x_create_bitmap_from_xpm_data, xpm_load_image):
* src/intervals.h (INTERVAL_HAS_PARENT, INTERVAL_PARENT)
(set_interval_parent, RESET_INTERVAL, COPY_INTERVAL_CACHE)
(MERGE_INTERVAL_CACHE):
* src/keymap.h (KEYMAPP):
* src/lisp.h (eassert, USE_LSB_TAG, CHECK_LISP_OBJECT_TYPE)
(STRING_SET_UNIBYTE, STRING_SET_MULTIBYTE, DEFSYM, PSEUDOVECTORP)
(CHECK_RANGED_INTEGER, CHECK_TYPE_RANGED_INTEGER)
(CHECK_NUMBER_COERCE_MARKER, CHECK_NUMBER_OR_FLOAT_COERCE_MARKER)
(DEFVAR_LISP, DEFVAR_LISP_NOPRO, DEFVAR_BOOL, DEFVAR_INT)
(DEFVAR_BUFFER_DEFAULTS, DEFVAR_KBOARD, QUIT)
(RETURN_UNGCPRO, USE_SAFE_ALLOCA, SAFE_NALLOCA, SAFE_FREE)
(SAFE_ALLOCA_LISP, FOR_EACH_ALIST_VALUE, functionp):
* src/syntax.h (SYNTAX_ENTRY, SYNTAX_WITH_FLAGS, SYNTAX)
(UPDATE_SYNTAX_TABLE_FORWARD, UPDATE_SYNTAX_TABLE_BACKWARD)
(SETUP_BUFFER_SYNTAX_TABLE):
* src/systime.h (timespec_valid_p):
* src/term.c (save_and_enable_current_matrix):
* src/window.h (WINDOW_MENU_BAR_P, WINDOW_TOOL_BAR_P):
* src/xdisp.c (in_display_vector_p, display_tool_bar_line)
(redisplay_internal, try_window_reusing_current_matrix)
(sync_frame_with_window_matrix_rows, try_window_id)
(display_menu_bar, display_tty_menu_item, display_mode_line)
(coords_in_mouse_face_p, cursor_in_mouse_face_p):
* src/xmenu.c (xmenu_show):
* src/xterm.c (use_xim, x_term_init):
* src/xterm.h (XSync, GTK_CHECK_VERSION, use_xim, SET_SCROLL_BAR_X_WIDGET)
(struct x_bitmap_record):
Use bool for booleans.
* src/ccl.c (struct buffer_text):
* src/ccl.h (struct ccl_program):
* src/charset.h (struct charset):
* src/cm.h (struct cm):
* src/coding.h (struct iso_2022_spec, struct coding_system):
* src/dispextern.h (struct glyph, struct glyph_matrix, struct glyph_row)
(struct glyph_string, struct face, struct face_cache)
(struct bidi_string_data, struct bidi_it)
(struct draw_fringe_bitmap_params, struct it, Mouse_HLInfo)
(struct image):
* src/editfns.c (Fformat):
* src/frame.h (struct frame):
* src/fringe.c (struct fringe_bitmap):
* src/intervals.h (struct interval):
* src/keyboard.h (struct kboard):
* src/lisp.h (struct Lisp_Symbol, struct Lisp_Misc_Any, struct Lisp_Marker)
(struct Lisp_Overlay, struct Lisp_Save_Value, struct Lisp_Free)
(struct Lisp_Buffer_Local_Value, union specbinding):
* src/macfont.m (struct macfont_info):
* src/process.h (struct Lisp_Process):
* src/termchar.h (struct tty_display_info):
* src/window.h (struct window):
* src/xterm.h (struct x_output):
Use bool_bf for boolean bit-fields.
* src/ccl.c (setup_ccl_program): Now returns bool instead of -1 or 0.
All callers changed.
* src/ccl.h (struct ccl_program): Remove unused members private_state,
src_multibyte, dst_multibyte, cr_consumed, suppress_error,
eight_bit_control.
(struct ccl_spec): Remove unused members cr_carryover,
eight_bit_carryover.
* src/conf_post.h: Include <stdbool.h>.
(bool_bf): New type.
* src/dispextern.h (TRACE, PREPARE_FACE_FOR_DISPLAY):
* src/interval.h (RESET_INTERVAL, COPY_INTERVAL_CACHE, MERGE_INTERVAL_CACHE)
Surround statement macro with proper 'do { ... } while (false)' brackets.
(SET_MATRIX_ROW_ENABLED_P): Assume 2nd arg is bool.
(PRODUCE_GLYPHS): Simplify use of boolean.
* src/fileio.c (Fcopy_file):
If I is an integer, prefer 'if (I != 0)' to 'if (I)'.
* src/lisp.h (UNGCPRO): Return void, not int.
(FOR_EACH_TAIL): Use void expression, not int expression.
* src/region-cache.c: Reindent.
* src/region-cache.h: Copy comments from region-cache.c, to fix
incorrect remarks about booleans.
2013-12-14 21:36:44 +00:00
|
|
|
AC_DEFINE(PTY_OPEN, [do { fd = posix_openpt (O_RDWR | O_CLOEXEC | O_NOCTTY); if (fd < 0 && errno == EINVAL) fd = posix_openpt (O_RDWR | O_NOCTTY); } while (false)])
|
2012-08-17 07:23:21 +00:00
|
|
|
AC_DEFINE(PTY_NAME_SPRINTF, [])
|
2012-07-12 07:10:44 +00:00
|
|
|
dnl if HAVE_GETPT
|
2012-08-17 07:20:10 +00:00
|
|
|
elif test "x$ac_cv_func_getpt" = xyes; then
|
2012-07-12 07:10:44 +00:00
|
|
|
AC_DEFINE(PTY_OPEN, [fd = getpt ()])
|
2012-08-03 20:34:35 +00:00
|
|
|
AC_DEFINE(PTY_NAME_SPRINTF, [])
|
2012-07-12 07:43:05 +00:00
|
|
|
else
|
2012-08-03 20:34:35 +00:00
|
|
|
AC_DEFINE(PTY_NAME_SPRINTF, [strcpy (pty_name, "/dev/ptmx");])
|
2012-07-12 07:10:44 +00:00
|
|
|
fi
|
2012-07-12 06:34:40 +00:00
|
|
|
else
|
|
|
|
AC_DEFINE(FIRST_PTY_LETTER, ['p'])
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
|
2012-07-12 07:43:05 +00:00
|
|
|
hpux*)
|
|
|
|
AC_DEFINE(FIRST_PTY_LETTER, ['p'])
|
2012-08-03 20:34:35 +00:00
|
|
|
AC_DEFINE(PTY_NAME_SPRINTF, [sprintf (pty_name, "/dev/ptym/pty%c%x", c, i);])
|
|
|
|
AC_DEFINE(PTY_TTY_NAME_SPRINTF, [sprintf (pty_name, "/dev/pty/tty%c%x", c, i);])
|
2012-07-12 07:43:05 +00:00
|
|
|
;;
|
|
|
|
|
2012-07-12 06:34:40 +00:00
|
|
|
irix6-5 )
|
|
|
|
dnl It looks like this cannot be right, because it is not a loop.
|
|
|
|
dnl However, process.c actually does this:
|
|
|
|
dnl # ifndef __sgi
|
|
|
|
dnl continue;
|
|
|
|
dnl # else
|
|
|
|
dnl return -1;
|
|
|
|
dnl # endif
|
|
|
|
dnl which presumably makes it OK, since irix == sgi (?).
|
|
|
|
dnl FIXME it seems like this special treatment is unnecessary?
|
|
|
|
dnl Why can't irix use a single-trip loop like eg cygwin?
|
|
|
|
AC_DEFINE(PTY_ITERATION, [])
|
|
|
|
dnl Not used, because PTY_ITERATION is defined.
|
|
|
|
AC_DEFINE(FIRST_PTY_LETTER, ['q'])
|
Assume POSIX 1003.1-1988 or later for signal.h.
Exceptions: do not assume SIGCONT, SIGSTOP, SIGTSTP, SIGTTIN,
SIGTTOU, SIGUSR1, SIGUSR2, as Microsoft platforms lack these.
* admin/CPP-DEFINES (SIGALRM, SIGCHLD, SIGHUP, SIGKILL, SIGPIPE, SIGQUIT):
Remove.
(SIGTRAP): Remove this one too, as config.h no longer defines it.
* admin/merge-gnulib (GNULIB_MODULES): Add sig2str.
* configure.ac (PTY_OPEN, PTY_TTY_NAME_SPRINTF):
Use SIGCHLD rather than SIGCLD.
* lib/sig2str.c, lib/sig2str.h, m4/sig2str.m4: New files, from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib/makefile.w32-in (GNULIBOBJS): Add $(BUILD)/sig2str.$(O).
* src/process.c [subprocesses]: Include <c-ctype.h>, <sig2str.h>.
(deleted_pid_list, Fdelete_process, create_process)
(record_child_status_change, handle_child_signal, deliver_child_signal)
(init_process_emacs, syms_of_process):
Assume SIGCHLD is defined.
(parse_signal): Remove. All uses removed.
(abbr_to_signal): New static function.
(Fsignal_process): Use it to convert signal names to ints.
* src/sysdep.c (sys_suspend) [!DOS_NT]: Use kill (0, ...) rather than
kill (getpgrp (), ...).
(emacs_sigaction_init): Assume SIGCHLD is defined.
(init_signals): Assume SIGALRM, SIGCHLD, SIGHUP, SIGKILL,
SIGPIPE, and SIGQUIT are defined. Do not worry about SIGCLD any more.
* src/syssignal.h (EMACS_KILLPG): Remove.
All uses replaced by 'kill' with a negative pid.
(SIGCHLD): Remove definition, as we now assume SIGCHLD.
* src/w32proc.c (sys_kill): Support negative pids compatibly with POSIX.
Fixes: debbugs:13026
2012-12-08 02:30:51 +00:00
|
|
|
AC_DEFINE(PTY_OPEN, [ { struct sigaction ocstat, cstat; struct stat stb; char * name; sigemptyset(&cstat.sa_mask); cstat.sa_handler = SIG_DFL; cstat.sa_flags = 0; sigaction(SIGCHLD, &cstat, &ocstat); name = _getpty (&fd, O_RDWR | O_NDELAY, 0600, 0); sigaction(SIGCHLD, &ocstat, (struct sigaction *)0); if (name == 0) return -1; if (fd < 0) return -1; if (fstat (fd, &stb) < 0) return -1; strcpy (pty_name, name); }])
|
2012-07-17 02:09:58 +00:00
|
|
|
dnl No need to get the pty name at all.
|
2012-08-03 20:34:35 +00:00
|
|
|
AC_DEFINE(PTY_NAME_SPRINTF, [])
|
2012-07-12 07:43:05 +00:00
|
|
|
dnl No need to use sprintf to get the tty name--we get that from _getpty.
|
2012-08-03 20:34:35 +00:00
|
|
|
AC_DEFINE(PTY_TTY_NAME_SPRINTF, [])
|
2012-07-12 06:34:40 +00:00
|
|
|
;;
|
|
|
|
|
2012-07-12 07:43:05 +00:00
|
|
|
sol2* )
|
|
|
|
dnl On SysVr4, grantpt(3) forks a subprocess, so keep sigchld_handler()
|
|
|
|
dnl from intercepting that death. If any child but grantpt's should die
|
|
|
|
dnl within, it should be caught after sigrelse(2).
|
2013-07-20 15:33:00 +00:00
|
|
|
AC_DEFINE(PTY_TTY_NAME_SPRINTF, [{ char *ptsname (int), *ptyname; int grantpt_result; sigset_t blocked; sigemptyset (&blocked); sigaddset (&blocked, SIGCHLD); pthread_sigmask (SIG_BLOCK, &blocked, 0); grantpt_result = grantpt (fd); pthread_sigmask (SIG_UNBLOCK, &blocked, 0); if (grantpt_result == -1 || unlockpt (fd) == -1 || !(ptyname = ptsname (fd))) { emacs_close (fd); return -1; } snprintf (pty_name, PTY_NAME_SIZE, "%s", ptyname); }])
|
2012-07-12 07:43:05 +00:00
|
|
|
;;
|
|
|
|
|
|
|
|
unixware )
|
2012-07-13 21:45:55 +00:00
|
|
|
dnl Comments are as per sol2*.
|
2013-07-20 15:33:00 +00:00
|
|
|
AC_DEFINE(PTY_TTY_NAME_SPRINTF, [{ char *ptsname (int), *ptyname; int grantpt_result; sigset_t blocked; sigemptyset (&blocked); sigaddset (&blocked, SIGCHLD); pthread_sigmask (SIG_BLOCK, &blocked, 0); grantpt_result = grantpt (fd); pthread_sigmask (SIG_UNBLOCK, &blocked, 0); if (grantpt_result == -1) fatal("could not grant slave pty"); if (unlockpt(fd) == -1) fatal("could not unlock slave pty"); if (!(ptyname = ptsname(fd))) fatal ("could not enable slave pty"); snprintf (pty_name, PTY_NAME_SIZE, "%s", ptyname); }])
|
2012-07-13 21:45:55 +00:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
|
|
case $opsys in
|
|
|
|
sol2* | unixware )
|
|
|
|
dnl This change means that we don't loop through allocate_pty too
|
|
|
|
dnl many times in the (rare) event of a failure.
|
2012-07-12 07:43:05 +00:00
|
|
|
AC_DEFINE(FIRST_PTY_LETTER, ['z'])
|
2012-08-03 20:34:35 +00:00
|
|
|
AC_DEFINE(PTY_NAME_SPRINTF, [strcpy (pty_name, "/dev/ptmx");])
|
2012-07-13 21:45:55 +00:00
|
|
|
dnl Push various streams modules onto a PTY channel. Used in process.c.
|
|
|
|
AC_DEFINE(SETUP_SLAVE_PTY, [if (ioctl (xforkin, I_PUSH, "ptem") == -1) fatal ("ioctl I_PUSH ptem"); if (ioctl (xforkin, I_PUSH, "ldterm") == -1) fatal ("ioctl I_PUSH ldterm"); if (ioctl (xforkin, I_PUSH, "ttcompat") == -1) fatal ("ioctl I_PUSH ttcompat");], [How to set up a slave PTY, if needed.])
|
2012-07-12 06:34:40 +00:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
2012-07-11 07:28:27 +00:00
|
|
|
AH_TEMPLATE(SIGNALS_VIA_CHARACTERS, [Make process_send_signal work by
|
|
|
|
"typing" a signal character on the pty.])
|
|
|
|
|
|
|
|
case $opsys in
|
|
|
|
dnl Perry Smith <pedz@ddivt1.austin.ibm.com> says this is correct for AIX.
|
|
|
|
dnl thomas@mathematik.uni-bremen.de says this is needed for IRIX.
|
2013-04-18 17:12:21 +00:00
|
|
|
aix4-2 | cygwin | gnu | irix6-5 | dragonfly | freebsd | netbsd | openbsd | darwin )
|
2012-07-11 07:28:27 +00:00
|
|
|
AC_DEFINE(SIGNALS_VIA_CHARACTERS, 1)
|
|
|
|
;;
|
|
|
|
|
2012-07-17 02:09:58 +00:00
|
|
|
dnl 21 Jun 06: Eric Hanchrow <offby1@blarg.net> says this works.
|
2012-07-11 07:28:27 +00:00
|
|
|
dnl FIXME Does gnu-kfreebsd have linux/version.h? It seems unlikely...
|
|
|
|
gnu-linux | gnu-kfreebsd )
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for signals via characters])
|
|
|
|
AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
|
|
|
|
#include <linux/version.h>
|
|
|
|
#if LINUX_VERSION_CODE < 0x20400
|
|
|
|
# error "Linux version too old"
|
|
|
|
#endif
|
|
|
|
]], [[]])], emacs_signals_via_chars=yes, emacs_signals_via_chars=no)
|
|
|
|
|
|
|
|
AC_MSG_RESULT([$emacs_signals_via_chars])
|
|
|
|
test $emacs_signals_via_chars = yes && AC_DEFINE(SIGNALS_VIA_CHARACTERS, 1)
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
2012-07-12 01:49:28 +00:00
|
|
|
AH_TEMPLATE(TAB3, [Undocumented.])
|
|
|
|
|
2012-06-12 19:03:32 +00:00
|
|
|
case $opsys in
|
2012-07-12 01:49:28 +00:00
|
|
|
darwin) AC_DEFINE(TAB3, OXTABS) ;;
|
2012-06-12 18:44:31 +00:00
|
|
|
|
2013-04-18 17:12:21 +00:00
|
|
|
gnu | dragonfly | freebsd | netbsd | openbsd )
|
2012-08-03 20:34:35 +00:00
|
|
|
AC_DEFINE(TABDLY, OXTABS, [Undocumented.])
|
2012-07-12 01:49:28 +00:00
|
|
|
AC_DEFINE(TAB3, OXTABS)
|
|
|
|
;;
|
2012-06-12 19:15:47 +00:00
|
|
|
|
2012-07-13 00:19:10 +00:00
|
|
|
gnu-linux | gnu-kfreebsd )
|
2012-07-13 21:54:35 +00:00
|
|
|
AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
|
|
|
|
#ifndef __ia64__
|
|
|
|
# error "not ia64"
|
|
|
|
#endif
|
|
|
|
]], [[]])], AC_DEFINE(GC_MARK_SECONDARY_STACK(),
|
Use bool for boolean, focusing on headers.
* configure.ac (PTY_OPEN, GC_MARK_SECONDARY_STACK):
Use bool for boolean.
* lib-src/emacsclient.c, lib-src/etags.c, lib-src/hexl.c (FALSE, TRUE):
Remove. All uses replaced with uncapitalized version.
* lib-src/emacsclient.c (message):
* lib-src/etags.c (make_tag, pfnote, consider_token, make_C_tag, lang_names):
* lib-src/hexl.c (un_flag, iso_flag, endian):
* lib-src/pop.c (pop_debug, pop_open, pop_multi_first, pop_multi_next)
(pop_trash):
Use bool for boolean.
* lib-src/etags.c (bool): Remove.
* lib-src/etags.c (globals, members, declarations, no_line_directive)
(no_duplicates): Use 'int' for boolean values that getopt requires
to be 'int'. Formerly, these were 'bool' and 'bool' was 'int',
but we can no longer rely on this implementation.
* lib-src/pop.h (struct _popserver): Use bool_bf for boolean bit-fields.
* lwlib/xlwmenuP.h (XlwMenu_part): Use bool_bf for boolean bit-fields.
* src/atimer.h, src/lisp.h, src/syssignal.h, src/syswait.h, src/unexelf.c:
No need to include <stdbool.h>, since conf_post.h does it now.
* src/buffer.h (BUF_COMPUTE_UNCHANGED, DECODE_POSITION)
(BUFFER_CHECK_INDIRECTION, GET_OVERLAYS_AT, PER_BUFFER_VALUE_P)
(SET_PER_BUFFER_VALUE_P):
* src/ccl.c, src/ccl.h (setup_ccl_program):
* src/ccl.h (CHECK_CCL_PROGRAM):
* src/character.h (MAKE_CHAR_UNIBYTE, CHECK_CHARACTER_CAR)
(CHECK_CHARACTER_CDR, CHAR_STRING_ADVANCE, NEXT_CHAR_BOUNDARY)
(PREV_CHAR_BOUNDARY, FETCH_STRING_CHAR_ADVANCE)
(FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE)
(FETCH_STRING_CHAR_ADVANCE_NO_CHECK, FETCH_CHAR_ADVANCE)
(FETCH_CHAR_ADVANCE_NO_CHECK, INC_POS, DEC_POS, INC_BOTH)
(DEC_BOTH, BUF_INC_POS, BUF_DEC_POS):
* src/charset.h (CHECK_CHARSET, CHECK_CHARSET_GET_ID)
(CHECK_CHARSET_GET_ATTR, CHECK_CHARSET_GET_CHARSET)
(CHARSET_FAST_MAP_SET):
* src/coding.c (decode_coding_ccl, encode_coding_ccl):
* src/coding.h (CHECK_CODING_SYSTEM, CHECK_CODING_SYSTEM_GET_SPEC)
(CHECK_CODING_SYSTEM_GET_ID, SJIS_TO_JIS, SJIS_TO_JIS2)
(JIS_TO_SJIS, JIS_TO_SJIS2, ENCODE_FILE, DECODE_FILE)
(ENCODE_SYSTEM, DECODE_SYSTEM, ENCODE_UTF_8)
(decode_coding_c_string):
* src/composite.h (COMPOSITION_DECODE_REFS, COMPOSITION_DECODE_RULE):
* src/conf_post.h (has_attribute):
* src/dispextern.h (trace_redisplay_p):
(INC_TEXT_POS, DEC_TEXT_POS, SET_GLYPH_FROM_GLYPH_CODE)
(SET_CHAR_GLYPH, SET_CHAR_GLYPH_FROM_GLYPH)
(SET_GLYPH_FROM_CHAR_GLYPH):
(WINDOW_WANTS_MODELINE_P, WINDOW_WANTS_HEADER_LINE_P)
(FACE_SUITABLE_FOR_ASCII_CHAR_P, FACE_SUITABLE_FOR_CHAR_P)
(PRODUCE_GLYPHS, reset_mouse_highlight, in_display_vector_p)
(cursor_in_mouse_face_p):
* src/dispnew.c (adjust_glyph_matrix, clear_glyph_matrix_rows)
(blank_row, prepare_desired_row)
(build_frame_matrix_from_leaf_window, make_current)
(mirror_make_current, mirrored_line_dance, mirror_line_dance)
(update_window, scrolling_window, update_frame_line):
* src/disptab.h (GLYPH_FOLLOW_ALIASES):
* src/editfns.c (Fformat):
* src/font.h (FONT_WEIGHT_SYMBOLIC, FONT_SLANT_SYMBOLIC)
(FONT_WIDTH_SYMBOLIC, FONT_WEIGHT_FOR_FACE, FONT_SLANT_FOR_FACE)
(FONT_WIDTH_FOR_FACE, FONT_WEIGHT_NAME_NUMERIC)
(FONT_SLANT_NAME_NUMERIC, FONT_WIDTH_NAME_NUMERIC)
(FONT_SET_STYLE, CHECK_FONT, CHECK_FONT_SPEC, CHECK_FONT_ENTITY)
(CHECK_FONT_OBJECT, CHECK_FONT_GET_OBJECT, FONT_ADD_LOG)
(FONT_DEFERRED_LOG):
* src/frame.h (FRAME_W32_P, FRAME_MSDOS_P, FRAME_WINDOW_P):
(FRAME_EXTERNAL_TOOL_BAR, FRAME_EXTERNAL_MENU_BAR, FOR_EACH_FRAME)
(FRAME_MOUSE_UPDATE):
* src/fringe.c (Fdefine_fringe_bitmap):
* src/image.c (x_create_bitmap_from_data, x_create_bitmap_mask)
(x_create_bitmap_from_xpm_data, xpm_load_image):
* src/intervals.h (INTERVAL_HAS_PARENT, INTERVAL_PARENT)
(set_interval_parent, RESET_INTERVAL, COPY_INTERVAL_CACHE)
(MERGE_INTERVAL_CACHE):
* src/keymap.h (KEYMAPP):
* src/lisp.h (eassert, USE_LSB_TAG, CHECK_LISP_OBJECT_TYPE)
(STRING_SET_UNIBYTE, STRING_SET_MULTIBYTE, DEFSYM, PSEUDOVECTORP)
(CHECK_RANGED_INTEGER, CHECK_TYPE_RANGED_INTEGER)
(CHECK_NUMBER_COERCE_MARKER, CHECK_NUMBER_OR_FLOAT_COERCE_MARKER)
(DEFVAR_LISP, DEFVAR_LISP_NOPRO, DEFVAR_BOOL, DEFVAR_INT)
(DEFVAR_BUFFER_DEFAULTS, DEFVAR_KBOARD, QUIT)
(RETURN_UNGCPRO, USE_SAFE_ALLOCA, SAFE_NALLOCA, SAFE_FREE)
(SAFE_ALLOCA_LISP, FOR_EACH_ALIST_VALUE, functionp):
* src/syntax.h (SYNTAX_ENTRY, SYNTAX_WITH_FLAGS, SYNTAX)
(UPDATE_SYNTAX_TABLE_FORWARD, UPDATE_SYNTAX_TABLE_BACKWARD)
(SETUP_BUFFER_SYNTAX_TABLE):
* src/systime.h (timespec_valid_p):
* src/term.c (save_and_enable_current_matrix):
* src/window.h (WINDOW_MENU_BAR_P, WINDOW_TOOL_BAR_P):
* src/xdisp.c (in_display_vector_p, display_tool_bar_line)
(redisplay_internal, try_window_reusing_current_matrix)
(sync_frame_with_window_matrix_rows, try_window_id)
(display_menu_bar, display_tty_menu_item, display_mode_line)
(coords_in_mouse_face_p, cursor_in_mouse_face_p):
* src/xmenu.c (xmenu_show):
* src/xterm.c (use_xim, x_term_init):
* src/xterm.h (XSync, GTK_CHECK_VERSION, use_xim, SET_SCROLL_BAR_X_WIDGET)
(struct x_bitmap_record):
Use bool for booleans.
* src/ccl.c (struct buffer_text):
* src/ccl.h (struct ccl_program):
* src/charset.h (struct charset):
* src/cm.h (struct cm):
* src/coding.h (struct iso_2022_spec, struct coding_system):
* src/dispextern.h (struct glyph, struct glyph_matrix, struct glyph_row)
(struct glyph_string, struct face, struct face_cache)
(struct bidi_string_data, struct bidi_it)
(struct draw_fringe_bitmap_params, struct it, Mouse_HLInfo)
(struct image):
* src/editfns.c (Fformat):
* src/frame.h (struct frame):
* src/fringe.c (struct fringe_bitmap):
* src/intervals.h (struct interval):
* src/keyboard.h (struct kboard):
* src/lisp.h (struct Lisp_Symbol, struct Lisp_Misc_Any, struct Lisp_Marker)
(struct Lisp_Overlay, struct Lisp_Save_Value, struct Lisp_Free)
(struct Lisp_Buffer_Local_Value, union specbinding):
* src/macfont.m (struct macfont_info):
* src/process.h (struct Lisp_Process):
* src/termchar.h (struct tty_display_info):
* src/window.h (struct window):
* src/xterm.h (struct x_output):
Use bool_bf for boolean bit-fields.
* src/ccl.c (setup_ccl_program): Now returns bool instead of -1 or 0.
All callers changed.
* src/ccl.h (struct ccl_program): Remove unused members private_state,
src_multibyte, dst_multibyte, cr_consumed, suppress_error,
eight_bit_control.
(struct ccl_spec): Remove unused members cr_carryover,
eight_bit_carryover.
* src/conf_post.h: Include <stdbool.h>.
(bool_bf): New type.
* src/dispextern.h (TRACE, PREPARE_FACE_FOR_DISPLAY):
* src/interval.h (RESET_INTERVAL, COPY_INTERVAL_CACHE, MERGE_INTERVAL_CACHE)
Surround statement macro with proper 'do { ... } while (false)' brackets.
(SET_MATRIX_ROW_ENABLED_P): Assume 2nd arg is bool.
(PRODUCE_GLYPHS): Simplify use of boolean.
* src/fileio.c (Fcopy_file):
If I is an integer, prefer 'if (I != 0)' to 'if (I)'.
* src/lisp.h (UNGCPRO): Return void, not int.
(FOR_EACH_TAIL): Use void expression, not int expression.
* src/region-cache.c: Reindent.
* src/region-cache.h: Copy comments from region-cache.c, to fix
incorrect remarks about booleans.
2013-12-14 21:36:44 +00:00
|
|
|
[do { extern void *__libc_ia64_register_backing_store_base; __builtin_ia64_flushrs (); mark_memory (__libc_ia64_register_backing_store_base, __builtin_ia64_bsp ());} while (false)],
|
2012-07-13 21:54:35 +00:00
|
|
|
[Mark a secondary stack, like the register stack on the ia64.]), [])
|
2012-07-13 00:19:10 +00:00
|
|
|
;;
|
|
|
|
|
2012-07-12 01:49:28 +00:00
|
|
|
hpux*)
|
|
|
|
AC_DEFINE(RUN_TIME_REMAP, 1, [Define if emacs.c needs to call
|
|
|
|
run_time_remap; for HPUX.])
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
2013-01-12 05:21:06 +00:00
|
|
|
dnl This won't be used automatically yet. We also need to know, at least,
|
2012-07-14 00:04:10 +00:00
|
|
|
dnl that the stack is continuous.
|
|
|
|
AH_TEMPLATE(GC_SETJMP_WORKS, [Define if setjmp is known to save all
|
|
|
|
registers relevant for conservative garbage collection in the jmp_buf.])
|
|
|
|
|
|
|
|
|
|
|
|
case $opsys in
|
|
|
|
dnl Not all the architectures are tested, but there are Debian packages
|
|
|
|
dnl for SCM and/or Guile on them, so the technique must work. See also
|
|
|
|
dnl comments in alloc.c concerning setjmp and gcc.
|
|
|
|
dnl Fixme: it's probably safe to just use the GCC conditional below.
|
|
|
|
gnu-linux | gnu-kfreebsd )
|
|
|
|
AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
|
|
|
|
#if defined __i386__ || defined __sparc__ || defined __mc68000__ \
|
|
|
|
|| defined __alpha__ || defined __mips__ || defined __s390__ \
|
|
|
|
|| defined __arm__ || defined __powerpc__ || defined __amd64__ \
|
|
|
|
|| defined __ia64__ || defined __sh__
|
|
|
|
/* ok */
|
|
|
|
#else
|
|
|
|
# error "setjmp not known to work on this arch"
|
|
|
|
#endif
|
2013-01-12 05:21:06 +00:00
|
|
|
]], [[]])], AC_DEFINE(GC_SETJMP_WORKS, 1))
|
2012-07-14 00:04:10 +00:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
|
|
if test x$GCC = xyes; then
|
|
|
|
dnl GC_SETJMP_WORKS is nearly always appropriate for GCC.
|
|
|
|
AC_DEFINE(GC_SETJMP_WORKS, 1)
|
|
|
|
else
|
|
|
|
case $opsys in
|
|
|
|
dnl irix: Tested on Irix 6.5. SCM worked on earlier versions.
|
2014-05-30 20:19:29 +00:00
|
|
|
aix* | dragonfly | freebsd | netbsd | openbsd | irix6-5 | sol2* )
|
2012-07-14 00:04:10 +00:00
|
|
|
AC_DEFINE(GC_SETJMP_WORKS, 1)
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
fi dnl GCC?
|
|
|
|
|
2012-11-24 16:02:07 +00:00
|
|
|
dnl In a weird quirk, MS runtime uses _setjmp and longjmp.
|
2012-09-04 06:25:44 +00:00
|
|
|
AC_CACHE_CHECK([for _setjmp], [emacs_cv_func__setjmp],
|
|
|
|
[AC_LINK_IFELSE(
|
|
|
|
[AC_LANG_PROGRAM(
|
|
|
|
[[#include <setjmp.h>
|
2012-11-24 16:02:07 +00:00
|
|
|
#ifdef __MINGW32__
|
|
|
|
# define _longjmp longjmp
|
|
|
|
#endif
|
2012-09-04 06:25:44 +00:00
|
|
|
]],
|
|
|
|
[[jmp_buf j;
|
|
|
|
if (! _setjmp (j))
|
|
|
|
_longjmp (j, 1);]])],
|
|
|
|
[emacs_cv_func__setjmp=yes],
|
|
|
|
[emacs_cv_func__setjmp=no])])
|
Port better to POSIX hosts lacking _setjmp.
* configure.ac (HAVE__SETJMP, HAVE_SIGSETJMP): New symbols.
(_setjmp, _longjmp): Remove.
* src/lisp.h: Include <setjmp.h> here, since we use its symbols here.
All instances of '#include <setjmp.h>' removed, if the
only reason for the instance was because "lisp.h" was included.
(sys_jmp_buf, sys_setjmp, sys_longjmp): New symbols.
Unless otherwise specified, replace all uses of jmp_buf, _setjmp,
and _longjmp with the new symbols. Emacs already uses _setjmp if
available, so this change affects only POSIXish hosts that have
sigsetjmp but not _setjmp, such as some versions of Solaris and
Unixware. (Also, POSIX-2008 marks _setjmp as obsolescent.)
* src/image.c (_setjmp, _longjmp) [HAVE_PNG && !HAVE__SETJMP]: New macros.
(png_load_body) [HAVE_PNG]:
(PNG_LONGJMP) [HAVE_PNG && PNG_LIBPNG_VER < 10500]:
(PNG_JMPBUF) [HAVE_PNG && PNG_LIBPNG_VER >= 10500]:
Use _setjmp and _longjmp rather than sys_setjmp and sys_longjmp,
since PNG requires jmp_buf. This is the only exception to the
general rule that we now use sys_setjmp and sys_longjmp.
This exception is OK since this code does not change the signal
mask or longjmp out of a signal handler.
Fixes: debbugs:12446
2012-09-15 07:06:56 +00:00
|
|
|
if test $emacs_cv_func__setjmp = yes; then
|
|
|
|
AC_DEFINE([HAVE__SETJMP], 1, [Define to 1 if _setjmp and _longjmp work.])
|
2014-08-26 06:25:59 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
# We need to preserve signal mask to handle C stack overflows.
|
|
|
|
AC_CACHE_CHECK([for sigsetjmp], [emacs_cv_func_sigsetjmp],
|
|
|
|
[AC_LINK_IFELSE(
|
|
|
|
[AC_LANG_PROGRAM(
|
|
|
|
[[#include <setjmp.h>
|
|
|
|
]],
|
|
|
|
[[sigjmp_buf j;
|
|
|
|
if (! sigsetjmp (j, 1))
|
|
|
|
siglongjmp (j, 1);]])],
|
|
|
|
[emacs_cv_func_sigsetjmp=yes],
|
|
|
|
[emacs_cv_func_sigsetjmp=no])])
|
|
|
|
if test $emacs_cv_func_sigsetjmp = yes; then
|
|
|
|
AC_DEFINE([HAVE_SIGSETJMP], 1,
|
|
|
|
[Define to 1 if sigsetjmp and siglongjmp work.])
|
|
|
|
fi
|
|
|
|
|
|
|
|
# We need all of these features to handle C stack overflows.
|
|
|
|
if test "$ac_cv_header_sys_resource_h" = "yes" -a \
|
|
|
|
"$ac_cv_func_getrlimit" = "yes" -a \
|
|
|
|
"$emacs_cv_func_sigsetjmp" = "yes" -a \
|
|
|
|
"$emacs_cv_alternate_stack" = yes; then
|
|
|
|
AC_DEFINE([HAVE_STACK_OVERFLOW_HANDLING], 1,
|
|
|
|
[Define to 1 if C stack overflow can be handled in some cases.])
|
2012-09-04 06:25:44 +00:00
|
|
|
fi
|
2012-07-30 14:52:08 +00:00
|
|
|
|
2012-07-30 14:30:20 +00:00
|
|
|
case $opsys in
|
|
|
|
sol2* | unixware )
|
2012-07-30 14:52:08 +00:00
|
|
|
dnl TIOCGPGRP is broken in SysVr4, so we can't send signals to PTY
|
|
|
|
dnl subprocesses the usual way. But TIOCSIGNAL does work for PTYs,
|
|
|
|
dnl and this is all we need.
|
|
|
|
AC_DEFINE(TIOCSIGSEND, TIOCSIGNAL, [Some platforms redefine this.])
|
2012-07-30 14:30:20 +00:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
2012-07-14 00:04:10 +00:00
|
|
|
|
2012-07-12 01:49:28 +00:00
|
|
|
case $opsys in
|
|
|
|
hpux* | sol2* )
|
2012-07-30 14:46:48 +00:00
|
|
|
dnl Used in xfaces.c.
|
2012-07-12 01:49:28 +00:00
|
|
|
AC_DEFINE(XOS_NEEDS_TIME_H, 1, [Compensate for a bug in Xos.h on
|
|
|
|
some systems, where it requires time.h.])
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
Move "system type" macros from src/s to configure
* configure.ac (BSD4_2, BSD_SYSTEM, USG, USG5, _AIX, CYGWIN)
(DARWIN_OS, GNU_LINUX, HPUX, IRIX6_5, SOLARIS2):
Move "system type" macros here from src/s.
(BSD_SYSTEM_AHB): New hack macro.
(AH_BOTTOM): Set BSD_SYSTEM, using BSD_SYSTEM_AHB.
* src/s/usg5-4-common.h (USG, USG5):
* src/s/template.h (USG5, USG, HPUX, BSD4_2, BSD_SYSTEM):
* src/s/sol2-6.h (SOLARIS2):
* src/s/irix6-5.h (IRIX6_5):
* src/s/hpux10-20.h (USG, USG5, HPUX):
* src/s/gnu-linux.h (USG, GNU_LINUX):
* src/s/freebsd.h (BSD_SYSTEM):
* src/s/darwin.h (BSD4_2, BSD_SYSTEM, DARWIN_OS):
* src/s/cygwin.h (CYGWIN):
* src/s/bsd-common.h (BSD_SYSTEM, BSD4_2):
* src/s/aix4-2.h (USG, USG5, _AIX): Move "system type" macros to configure.
2012-07-13 02:34:05 +00:00
|
|
|
dnl Define symbols to identify the version of Unix this is.
|
|
|
|
dnl Define all the symbols that apply correctly.
|
2012-08-01 15:00:49 +00:00
|
|
|
AH_TEMPLATE(DOS_NT, [Define if the system is MS DOS or MS Windows.])
|
|
|
|
AH_TEMPLATE(MSDOS, [Define if the system is MS DOS.])
|
Move "system type" macros from src/s to configure
* configure.ac (BSD4_2, BSD_SYSTEM, USG, USG5, _AIX, CYGWIN)
(DARWIN_OS, GNU_LINUX, HPUX, IRIX6_5, SOLARIS2):
Move "system type" macros here from src/s.
(BSD_SYSTEM_AHB): New hack macro.
(AH_BOTTOM): Set BSD_SYSTEM, using BSD_SYSTEM_AHB.
* src/s/usg5-4-common.h (USG, USG5):
* src/s/template.h (USG5, USG, HPUX, BSD4_2, BSD_SYSTEM):
* src/s/sol2-6.h (SOLARIS2):
* src/s/irix6-5.h (IRIX6_5):
* src/s/hpux10-20.h (USG, USG5, HPUX):
* src/s/gnu-linux.h (USG, GNU_LINUX):
* src/s/freebsd.h (BSD_SYSTEM):
* src/s/darwin.h (BSD4_2, BSD_SYSTEM, DARWIN_OS):
* src/s/cygwin.h (CYGWIN):
* src/s/bsd-common.h (BSD_SYSTEM, BSD4_2):
* src/s/aix4-2.h (USG, USG5, _AIX): Move "system type" macros to configure.
2012-07-13 02:34:05 +00:00
|
|
|
AH_TEMPLATE(USG, [Define if the system is compatible with System III.])
|
2012-07-31 06:43:37 +00:00
|
|
|
AH_TEMPLATE(USG5_4, [Define if the system is compatible with System V Release 4.])
|
Move "system type" macros from src/s to configure
* configure.ac (BSD4_2, BSD_SYSTEM, USG, USG5, _AIX, CYGWIN)
(DARWIN_OS, GNU_LINUX, HPUX, IRIX6_5, SOLARIS2):
Move "system type" macros here from src/s.
(BSD_SYSTEM_AHB): New hack macro.
(AH_BOTTOM): Set BSD_SYSTEM, using BSD_SYSTEM_AHB.
* src/s/usg5-4-common.h (USG, USG5):
* src/s/template.h (USG5, USG, HPUX, BSD4_2, BSD_SYSTEM):
* src/s/sol2-6.h (SOLARIS2):
* src/s/irix6-5.h (IRIX6_5):
* src/s/hpux10-20.h (USG, USG5, HPUX):
* src/s/gnu-linux.h (USG, GNU_LINUX):
* src/s/freebsd.h (BSD_SYSTEM):
* src/s/darwin.h (BSD4_2, BSD_SYSTEM, DARWIN_OS):
* src/s/cygwin.h (CYGWIN):
* src/s/bsd-common.h (BSD_SYSTEM, BSD4_2):
* src/s/aix4-2.h (USG, USG5, _AIX): Move "system type" macros to configure.
2012-07-13 02:34:05 +00:00
|
|
|
|
|
|
|
case $opsys in
|
|
|
|
aix4-2)
|
|
|
|
AC_DEFINE(USG, [])
|
|
|
|
dnl This symbol should be defined on AIX Version 3 ???????
|
|
|
|
AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
|
|
|
|
#ifndef _AIX
|
|
|
|
# error "_AIX not defined"
|
|
|
|
#endif
|
|
|
|
]], [[]])], [], AC_DEFINE(_AIX, [], [Define if the system is AIX.]))
|
|
|
|
;;
|
|
|
|
|
|
|
|
cygwin)
|
|
|
|
AC_DEFINE(CYGWIN, 1, [Define if the system is Cygwin.])
|
|
|
|
;;
|
|
|
|
|
|
|
|
darwin)
|
File synchronization fixes.
* admin/CPP-DEFINES (BSD_SYSTEM, HAVE_FSYNC): Remove.
* admin/merge-gnulib (GNULIB_MODULES): Add fsync, fdatasync.
* configure.ac (BSD_SYSTEM, BSD_SYSTEM_AHB): Remove; no longer needed.
(fsync): Remove check; now done by gnulib.
* lib/fdatasync.c, lib/fsync.c, m4/fdatasync.m4, m4/fsync.m4:
New files, from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib-src/Makefile.in (LIB_FDATASYNC): New macro.
(emacsclient${EXEEXT}): Use it.
* lib-src/emacsclient.c (main): Use fdatasync, not fsync, since we don't
care about metadata. Keep trying if interrupted.
* lib-src/movemail.c (main, popmail): Don't worry about BSD_SYSTEM, since
fsync is available everywhere (or there is a substitute). Don't
report an error if fsync returns EINVAL.
* nt/inc/ms-w32.h (fdatasync): New macro, suggested by Eli Zaretskii.
* src/Makefile.in (LIB_FDATASYNC): New macro.
(LIBES): Use it.
* src/conf_post.h (BSD_SYSTEM, BSD_SYSTEM_AHB): Remove; no longer needed.
* src/fileio.c (Fwrite_region, write_region_inhibit_fsync):
Don't worry about HAVE_FSYNC, since a substitute fsync is
available if the system lacks one.
(Fwrite_regin): Retry fsync if interrupted.
Fixes: debbugs:13944
2013-03-13 18:42:22 +00:00
|
|
|
dnl Not __APPLE__, as this may not be defined on non-OSX Darwin.
|
|
|
|
dnl Not DARWIN, because Panther and lower CoreFoundation.h use DARWIN to
|
Move "system type" macros from src/s to configure
* configure.ac (BSD4_2, BSD_SYSTEM, USG, USG5, _AIX, CYGWIN)
(DARWIN_OS, GNU_LINUX, HPUX, IRIX6_5, SOLARIS2):
Move "system type" macros here from src/s.
(BSD_SYSTEM_AHB): New hack macro.
(AH_BOTTOM): Set BSD_SYSTEM, using BSD_SYSTEM_AHB.
* src/s/usg5-4-common.h (USG, USG5):
* src/s/template.h (USG5, USG, HPUX, BSD4_2, BSD_SYSTEM):
* src/s/sol2-6.h (SOLARIS2):
* src/s/irix6-5.h (IRIX6_5):
* src/s/hpux10-20.h (USG, USG5, HPUX):
* src/s/gnu-linux.h (USG, GNU_LINUX):
* src/s/freebsd.h (BSD_SYSTEM):
* src/s/darwin.h (BSD4_2, BSD_SYSTEM, DARWIN_OS):
* src/s/cygwin.h (CYGWIN):
* src/s/bsd-common.h (BSD_SYSTEM, BSD4_2):
* src/s/aix4-2.h (USG, USG5, _AIX): Move "system type" macros to configure.
2012-07-13 02:34:05 +00:00
|
|
|
dnl distinguish OS X from pure Darwin.
|
|
|
|
AC_DEFINE(DARWIN_OS, [], [Define if the system is Darwin.])
|
|
|
|
;;
|
|
|
|
|
|
|
|
gnu-linux | gnu-kfreebsd )
|
|
|
|
AC_DEFINE(USG, [])
|
|
|
|
AC_DEFINE(GNU_LINUX, [], [Define if ths system is compatible with GNU/Linux.])
|
|
|
|
;;
|
|
|
|
|
|
|
|
hpux*)
|
|
|
|
AC_DEFINE(USG, [])
|
|
|
|
AC_DEFINE(HPUX, [], [Define if the system is HPUX.])
|
|
|
|
;;
|
|
|
|
|
|
|
|
irix6-5)
|
|
|
|
AC_DEFINE(USG, [])
|
2012-07-31 06:43:37 +00:00
|
|
|
AC_DEFINE(USG5_4, [])
|
Move "system type" macros from src/s to configure
* configure.ac (BSD4_2, BSD_SYSTEM, USG, USG5, _AIX, CYGWIN)
(DARWIN_OS, GNU_LINUX, HPUX, IRIX6_5, SOLARIS2):
Move "system type" macros here from src/s.
(BSD_SYSTEM_AHB): New hack macro.
(AH_BOTTOM): Set BSD_SYSTEM, using BSD_SYSTEM_AHB.
* src/s/usg5-4-common.h (USG, USG5):
* src/s/template.h (USG5, USG, HPUX, BSD4_2, BSD_SYSTEM):
* src/s/sol2-6.h (SOLARIS2):
* src/s/irix6-5.h (IRIX6_5):
* src/s/hpux10-20.h (USG, USG5, HPUX):
* src/s/gnu-linux.h (USG, GNU_LINUX):
* src/s/freebsd.h (BSD_SYSTEM):
* src/s/darwin.h (BSD4_2, BSD_SYSTEM, DARWIN_OS):
* src/s/cygwin.h (CYGWIN):
* src/s/bsd-common.h (BSD_SYSTEM, BSD4_2):
* src/s/aix4-2.h (USG, USG5, _AIX): Move "system type" macros to configure.
2012-07-13 02:34:05 +00:00
|
|
|
AC_DEFINE(IRIX6_5, [], [Define if the system is IRIX.])
|
|
|
|
;;
|
|
|
|
|
2012-11-23 15:22:47 +00:00
|
|
|
mingw32)
|
|
|
|
AC_DEFINE(DOS_NT, [])
|
|
|
|
AC_DEFINE(WINDOWSNT, 1, [Define if compiling for native MS Windows.])
|
2013-04-01 13:18:20 +00:00
|
|
|
if test "x$ac_enable_checking" != "x" ; then
|
|
|
|
AC_DEFINE(EMACSDEBUG, 1, [Define to 1 to enable w32 debug facilities.])
|
|
|
|
fi
|
2012-11-23 15:22:47 +00:00
|
|
|
;;
|
|
|
|
|
Move "system type" macros from src/s to configure
* configure.ac (BSD4_2, BSD_SYSTEM, USG, USG5, _AIX, CYGWIN)
(DARWIN_OS, GNU_LINUX, HPUX, IRIX6_5, SOLARIS2):
Move "system type" macros here from src/s.
(BSD_SYSTEM_AHB): New hack macro.
(AH_BOTTOM): Set BSD_SYSTEM, using BSD_SYSTEM_AHB.
* src/s/usg5-4-common.h (USG, USG5):
* src/s/template.h (USG5, USG, HPUX, BSD4_2, BSD_SYSTEM):
* src/s/sol2-6.h (SOLARIS2):
* src/s/irix6-5.h (IRIX6_5):
* src/s/hpux10-20.h (USG, USG5, HPUX):
* src/s/gnu-linux.h (USG, GNU_LINUX):
* src/s/freebsd.h (BSD_SYSTEM):
* src/s/darwin.h (BSD4_2, BSD_SYSTEM, DARWIN_OS):
* src/s/cygwin.h (CYGWIN):
* src/s/bsd-common.h (BSD_SYSTEM, BSD4_2):
* src/s/aix4-2.h (USG, USG5, _AIX): Move "system type" macros to configure.
2012-07-13 02:34:05 +00:00
|
|
|
sol2*)
|
|
|
|
AC_DEFINE(USG, [])
|
2012-07-31 06:43:37 +00:00
|
|
|
AC_DEFINE(USG5_4, [])
|
Move "system type" macros from src/s to configure
* configure.ac (BSD4_2, BSD_SYSTEM, USG, USG5, _AIX, CYGWIN)
(DARWIN_OS, GNU_LINUX, HPUX, IRIX6_5, SOLARIS2):
Move "system type" macros here from src/s.
(BSD_SYSTEM_AHB): New hack macro.
(AH_BOTTOM): Set BSD_SYSTEM, using BSD_SYSTEM_AHB.
* src/s/usg5-4-common.h (USG, USG5):
* src/s/template.h (USG5, USG, HPUX, BSD4_2, BSD_SYSTEM):
* src/s/sol2-6.h (SOLARIS2):
* src/s/irix6-5.h (IRIX6_5):
* src/s/hpux10-20.h (USG, USG5, HPUX):
* src/s/gnu-linux.h (USG, GNU_LINUX):
* src/s/freebsd.h (BSD_SYSTEM):
* src/s/darwin.h (BSD4_2, BSD_SYSTEM, DARWIN_OS):
* src/s/cygwin.h (CYGWIN):
* src/s/bsd-common.h (BSD_SYSTEM, BSD4_2):
* src/s/aix4-2.h (USG, USG5, _AIX): Move "system type" macros to configure.
2012-07-13 02:34:05 +00:00
|
|
|
AC_DEFINE(SOLARIS2, [], [Define if the system is Solaris.])
|
|
|
|
;;
|
|
|
|
|
|
|
|
unixware)
|
|
|
|
AC_DEFINE(USG, [])
|
2012-07-31 06:43:37 +00:00
|
|
|
AC_DEFINE(USG5_4, [])
|
Move "system type" macros from src/s to configure
* configure.ac (BSD4_2, BSD_SYSTEM, USG, USG5, _AIX, CYGWIN)
(DARWIN_OS, GNU_LINUX, HPUX, IRIX6_5, SOLARIS2):
Move "system type" macros here from src/s.
(BSD_SYSTEM_AHB): New hack macro.
(AH_BOTTOM): Set BSD_SYSTEM, using BSD_SYSTEM_AHB.
* src/s/usg5-4-common.h (USG, USG5):
* src/s/template.h (USG5, USG, HPUX, BSD4_2, BSD_SYSTEM):
* src/s/sol2-6.h (SOLARIS2):
* src/s/irix6-5.h (IRIX6_5):
* src/s/hpux10-20.h (USG, USG5, HPUX):
* src/s/gnu-linux.h (USG, GNU_LINUX):
* src/s/freebsd.h (BSD_SYSTEM):
* src/s/darwin.h (BSD4_2, BSD_SYSTEM, DARWIN_OS):
* src/s/cygwin.h (CYGWIN):
* src/s/bsd-common.h (BSD_SYSTEM, BSD4_2):
* src/s/aix4-2.h (USG, USG5, _AIX): Move "system type" macros to configure.
2012-07-13 02:34:05 +00:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
Simplify SIGIO usage.
The code that dealt with SIGIO was crufty and confusing, e.g., it
played tricks like "#undef SIGIO" but these tricks were not used
consistently. Simplify mostly by not #undeffing standard symbols,
e.g., use "defined USABLE_SIGIO" (our symbol, which we can define
or not as we please) rather than "defined SIGIO" (standard symbol
that we probably shouldn't #undef).
* configure.ac (NO_TERMIO, BROKEN_FIONREAD, BROKEN_SIGAIO)
(BROKEN_SIGPOLL, BROKEN_SIGPTY): Remove.
(USABLE_FIONREAD, USABLE_SIGIO): New symbols. All uses of
'defined SIGIO' replaced with 'defined USABLE_SIGIO', with no need
to #undef SIGIO now (which was error-prone). Likewise, all uses
of 'defined FIONREAD' replaced with 'defined USABLE_FIONREAD'.
* src/admin/CPP_DEFINES (BROKEN_SIGAIO, BROKEN_SIGIO, BROKEN_SIGPOLL)
(BROKEN_SIGPTY, NO_TERMIO): Remove.
* src/conf_post.h [USG5_4]: Do not include <sys/wait.h> here.
Modules that need it can include it.
[USG5_4 && emacs]: Likewise, do not include the streams stuff here.
* src/dispextern.h (ignore_sigio): New decl.
* src/emacs.c (shut_down_emacs): Invoke unrequest_sigio
unconditionally, since it's now a no-op if !USABLE_SIGIO.
* src/emacs.c (shut_down_emacs):
* src/keyboard.c (kbd_buffer_store_event_hold):
Use ignore_sigio rather than invoking 'signal' directly.
* src/keyboard.c (USABLE_FIONREAD && USG5_4): Include <sys/filio.h>,
for FIONREAD.
(FIONREAD, SIGIO): Do not #undef.
(tty_read_avail_input): Use #error rather than a syntax error.
* src/process.c [USG5_4]: Include <sys/stream.h> and <sys/stropts.h>,
for I_PIPE, used by SETUP_SLAVE_PTY.
(DATAGRAM_SOCKETS): Simplify defn, based on USABLE_FIONREAD.
* src/sysdep.c (croak): Remove; no longer needed. This bit of
temporary code, with Fred N. Fish's comment that it's temporary,
has been in Emacs since at least 1992!
(init_sigio, reset_sigio, request_sigio, unrequest_sigio):
Arrange for them to be no-ops in all cases when ! USABLE_SIGIO.
* src/syssignal.h (croak): Remove decl.
(SIGIO, SIGPOO, SIGAIO, SIGPTY): Do not #undef; that's too fragile.
* src/systty.h [!NO_TERMIO]: Do not include <termio.h>; no longer needed
now that we're termios-only.
(FIONREAD, ASYNC) [BROKEN_FIONREAD]: Do not #undef.
* src/term.c (dissociate_if_controlling_tty): Use #error rather than
a run-time error.
Fixes: debbugs:12408
2012-09-13 02:21:28 +00:00
|
|
|
AC_CACHE_CHECK([for usable FIONREAD], [emacs_cv_usable_FIONREAD],
|
|
|
|
[case $opsys in
|
|
|
|
aix4-2)
|
|
|
|
dnl BUILD 9008 - FIONREAD problem still exists in X-Windows.
|
|
|
|
emacs_cv_usable_FIONREAD=no
|
|
|
|
;;
|
|
|
|
|
2012-11-23 15:22:47 +00:00
|
|
|
mingw32)
|
|
|
|
emacs_cv_usable_FIONREAD=yes
|
|
|
|
;;
|
|
|
|
|
Simplify SIGIO usage.
The code that dealt with SIGIO was crufty and confusing, e.g., it
played tricks like "#undef SIGIO" but these tricks were not used
consistently. Simplify mostly by not #undeffing standard symbols,
e.g., use "defined USABLE_SIGIO" (our symbol, which we can define
or not as we please) rather than "defined SIGIO" (standard symbol
that we probably shouldn't #undef).
* configure.ac (NO_TERMIO, BROKEN_FIONREAD, BROKEN_SIGAIO)
(BROKEN_SIGPOLL, BROKEN_SIGPTY): Remove.
(USABLE_FIONREAD, USABLE_SIGIO): New symbols. All uses of
'defined SIGIO' replaced with 'defined USABLE_SIGIO', with no need
to #undef SIGIO now (which was error-prone). Likewise, all uses
of 'defined FIONREAD' replaced with 'defined USABLE_FIONREAD'.
* src/admin/CPP_DEFINES (BROKEN_SIGAIO, BROKEN_SIGIO, BROKEN_SIGPOLL)
(BROKEN_SIGPTY, NO_TERMIO): Remove.
* src/conf_post.h [USG5_4]: Do not include <sys/wait.h> here.
Modules that need it can include it.
[USG5_4 && emacs]: Likewise, do not include the streams stuff here.
* src/dispextern.h (ignore_sigio): New decl.
* src/emacs.c (shut_down_emacs): Invoke unrequest_sigio
unconditionally, since it's now a no-op if !USABLE_SIGIO.
* src/emacs.c (shut_down_emacs):
* src/keyboard.c (kbd_buffer_store_event_hold):
Use ignore_sigio rather than invoking 'signal' directly.
* src/keyboard.c (USABLE_FIONREAD && USG5_4): Include <sys/filio.h>,
for FIONREAD.
(FIONREAD, SIGIO): Do not #undef.
(tty_read_avail_input): Use #error rather than a syntax error.
* src/process.c [USG5_4]: Include <sys/stream.h> and <sys/stropts.h>,
for I_PIPE, used by SETUP_SLAVE_PTY.
(DATAGRAM_SOCKETS): Simplify defn, based on USABLE_FIONREAD.
* src/sysdep.c (croak): Remove; no longer needed. This bit of
temporary code, with Fred N. Fish's comment that it's temporary,
has been in Emacs since at least 1992!
(init_sigio, reset_sigio, request_sigio, unrequest_sigio):
Arrange for them to be no-ops in all cases when ! USABLE_SIGIO.
* src/syssignal.h (croak): Remove decl.
(SIGIO, SIGPOO, SIGAIO, SIGPTY): Do not #undef; that's too fragile.
* src/systty.h [!NO_TERMIO]: Do not include <termio.h>; no longer needed
now that we're termios-only.
(FIONREAD, ASYNC) [BROKEN_FIONREAD]: Do not #undef.
* src/term.c (dissociate_if_controlling_tty): Use #error rather than
a run-time error.
Fixes: debbugs:12408
2012-09-13 02:21:28 +00:00
|
|
|
*)
|
|
|
|
AC_COMPILE_IFELSE(
|
|
|
|
[AC_LANG_PROGRAM([[#include <sys/types.h>
|
|
|
|
#include <sys/ioctl.h>
|
|
|
|
#ifdef USG5_4
|
|
|
|
# include <sys/filio.h>
|
|
|
|
#endif
|
|
|
|
]],
|
|
|
|
[[int foo = ioctl (0, FIONREAD, &foo);]])],
|
|
|
|
[emacs_cv_usable_FIONREAD=yes],
|
|
|
|
[emacs_cv_usable_FIONREAD=no])
|
|
|
|
;;
|
|
|
|
esac])
|
|
|
|
if test $emacs_cv_usable_FIONREAD = yes; then
|
|
|
|
AC_DEFINE([USABLE_FIONREAD], [1], [Define to 1 if FIONREAD is usable.])
|
|
|
|
|
|
|
|
if test $emacs_broken_SIGIO = no; then
|
|
|
|
AC_CACHE_CHECK([for usable SIGIO], [emacs_cv_usable_SIGIO],
|
|
|
|
[AC_COMPILE_IFELSE(
|
|
|
|
[AC_LANG_PROGRAM([[#include <fcntl.h>
|
|
|
|
#include <signal.h>
|
|
|
|
]],
|
|
|
|
[[int foo = SIGIO | F_SETFL | FASYNC;]])],
|
|
|
|
[emacs_cv_usable_SIGIO=yes],
|
|
|
|
[emacs_cv_usable_SIGIO=no])],
|
|
|
|
[emacs_cv_usable_SIGIO=yes],
|
|
|
|
[emacs_cv_usable_SIGIO=no])
|
|
|
|
if test $emacs_cv_usable_SIGIO = yes; then
|
|
|
|
AC_DEFINE([USABLE_SIGIO], [1], [Define to 1 if SIGIO is usable.])
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2014-08-25 20:55:37 +00:00
|
|
|
case $opsys in
|
2012-07-12 01:49:28 +00:00
|
|
|
hpux11)
|
|
|
|
dnl It works to open the pty's tty in the parent (Emacs), then
|
|
|
|
dnl close and reopen it in the child.
|
|
|
|
AC_DEFINE(USG_SUBTTY_WORKS, 1, [Define for USG systems where it
|
|
|
|
works to open a pty's tty in the parent process, then close and
|
|
|
|
reopen it in the child.])
|
|
|
|
;;
|
|
|
|
|
|
|
|
irix6-5)
|
|
|
|
AC_DEFINE(PREFER_VSUSP, 1, [Define if process_send_signal should
|
|
|
|
use VSUSP instead of VSWTCH.])
|
|
|
|
;;
|
|
|
|
|
|
|
|
sol2-10)
|
|
|
|
AC_DEFINE(_STRUCTURED_PROC, 1, [Needed for system_process_attributes
|
|
|
|
on Solaris.])
|
|
|
|
;;
|
2012-06-12 17:53:25 +00:00
|
|
|
esac
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
# Set up the CFLAGS for real compilation, so we can substitute it.
|
|
|
|
CFLAGS="$REAL_CFLAGS"
|
|
|
|
CPPFLAGS="$REAL_CPPFLAGS"
|
Clean up configure-time library handling a bit.
This patch was inspired by emacs-24 2014-04-09T13:37:49Z!sdl.web@gmail.com, which fixed
a bug due to sloppy library handling in 'configure'.
* configure.ac (LIB_MATH, LIB_PTHREAD, LIBXMU):
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB as per Autoconf manual.
(LIB_MATH, LIB_PTHREAD, HAVE_X11, IMAGEMAGICK_LIBS, GTK_LIBS)
(DBUS_LIBS, LIBXMU, XFT_LIBS, LIBXSM, LIBXML2_LIBS, LIBS_MAIL)
(with_kerberos):
Don't let the library choice infect $LIBS.
(dnet_ntoa, cma_open): Remove obsolete tests.
(emacs_pthread_function): Probe for pthread_kill, not pthread_self,
as that's a bit more selective on GNU/Linux.
(LIBXEXT): Remove.
(touchlock): Test for existence when $LIBS_MAIL is in use.
(AC_CHECK_FUNCS): Use only $LIB_MATH in addition to $LIBS
when testing for typical functions like accept4, lrand48.
(random, rint): Remove obsolete HP-UX 9 A.09.05 test.
2014-04-14 05:23:31 +00:00
|
|
|
LIBS="$REAL_LIBS"
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
## Hack to detect a buggy GCC version.
|
|
|
|
if test "x$GCC" = xyes \
|
|
|
|
&& test x"`$CC --version 2> /dev/null | grep 'gcc.* 4.5.0'`" != x \
|
|
|
|
&& test x"`echo $CFLAGS | grep '\-O@<:@23@:>@'`" != x \
|
|
|
|
&& test x"`echo $CFLAGS | grep '\-fno-optimize-sibling-calls'`" = x; then
|
|
|
|
AC_MSG_ERROR([GCC 4.5.0 has problems compiling Emacs; see etc/PROBLEMS'.])
|
|
|
|
fi
|
|
|
|
|
2011-01-31 08:12:52 +00:00
|
|
|
version=$PACKAGE_VERSION
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2014-01-01 08:31:29 +00:00
|
|
|
copyright="Copyright (C) 2014 Free Software Foundation, Inc."
|
2012-09-17 00:56:08 +00:00
|
|
|
AC_DEFINE_UNQUOTED(COPYRIGHT, ["$copyright"],
|
|
|
|
[Short copyright string for this version of Emacs.])
|
|
|
|
AC_SUBST(copyright)
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
### Specify what sort of things we'll be editing into Makefile and config.h.
|
|
|
|
### Use configuration here uncanonicalized to avoid exceeding size limits.
|
|
|
|
AC_SUBST(version)
|
|
|
|
AC_SUBST(configuration)
|
|
|
|
## Unused?
|
|
|
|
AC_SUBST(canonical)
|
|
|
|
AC_SUBST(srcdir)
|
|
|
|
AC_SUBST(prefix)
|
|
|
|
AC_SUBST(exec_prefix)
|
|
|
|
AC_SUBST(bindir)
|
|
|
|
AC_SUBST(datadir)
|
|
|
|
AC_SUBST(sharedstatedir)
|
|
|
|
AC_SUBST(libexecdir)
|
|
|
|
AC_SUBST(mandir)
|
|
|
|
AC_SUBST(infodir)
|
|
|
|
AC_SUBST(lispdir)
|
2012-06-30 21:10:50 +00:00
|
|
|
AC_SUBST(standardlisppath)
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_SUBST(locallisppath)
|
|
|
|
AC_SUBST(lisppath)
|
|
|
|
AC_SUBST(x_default_search_path)
|
|
|
|
AC_SUBST(etcdir)
|
|
|
|
AC_SUBST(archlibdir)
|
Add build, install, uninstall rules for all dvi, html, pdf, ps manuals
* configure.ac (etcdocdir): Rename from docdir, to avoid confusion
with configure's standard --docdir argument. All uses updated.
* Makefile.in (etcdocdir): Rename from docdir. All uses updated.
(install-etcdoc): Rename from install-doc. All uses updated.
(uninstall): Run uninstall-doc.
(PSS): Add misc-ps.
(INSTALL_DVI, INSTALL_HTML, INSTALL_PDF, INSTALL_PS)
(INSTALL_DOC, UNINSTALL_DVI, UNINSTALL_HTML, UNINSTALL_PDF)
(UNINSTALL_PS, UNINSTALL_DOC): New variables.
($(INSTALL_DOC), install-doc, install-dvi, install-html, install-pdf)
(install-ps, $(UNINSTALL_DOC), uninstall-doc, uninstall-dvi)
(uninstall-html, uninstall-pdf, uninstall-ps): New .PHONY rules.
* doc/emacs/Makefile.in (prefix, datarootdir, datadir, PACKAGE_TARNAME)
(docdir, dvidir, htmldir, pdfdir, psdir, GZIP_PROG, INSTALL)
(INSTALL_DATA): New, set by configure.
(HTML_OPTS, DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS):
New variables.
(.SUFFIXES): Add .ps and .dvi.
(.dvi.ps): New suffix rule.
(dvi, html, pdf, ps): Use *_TARGETS variables.
(emacs.ps, emacs-xtra.ps): Remove explicit rules.
(emacs.html): Use HTML_OPTS.
(clean): Use DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS.
(.PHONY): install-dvi, install-html, install-pdf, install-ps
,install-doc, uninstall-dvi, uninstall-html, uninstall-pdf,
uninstall-ps, and uninstall-doc.
(install-dvi, install-html, install-pdf, install-ps, install-doc)
(uninstall-dvi, uninstall-html, uninstall-ps, uninstall-pdf)
(uninstall-doc): New rules.
* doc/lispintro/Makefile.in (prefix, datarootdir, datadir, PACKAGE_TARNAME)
(docdir, dvidir, htmldir, pdfdir, psdir, GZIP_PROG, INSTALL)
(INSTALL_DATA): New, set by configure.
(HTML_OPTS, DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS):
New variables.
(.SUFFIXES): Add .ps and .dvi.
(.dvi.ps): New suffix rule.
(dvi, html, pdf, ps): Use *_TARGETS variables.
(emacs-lisp-intro.ps): Remove explicit rule.
(emacs-lisp-intro.html): Use HTML_OPTS.
(clean): Use DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS.
(.PHONY): install-dvi, install-html, install-pdf, install-ps
,install-doc, uninstall-dvi, uninstall-html, uninstall-pdf,
uninstall-ps, and uninstall-doc.
(install-dvi, install-html, install-pdf, install-ps, install-doc)
(uninstall-dvi, uninstall-html, uninstall-ps, uninstall-pdf)
(uninstall-doc): New rules.
* doc/lispref/Makefile.in (prefix, datarootdir, datadir, PACKAGE_TARNAME)
(docdir, dvidir, htmldir, pdfdir, psdir, GZIP_PROG, INSTALL)
(INSTALL_DATA): New, set by configure.
(HTML_OPTS, DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS):
New variables.
(.SUFFIXES): Add .ps and .dvi.
(.dvi.ps): New suffix rule.
(dvi, html, pdf, ps): Use *_TARGETS variables.
(elisp.html): Use HTML_OPTS.
(elisp.ps): Remove explicit rule.
(.PHONY): install-dvi, install-html, install-pdf, install-ps
,install-doc, uninstall-dvi, uninstall-html, uninstall-pdf,
uninstall-ps, and uninstall-doc.
(install-dvi, install-html, install-pdf, install-ps, install-doc)
(uninstall-dvi, uninstall-html, uninstall-ps, uninstall-pdf)
(uninstall-doc): New rules.
(clean): Use DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS.
* doc/misc/Makefile.in (prefix, datarootdir, datadir, PACKAGE_TARNAME)
(docdir, dvidir, htmldir, pdfdir, psdir, GZIP_PROG, INSTALL)
(INSTALL_DATA): New, set by configure.
(HTML_OPTS, HTML_TARGETS, PS_TARGETS, DVIPS): New variables.
(.PHONY): Add html, ps, install-dvi, install-html, install-pdf,
install-ps ,install-doc, uninstall-dvi, uninstall-html, uninstall-pdf,
uninstall-ps, and uninstall-doc.
(.SUFFIXES): Add .ps and .dvi.
(.dvi.ps): New suffix rule.
(html, ps, ada-mode.html, auth.html, autotype.html, bovine.html)
(calc.html, cc-mode.html, cl.html, dbus.html, dired-x.html)
(ebrowse.html, ede.html, ediff.html, edt.html, eieio.html)
(emacs-gnutls.html, emacs-mime.html, epa.html, erc.html)
(ert.html, eshell.html, eudc.html, faq.html, flymake.html)
(forms.html, gnus.html, htmlfontify.html, idlwave.html)
(ido.html, mairix-el.html, message.html, mh-e.html)
(newsticker.html, nxml-mode.html, org.html, pgg.html)
(rcirc.html, reftex.html, remember.html, sasl.html, sc.html)
(semantic.html, sieve.html, smtpmail.html, speedbar.html)
(srecode.html, todo-mode.html, tramp.html, url.html, vip.html)
(viper.html, widget.html, wisent.html, woman.html, install-dvi)
(install-html, install-pdf, install-ps, install-doc, uninstall-dvi)
(uninstall-html, uninstall-ps, uninstall-pdf, uninstall-doc):
New rules.
(clean): Remove HTML_TARGETS and PS_TARGETS.
2013-08-12 00:04:15 +00:00
|
|
|
AC_SUBST(etcdocdir)
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_SUBST(bitmapdir)
|
|
|
|
AC_SUBST(gamedir)
|
|
|
|
AC_SUBST(gameuser)
|
|
|
|
## FIXME? Nothing uses @LD_SWITCH_X_SITE@.
|
|
|
|
## src/Makefile.in did add LD_SWITCH_X_SITE (as a cpp define) to the
|
|
|
|
## end of LIBX_BASE, but nothing ever set it.
|
|
|
|
AC_SUBST(LD_SWITCH_X_SITE)
|
|
|
|
AC_SUBST(C_SWITCH_X_SITE)
|
2012-04-11 01:25:51 +00:00
|
|
|
AC_SUBST(GNUSTEP_CFLAGS)
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_SUBST(CFLAGS)
|
|
|
|
## Used in lwlib/Makefile.in.
|
|
|
|
AC_SUBST(X_TOOLKIT_TYPE)
|
|
|
|
AC_SUBST(ns_appdir)
|
|
|
|
AC_SUBST(ns_appbindir)
|
|
|
|
AC_SUBST(ns_appresdir)
|
|
|
|
AC_SUBST(ns_appsrc)
|
|
|
|
AC_SUBST(GNU_OBJC_CFLAGS)
|
|
|
|
AC_SUBST(OTHER_FILES)
|
|
|
|
|
2012-09-01 06:38:52 +00:00
|
|
|
if test -n "${term_header}"; then
|
|
|
|
AC_DEFINE_UNQUOTED(TERM_HEADER, "${term_header}",
|
|
|
|
[Define to the header for the built-in window system.])
|
|
|
|
fi
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}",
|
|
|
|
[Define to the canonical Emacs configuration name.])
|
2012-12-27 17:59:21 +00:00
|
|
|
AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${emacs_config_options}",
|
2010-12-03 14:45:09 +00:00
|
|
|
[Define to the options passed to configure.])
|
2012-07-31 23:12:24 +00:00
|
|
|
AH_TEMPLATE(config_opsysfile, [Some platforms that do not use configure
|
|
|
|
define this to include extra configuration information.])
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2013-03-29 19:53:25 +00:00
|
|
|
case $opsys in
|
|
|
|
mingw32)
|
|
|
|
AC_DEFINE(config_opsysfile, <ms-w32.h>, [])
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
XMENU_OBJ=
|
|
|
|
XOBJ=
|
|
|
|
FONT_OBJ=
|
|
|
|
if test "${HAVE_X_WINDOWS}" = "yes" ; then
|
|
|
|
AC_DEFINE(HAVE_X_WINDOWS, 1,
|
|
|
|
[Define to 1 if you want to use the X window system.])
|
|
|
|
XMENU_OBJ=xmenu.o
|
2013-06-03 18:47:35 +00:00
|
|
|
XOBJ="xterm.o xfns.o xselect.o xrdb.o xsmfns.o xsettings.o"
|
2010-12-03 14:45:09 +00:00
|
|
|
FONT_OBJ=xfont.o
|
|
|
|
if test "$HAVE_XFT" = "yes"; then
|
|
|
|
FONT_OBJ="$FONT_OBJ ftfont.o xftfont.o ftxfont.o"
|
|
|
|
elif test "$HAVE_FREETYPE" = "yes"; then
|
|
|
|
FONT_OBJ="$FONT_OBJ ftfont.o ftxfont.o"
|
|
|
|
fi
|
|
|
|
AC_SUBST(FONT_OBJ)
|
|
|
|
fi
|
|
|
|
AC_SUBST(XMENU_OBJ)
|
|
|
|
AC_SUBST(XOBJ)
|
|
|
|
AC_SUBST(FONT_OBJ)
|
|
|
|
|
|
|
|
WIDGET_OBJ=
|
|
|
|
MOTIF_LIBW=
|
|
|
|
if test "${USE_X_TOOLKIT}" != "none" ; then
|
|
|
|
WIDGET_OBJ=widget.o
|
|
|
|
AC_DEFINE(USE_X_TOOLKIT, 1, [Define to 1 if using an X toolkit.])
|
|
|
|
if test "${USE_X_TOOLKIT}" = "LUCID"; then
|
|
|
|
AC_DEFINE(USE_LUCID, 1, [Define to 1 if using the Lucid X toolkit.])
|
|
|
|
elif test "${USE_X_TOOLKIT}" = "MOTIF"; then
|
|
|
|
AC_DEFINE(USE_MOTIF, 1, [Define to 1 if using the Motif X toolkit.])
|
|
|
|
MOTIF_LIBW=-lXm
|
|
|
|
case "$opsys" in
|
|
|
|
gnu-linux)
|
|
|
|
## Paul Abrahams <abrahams at equinox.shaysnet.com> says this is needed.
|
|
|
|
MOTIF_LIBW="$MOTIF_LIBW -lXpm"
|
|
|
|
;;
|
|
|
|
|
|
|
|
unixware)
|
|
|
|
## Richard Anthony Ryan <ryanr at ellingtn.ftc.nrcs.usda.gov>
|
|
|
|
## says -lXimp is needed in UNIX_SV ... 4.2 1.1.2.
|
|
|
|
MOTIF_LIBW="MOTIF_LIBW -lXimp"
|
|
|
|
;;
|
|
|
|
|
|
|
|
aix4-2)
|
|
|
|
## olson@mcs.anl.gov says -li18n is needed by -lXm.
|
|
|
|
MOTIF_LIBW="$MOTIF_LIBW -li18n"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
MOTIF_LIBW="$MOTIF_LIBW $LIBXP"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
AC_SUBST(WIDGET_OBJ)
|
|
|
|
|
|
|
|
TOOLKIT_LIBW=
|
|
|
|
case "$USE_X_TOOLKIT" in
|
|
|
|
MOTIF) TOOLKIT_LIBW="$MOTIF_LIBW" ;;
|
|
|
|
LUCID) TOOLKIT_LIBW="$LUCID_LIBW" ;;
|
|
|
|
none) test "x$HAVE_GTK" = "xyes" && TOOLKIT_LIBW="$GTK_LIBS" ;;
|
|
|
|
esac
|
|
|
|
AC_SUBST(TOOLKIT_LIBW)
|
|
|
|
|
2012-11-24 16:02:07 +00:00
|
|
|
if test "${opsys}" != "mingw32"; then
|
|
|
|
if test "$USE_X_TOOLKIT" = "none"; then
|
|
|
|
LIBXT_OTHER="\$(LIBXSM)"
|
|
|
|
else
|
|
|
|
LIBXT_OTHER="\$(LIBXMU) -lXt \$(LIBXTR6) -lXext"
|
|
|
|
fi
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
AC_SUBST(LIBXT_OTHER)
|
|
|
|
|
|
|
|
if test "${HAVE_X11}" = "yes" ; then
|
|
|
|
AC_DEFINE(HAVE_X11, 1,
|
Fix some dependency problems that cause unnecessary recompiles.
Problem reported by RMS in
<http://lists.gnu.org/archive/html/emacs-devel/2013-11/msg00421.html>.
* configure.ac (OLDXMENU_TARGET, OLDXMENU, LIBXMENU, OLDXMENU_DEPS):
Remove.
(LIBXMENU_DIR, LIBXMENU_BASE): New vars.
* src/Makefile.in (OLDXMENU_TARGET, OLDXMENU, OLDXMENU_DEPS)
(really-lwlib, really-oldXMenu, stamp-oldxmenu)
(../src/$(OLDXMENU), $(OLDXMENU)): Remove.
(LIBXMENU_DIR, LIBXMENU_BASE): New macros.
(LIBXMENU): Use them.
(temacs$(EXEEXT)): Depend on $(LIBXMENU), not stamp-oldxmenu.
($(lwlibdir)/liblw.a, $(oldXMenudir)/libXMenu11.a, FORCE): New targets.
(boostrap-clean): No need to remove stamp-oldxmenu.
2013-11-21 07:50:57 +00:00
|
|
|
[Define to 1 if you want to use version 11 of X windows.])
|
2010-12-03 14:45:09 +00:00
|
|
|
LIBX_OTHER="\$(LIBXT) \$(LIBX_EXTRA)"
|
|
|
|
else
|
|
|
|
LIBX_OTHER=
|
|
|
|
fi
|
Fix some dependency problems that cause unnecessary recompiles.
Problem reported by RMS in
<http://lists.gnu.org/archive/html/emacs-devel/2013-11/msg00421.html>.
* configure.ac (OLDXMENU_TARGET, OLDXMENU, LIBXMENU, OLDXMENU_DEPS):
Remove.
(LIBXMENU_DIR, LIBXMENU_BASE): New vars.
* src/Makefile.in (OLDXMENU_TARGET, OLDXMENU, OLDXMENU_DEPS)
(really-lwlib, really-oldXMenu, stamp-oldxmenu)
(../src/$(OLDXMENU), $(OLDXMENU)): Remove.
(LIBXMENU_DIR, LIBXMENU_BASE): New macros.
(LIBXMENU): Use them.
(temacs$(EXEEXT)): Depend on $(LIBXMENU), not stamp-oldxmenu.
($(lwlibdir)/liblw.a, $(oldXMenudir)/libXMenu11.a, FORCE): New targets.
(boostrap-clean): No need to remove stamp-oldxmenu.
2013-11-21 07:50:57 +00:00
|
|
|
AC_SUBST(LIBX_OTHER)
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2013-11-29 01:22:40 +00:00
|
|
|
if test "$HAVE_GTK" = yes || test "$HAVE_X11" != yes; then
|
2013-11-21 17:26:55 +00:00
|
|
|
LIBXMENU=
|
Fix some dependency problems that cause unnecessary recompiles.
Problem reported by RMS in
<http://lists.gnu.org/archive/html/emacs-devel/2013-11/msg00421.html>.
* configure.ac (OLDXMENU_TARGET, OLDXMENU, LIBXMENU, OLDXMENU_DEPS):
Remove.
(LIBXMENU_DIR, LIBXMENU_BASE): New vars.
* src/Makefile.in (OLDXMENU_TARGET, OLDXMENU, OLDXMENU_DEPS)
(really-lwlib, really-oldXMenu, stamp-oldxmenu)
(../src/$(OLDXMENU), $(OLDXMENU)): Remove.
(LIBXMENU_DIR, LIBXMENU_BASE): New macros.
(LIBXMENU): Use them.
(temacs$(EXEEXT)): Depend on $(LIBXMENU), not stamp-oldxmenu.
($(lwlibdir)/liblw.a, $(oldXMenudir)/libXMenu11.a, FORCE): New targets.
(boostrap-clean): No need to remove stamp-oldxmenu.
2013-11-21 07:50:57 +00:00
|
|
|
elif test "$USE_X_TOOLKIT" = none; then
|
2013-11-21 17:26:55 +00:00
|
|
|
LIBXMENU='$(oldXMenudir)/libXMenu11.a'
|
Fix some dependency problems that cause unnecessary recompiles.
Problem reported by RMS in
<http://lists.gnu.org/archive/html/emacs-devel/2013-11/msg00421.html>.
* configure.ac (OLDXMENU_TARGET, OLDXMENU, LIBXMENU, OLDXMENU_DEPS):
Remove.
(LIBXMENU_DIR, LIBXMENU_BASE): New vars.
* src/Makefile.in (OLDXMENU_TARGET, OLDXMENU, OLDXMENU_DEPS)
(really-lwlib, really-oldXMenu, stamp-oldxmenu)
(../src/$(OLDXMENU), $(OLDXMENU)): Remove.
(LIBXMENU_DIR, LIBXMENU_BASE): New macros.
(LIBXMENU): Use them.
(temacs$(EXEEXT)): Depend on $(LIBXMENU), not stamp-oldxmenu.
($(lwlibdir)/liblw.a, $(oldXMenudir)/libXMenu11.a, FORCE): New targets.
(boostrap-clean): No need to remove stamp-oldxmenu.
2013-11-21 07:50:57 +00:00
|
|
|
else
|
2013-11-21 17:26:55 +00:00
|
|
|
LIBXMENU='$(lwlibdir)/liblw.a'
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
2013-11-21 17:26:55 +00:00
|
|
|
AC_SUBST(LIBXMENU)
|
2010-12-03 14:45:09 +00:00
|
|
|
|
Improve the experimental local and scoped allocation.
* configure.ac (HAVE_STRUCT_ATTRIBUTE_ALIGNED)
(HAVE_STATEMENT_EXPRESSIONS): New configure-time checks.
* src/alloc.c (local_string_init, local_vector_init):
New functions, defined if USE_LOCAL_ALLOCATORS.
Mostly, these are moved here from lisp.h, as it's not
clear it's worth making them inline.
* src/lisp.h (USE_STACK_LISP_OBJECTS): Default to false.
(GCALIGNED): Depend on HAVE_STRUCT_ATTRIBUTE_ALIGNED and
USE_STACK_LISP_OBJECTS, not on a laundry list.
(local_string_init, local_vector_init): New decls.
(union Aligned_Cons): New type.
(scoped_cons): Use it. Give up on the char trick, as it's a too
much of a maintenance hassle; if someone wants this speedup
they'll just need to convince their compiler to align properly.
Conversely, use the speedup if struct Lisp_Cons happens to
be aligned even without a directive. Better yet, help it along
by using union Aligned_Cons rather than struct Lisp_Cons.
(pointer_valid_for_lisp_object): Remove. This check is not
necessary, since make_lisp_ptr is already doing it. All uses removed.
(local_vector_init, local_string_init): Move to alloc.c.
(build_local_vector): Remove this awkward macro, replacing with ...
(make_local_vector): New macro, which acts more like a function.
Use statement expressions and use __COUNTER__ to avoid macro
capture. Fall back on functions if these features are not supported.
(build_local_string, make_local_string): Likewise.
2014-09-10 06:38:38 +00:00
|
|
|
AC_CACHE_CHECK([for struct alignment],
|
|
|
|
[emacs_cv_struct_alignment],
|
|
|
|
[AC_COMPILE_IFELSE(
|
|
|
|
[AC_LANG_PROGRAM([[#include <stddef.h>
|
|
|
|
struct __attribute__ ((aligned (8))) s { char c; };
|
|
|
|
struct t { char c; struct s s; };
|
|
|
|
char verify[offsetof (struct t, s) == 8 ? 1 : -1];
|
|
|
|
]])],
|
|
|
|
[emacs_cv_struct_alignment=yes],
|
|
|
|
[emacs_cv_struct_alignment=no])])
|
|
|
|
if test "$emacs_cv_struct_alignment" = yes; then
|
|
|
|
AC_DEFINE([HAVE_STRUCT_ATTRIBUTE_ALIGNED], 1,
|
|
|
|
[Define to 1 if 'struct __attribute__ ((aligned (N)))' aligns the
|
|
|
|
structure to an N-byte boundary.])
|
|
|
|
fi
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "${GNU_MALLOC}" = "yes" ; then
|
|
|
|
AC_DEFINE(GNU_MALLOC, 1,
|
|
|
|
[Define to 1 if you want to use the GNU memory allocator.])
|
|
|
|
fi
|
|
|
|
|
|
|
|
RALLOC_OBJ=
|
|
|
|
if test "${REL_ALLOC}" = "yes" ; then
|
|
|
|
AC_DEFINE(REL_ALLOC, 1,
|
|
|
|
[Define REL_ALLOC if you want to use the relocating allocator for
|
|
|
|
buffer space.])
|
|
|
|
|
|
|
|
test "$system_malloc" != "yes" && RALLOC_OBJ=ralloc.o
|
|
|
|
fi
|
|
|
|
AC_SUBST(RALLOC_OBJ)
|
|
|
|
|
|
|
|
if test "$opsys" = "cygwin"; then
|
2012-09-17 11:55:02 +00:00
|
|
|
CYGWIN_OBJ="sheap.o cygw32.o"
|
2010-12-03 14:45:09 +00:00
|
|
|
## Cygwin differs because of its unexec().
|
|
|
|
PRE_ALLOC_OBJ=
|
|
|
|
POST_ALLOC_OBJ=lastfile.o
|
2012-11-23 15:22:47 +00:00
|
|
|
elif test "$opsys" = "mingw32"; then
|
|
|
|
CYGWIN_OBJ=
|
|
|
|
PRE_ALLOC_OBJ=
|
|
|
|
POST_ALLOC_OBJ=lastfile.o
|
2010-12-03 14:45:09 +00:00
|
|
|
else
|
|
|
|
CYGWIN_OBJ=
|
|
|
|
PRE_ALLOC_OBJ=lastfile.o
|
|
|
|
POST_ALLOC_OBJ=
|
|
|
|
fi
|
|
|
|
AC_SUBST(CYGWIN_OBJ)
|
|
|
|
AC_SUBST(PRE_ALLOC_OBJ)
|
|
|
|
AC_SUBST(POST_ALLOC_OBJ)
|
|
|
|
|
2013-09-20 03:41:37 +00:00
|
|
|
dnl Call this 'FORTIFY_SOUR' so that it sorts before the 'FORTIFY_SOURCE'
|
|
|
|
dnl verbatim defined above. The tricky name is apropos, as this hack
|
|
|
|
dnl makes Fortify go sour!
|
|
|
|
AH_VERBATIM([FORTIFY_SOUR],
|
|
|
|
[/* Without the following workaround, Emacs runs slowly on OS X 10.8.
|
|
|
|
The workaround disables some useful run-time checking, so it
|
|
|
|
should be conditional to the platforms with the performance bug.
|
|
|
|
Perhaps Apple will fix this some day; also see m4/extern-inline.m4. */
|
|
|
|
#if defined __APPLE__ && defined __GNUC__
|
|
|
|
# ifndef _DONT_USE_CTYPE_INLINE_
|
|
|
|
# define _DONT_USE_CTYPE_INLINE_
|
|
|
|
# endif
|
|
|
|
# ifndef _FORTIFY_SOURCE
|
|
|
|
# define _FORTIFY_SOURCE 0
|
|
|
|
# endif
|
|
|
|
#endif
|
|
|
|
])
|
|
|
|
|
2014-06-05 00:34:34 +00:00
|
|
|
# If user asks to omit features, disable optional features that gnulib
|
|
|
|
# might otherwise enable.
|
|
|
|
if test "$with_features" = no && test "$enable_acl" != yes; then
|
|
|
|
enable_acl=no
|
|
|
|
fi
|
|
|
|
|
2012-07-17 02:09:58 +00:00
|
|
|
# Configure gnulib. Although this does not affect CFLAGS or LIBS permanently.
|
|
|
|
# it temporarily reverts them to their pre-pkg-config values,
|
|
|
|
# because gnulib needs to work with both src (which uses the
|
|
|
|
# pkg-config stuff) and lib-src (which does not). For example, gnulib
|
|
|
|
# may need to determine whether LIB_CLOCK_GETTIME should contain -lrt,
|
|
|
|
# and it therefore needs to run in an environment where LIBS does not
|
|
|
|
# already contain -lrt merely because 'pkg-config --libs' printed '-lrt'
|
|
|
|
# for some package unrelated to lib-src.
|
|
|
|
SAVE_CFLAGS=$CFLAGS
|
|
|
|
SAVE_LIBS=$LIBS
|
|
|
|
CFLAGS=$pre_PKG_CONFIG_CFLAGS
|
|
|
|
LIBS="$LIB_PTHREAD $pre_PKG_CONFIG_LIBS"
|
|
|
|
gl_ASSERT_NO_GNULIB_POSIXCHECK
|
|
|
|
gl_ASSERT_NO_GNULIB_TESTS
|
|
|
|
gl_INIT
|
|
|
|
CFLAGS=$SAVE_CFLAGS
|
|
|
|
LIBS=$SAVE_LIBS
|
|
|
|
|
2012-11-24 16:02:07 +00:00
|
|
|
if test "${opsys}" = "mingw32"; then
|
2013-10-24 02:15:16 +00:00
|
|
|
CPPFLAGS="$CPPFLAGS -DUSE_CRT_DLL=1 -I \${abs_top_srcdir}/nt/inc"
|
2012-11-24 16:02:07 +00:00
|
|
|
# Remove unneeded switches from the value of CC that goes to Makefiles
|
|
|
|
CC=`echo $CC | sed -e "s,$GCC_TEST_OPTIONS,,"`
|
|
|
|
fi
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
case "$opsys" in
|
|
|
|
aix4-2) LD_SWITCH_SYSTEM_TEMACS="-Wl,-bnodelcsect" ;;
|
|
|
|
|
2014-10-11 17:16:12 +00:00
|
|
|
cygwin) LD_SWITCH_SYSTEM_TEMACS="-Wl,-stack,0x00800000" ;;
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
darwin)
|
|
|
|
## The -headerpad option tells ld (see man page) to leave room at the
|
|
|
|
## end of the header for adding load commands. Needed for dumping.
|
2014-09-21 20:35:22 +00:00
|
|
|
## 0x1000 is enough for roughly 52 load commands on the x86_64
|
|
|
|
## architecture (where they are 78 bytes each). The actual number of
|
|
|
|
## load commands added is not consistent but normally ranges from
|
|
|
|
## about 14 to about 34. Setting it high gets us plenty of slop and
|
|
|
|
## only costs about 1.5K of wasted binary space.
|
|
|
|
headerpad_extra=1000
|
2010-12-03 14:45:09 +00:00
|
|
|
if test "$HAVE_NS" = "yes"; then
|
|
|
|
libs_nsgui="-framework AppKit"
|
2013-05-09 15:17:38 +00:00
|
|
|
if test "$NS_IMPL_COCOA" = "yes"; then
|
|
|
|
libs_nsgui="$libs_nsgui -framework IOKit"
|
|
|
|
fi
|
2010-12-03 14:45:09 +00:00
|
|
|
else
|
|
|
|
libs_nsgui=
|
|
|
|
fi
|
2011-07-11 23:13:28 +00:00
|
|
|
LD_SWITCH_SYSTEM_TEMACS="-fno-pie -prebind $libs_nsgui -Xlinker -headerpad -Xlinker $headerpad_extra"
|
2011-01-22 00:12:10 +00:00
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
## This is here because src/Makefile.in did some extra fiddling around
|
File synchronization fixes.
* admin/CPP-DEFINES (BSD_SYSTEM, HAVE_FSYNC): Remove.
* admin/merge-gnulib (GNULIB_MODULES): Add fsync, fdatasync.
* configure.ac (BSD_SYSTEM, BSD_SYSTEM_AHB): Remove; no longer needed.
(fsync): Remove check; now done by gnulib.
* lib/fdatasync.c, lib/fsync.c, m4/fdatasync.m4, m4/fsync.m4:
New files, from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib-src/Makefile.in (LIB_FDATASYNC): New macro.
(emacsclient${EXEEXT}): Use it.
* lib-src/emacsclient.c (main): Use fdatasync, not fsync, since we don't
care about metadata. Keep trying if interrupted.
* lib-src/movemail.c (main, popmail): Don't worry about BSD_SYSTEM, since
fsync is available everywhere (or there is a substitute). Don't
report an error if fsync returns EINVAL.
* nt/inc/ms-w32.h (fdatasync): New macro, suggested by Eli Zaretskii.
* src/Makefile.in (LIB_FDATASYNC): New macro.
(LIBES): Use it.
* src/conf_post.h (BSD_SYSTEM, BSD_SYSTEM_AHB): Remove; no longer needed.
* src/fileio.c (Fwrite_region, write_region_inhibit_fsync):
Don't worry about HAVE_FSYNC, since a substitute fsync is
available if the system lacks one.
(Fwrite_regin): Retry fsync if interrupted.
Fixes: debbugs:13944
2013-03-13 18:42:22 +00:00
|
|
|
## with LD_SWITCH_SYSTEM. It seems cleaner to put this in
|
|
|
|
## LD_SWITCH_SYSTEM_TEMACS instead,
|
2010-12-03 14:45:09 +00:00
|
|
|
test "x$LD_SWITCH_SYSTEM" = "x" && test "x$GCC" != "xyes" && \
|
|
|
|
LD_SWITCH_SYSTEM_TEMACS="-X $LD_SWITCH_SYSTEM_TEMACS"
|
|
|
|
;;
|
|
|
|
|
2012-05-01 00:16:02 +00:00
|
|
|
## LD_SWITCH_X_SITE_RPATH is a -rpath option saying where to
|
2012-05-01 00:12:02 +00:00
|
|
|
## find X at run-time.
|
|
|
|
## When handled by cpp, this was in LD_SWITCH_SYSTEM. However, at the
|
2012-05-01 00:16:02 +00:00
|
|
|
## point where configure sourced the s/*.h file, LD_SWITCH_X_SITE_RPATH
|
2010-12-03 14:45:09 +00:00
|
|
|
## had not yet been defined and was expanded to null. Hence LD_SWITCH_SYSTEM
|
|
|
|
## had different values in configure (in ac_link) and src/Makefile.in.
|
|
|
|
## It seems clearer therefore to put this piece in LD_SWITCH_SYSTEM_TEMACS.
|
2012-05-01 00:16:02 +00:00
|
|
|
gnu*) LD_SWITCH_SYSTEM_TEMACS="\$(LD_SWITCH_X_SITE_RPATH)" ;;
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2012-11-23 17:59:10 +00:00
|
|
|
mingw32)
|
Use mmap(2) emulation for buffer text on MS-Windows.
src/Makefile.in (C_HEAP_SWITCH): Get the predefined heap size from
configure.
(ADDSECTION, MINGW_TEMACS_POST_LINK): Remove, no longer used.
src/lisp.h (NONPOINTER_BITS): Modify the condition to define to zero
for MinGW, since it no longer uses gmalloc.
src/buffer.c: Do not define mmap allocations functions for Windows.
Remove mmap_find which is unused. Remove mmap_set_vars which does
nothing useful.
[WINDOWSNT]: Include w32heap.h.
(init_buffer): Always allocate new memory for buffers.
src/emacs.c: Remove mmap_set_vars calls.
src/image.c (free_image): Undef free for Windows because it is
redirected to our private version.
src/unexw32.c (COPY_PROC_CHUNK): Use %p format for 64bits
compatibility.
(copy_executable_and_dump_data): Remove dumping the heap section.
(unexec): Restore using_dynamic_heap after dumping.
src/w32heap.c (dumped_data_commit, malloc_after_dump)
(malloc_before_dump, realloc_after_dump, realloc_before_dump)
(free_after_dump, free_before_dump, mmap_alloc, mmap_realloc)
(mmap_free): New functions.
src/w32heap.h: Declare dumped_data and mmap_* function prototypes.
nt/inc/ms-w32.h: Switch to the system heap allocation scheme
instead of GNU malloc and ralloc.
nt/inc/sys/mman.h: New file.
nt/INSTALL: Update for the new build requirements.
etc/NEWS: Mention build changes on MS-Windows.
configure.ac (C_HEAP_SWITCH) define for different values of
dumped heap size depending on 32/64bits arch on Windows.
Don't check for pthreads.h on MinGW32/64, it gets in the way.
Use mmap(2) for buffers and system malloc for MinGW32/64.
2014-05-27 17:31:17 +00:00
|
|
|
## Is it any better under MinGW64 to relocate emacs into higher addresses?
|
2013-04-01 13:18:20 +00:00
|
|
|
case "$canonical" in
|
Use mmap(2) emulation for buffer text on MS-Windows.
src/Makefile.in (C_HEAP_SWITCH): Get the predefined heap size from
configure.
(ADDSECTION, MINGW_TEMACS_POST_LINK): Remove, no longer used.
src/lisp.h (NONPOINTER_BITS): Modify the condition to define to zero
for MinGW, since it no longer uses gmalloc.
src/buffer.c: Do not define mmap allocations functions for Windows.
Remove mmap_find which is unused. Remove mmap_set_vars which does
nothing useful.
[WINDOWSNT]: Include w32heap.h.
(init_buffer): Always allocate new memory for buffers.
src/emacs.c: Remove mmap_set_vars calls.
src/image.c (free_image): Undef free for Windows because it is
redirected to our private version.
src/unexw32.c (COPY_PROC_CHUNK): Use %p format for 64bits
compatibility.
(copy_executable_and_dump_data): Remove dumping the heap section.
(unexec): Restore using_dynamic_heap after dumping.
src/w32heap.c (dumped_data_commit, malloc_after_dump)
(malloc_before_dump, realloc_after_dump, realloc_before_dump)
(free_after_dump, free_before_dump, mmap_alloc, mmap_realloc)
(mmap_free): New functions.
src/w32heap.h: Declare dumped_data and mmap_* function prototypes.
nt/inc/ms-w32.h: Switch to the system heap allocation scheme
instead of GNU malloc and ralloc.
nt/inc/sys/mman.h: New file.
nt/INSTALL: Update for the new build requirements.
etc/NEWS: Mention build changes on MS-Windows.
configure.ac (C_HEAP_SWITCH) define for different values of
dumped heap size depending on 32/64bits arch on Windows.
Don't check for pthreads.h on MinGW32/64, it gets in the way.
Use mmap(2) for buffers and system malloc for MinGW32/64.
2014-05-27 17:31:17 +00:00
|
|
|
x86_64-*-*) LD_SWITCH_SYSTEM_TEMACS="-Wl,-stack,0x00800000 -Wl,-heap,0x00100000 -Wl,-image-base,0x400000000 -Wl,-entry,__start -Wl,-Map,./temacs.map" ;;
|
2013-04-23 17:06:09 +00:00
|
|
|
*) LD_SWITCH_SYSTEM_TEMACS="-Wl,-stack,0x00800000 -Wl,-heap,0x00100000 -Wl,-image-base,0x01000000 -Wl,-entry,__start -Wl,-Map,./temacs.map" ;;
|
2013-04-01 13:18:20 +00:00
|
|
|
esac
|
2012-11-23 17:59:10 +00:00
|
|
|
;;
|
|
|
|
|
2013-05-13 06:23:08 +00:00
|
|
|
openbsd) LD_SWITCH_SYSTEM_TEMACS='-nopie' ;;
|
2013-05-13 03:54:34 +00:00
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
*) LD_SWITCH_SYSTEM_TEMACS= ;;
|
|
|
|
esac
|
|
|
|
|
2013-04-07 06:21:40 +00:00
|
|
|
if test x$ac_enable_profiling != x ; then
|
|
|
|
case $opsys in
|
|
|
|
*freebsd | gnu-linux) ;;
|
|
|
|
*) LD_SWITCH_SYSTEM_TEMACS="$LD_SWITCH_SYSTEM_TEMACS -pg" ;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
|
2013-09-09 07:34:15 +00:00
|
|
|
LD_SWITCH_SYSTEM_TEMACS="$LDFLAGS_NOCOMBRELOC $LD_SWITCH_SYSTEM_TEMACS"
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_SUBST(LD_SWITCH_SYSTEM_TEMACS)
|
|
|
|
|
2012-09-01 06:38:52 +00:00
|
|
|
## Common for all window systems
|
|
|
|
if test "$window_system" != "none"; then
|
2010-12-03 14:45:09 +00:00
|
|
|
AC_DEFINE(HAVE_WINDOW_SYSTEM, 1, [Define if you have a window system.])
|
2014-06-05 06:24:54 +00:00
|
|
|
AC_DEFINE(POLL_FOR_INPUT, 1, [Define if you poll periodically to detect C-g.])
|
2012-09-01 06:38:52 +00:00
|
|
|
WINDOW_SYSTEM_OBJ="fontset.o fringe.o image.o"
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
|
2012-09-01 06:38:52 +00:00
|
|
|
AC_SUBST(WINDOW_SYSTEM_OBJ)
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
AH_TOP([/* GNU Emacs site configuration template file.
|
2011-01-25 04:08:28 +00:00
|
|
|
|
2014-01-01 08:31:29 +00:00
|
|
|
Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2014
|
2011-01-25 04:08:28 +00:00
|
|
|
Free Software Foundation, Inc.
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
GNU Emacs is free software: you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
|
|
|
|
|
|
|
|
/* No code in Emacs #includes config.h twice, but some bits of code
|
|
|
|
intended to work with other packages as well (like gmalloc.c)
|
|
|
|
think they can include it as many times as they like. */
|
|
|
|
#ifndef EMACS_CONFIG_H
|
|
|
|
#define EMACS_CONFIG_H
|
|
|
|
])dnl
|
|
|
|
|
2012-07-30 21:20:43 +00:00
|
|
|
AH_BOTTOM([#include <conf_post.h>
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
#endif /* EMACS_CONFIG_H */
|
|
|
|
|
|
|
|
/*
|
|
|
|
Local Variables:
|
|
|
|
mode: c
|
|
|
|
End:
|
|
|
|
*/
|
|
|
|
])dnl
|
|
|
|
|
|
|
|
#### Report on what we decided to do.
|
|
|
|
#### Report GTK as a toolkit, even if it doesn't use Xt.
|
|
|
|
#### It makes printing result more understandable as using GTK sets
|
|
|
|
#### toolkit_scroll_bars to yes by default.
|
|
|
|
if test "${HAVE_GTK}" = "yes"; then
|
2012-09-18 18:13:01 +00:00
|
|
|
USE_X_TOOLKIT="$USE_GTK_TOOLKIT"
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
|
2013-06-16 05:33:12 +00:00
|
|
|
if test $USE_ACL -ne 0; then
|
2014-03-28 22:03:42 +00:00
|
|
|
ACL_SUMMARY="yes $LIB_ACL"
|
2013-06-16 05:33:12 +00:00
|
|
|
else
|
2014-03-28 22:03:42 +00:00
|
|
|
ACL_SUMMARY=no
|
2013-06-16 05:33:12 +00:00
|
|
|
fi
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
echo "
|
|
|
|
Configured for \`${canonical}'.
|
|
|
|
|
|
|
|
Where should the build process find the source code? ${srcdir}
|
|
|
|
What compiler should emacs be built with? ${CC} ${CFLAGS}
|
|
|
|
Should Emacs use the GNU version of malloc? ${GNU_MALLOC}${GNU_MALLOC_reason}
|
|
|
|
Should Emacs use a relocating allocator for buffers? ${REL_ALLOC}
|
|
|
|
Should Emacs use mmap(2) for buffer allocation? $use_mmap_for_buffers
|
|
|
|
What window system should Emacs use? ${window_system}
|
|
|
|
What toolkit should Emacs use? ${USE_X_TOOLKIT}"
|
|
|
|
|
|
|
|
if test -n "${x_includes}"; then
|
|
|
|
echo " Where do we find X Windows header files? ${x_includes}"
|
|
|
|
else
|
|
|
|
echo " Where do we find X Windows header files? Standard dirs"
|
|
|
|
fi
|
|
|
|
if test -n "${x_libraries}"; then
|
|
|
|
echo " Where do we find X Windows libraries? ${x_libraries}"
|
|
|
|
else
|
|
|
|
echo " Where do we find X Windows libraries? Standard dirs"
|
|
|
|
fi
|
|
|
|
|
2014-03-28 22:03:42 +00:00
|
|
|
optsep=
|
|
|
|
emacs_config_features=
|
|
|
|
for opt in XAW3D XPM JPEG TIFF GIF PNG RSVG IMAGEMAGICK SOUND GPM DBUS \
|
|
|
|
GCONF GSETTINGS NOTIFY ACL LIBSELINUX GNUTLS LIBXML2 FREETYPE M17N_FLT \
|
|
|
|
LIBOTF XFT ZLIB; do
|
|
|
|
|
|
|
|
case $opt in
|
|
|
|
NOTIFY|ACL) eval val=\${${opt}_SUMMARY} ;;
|
|
|
|
*) eval val=\${HAVE_$opt} ;;
|
|
|
|
esac
|
|
|
|
test x"$val" = xno && continue
|
|
|
|
AS_VAR_APPEND([emacs_config_features], ["$optsep$opt"])
|
|
|
|
optsep=' '
|
|
|
|
done
|
|
|
|
AC_DEFINE_UNQUOTED(EMACS_CONFIG_FEATURES, "${emacs_config_features}",
|
|
|
|
[Summary of some of the main features enabled by configure.])
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
echo " Does Emacs use -lXaw3d? ${HAVE_XAW3D}"
|
|
|
|
echo " Does Emacs use -lXpm? ${HAVE_XPM}"
|
|
|
|
echo " Does Emacs use -ljpeg? ${HAVE_JPEG}"
|
|
|
|
echo " Does Emacs use -ltiff? ${HAVE_TIFF}"
|
|
|
|
echo " Does Emacs use a gif library? ${HAVE_GIF} $LIBGIF"
|
2014-05-01 21:57:27 +00:00
|
|
|
echo " Does Emacs use a png library? ${HAVE_PNG} $LIBPNG"
|
2010-12-03 14:45:09 +00:00
|
|
|
echo " Does Emacs use -lrsvg-2? ${HAVE_RSVG}"
|
|
|
|
echo " Does Emacs use imagemagick? ${HAVE_IMAGEMAGICK}"
|
|
|
|
|
2013-07-27 01:18:21 +00:00
|
|
|
echo " Does Emacs support sound? ${HAVE_SOUND}"
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
echo " Does Emacs use -lgpm? ${HAVE_GPM}"
|
|
|
|
echo " Does Emacs use -ldbus? ${HAVE_DBUS}"
|
|
|
|
echo " Does Emacs use -lgconf? ${HAVE_GCONF}"
|
2011-06-30 14:00:26 +00:00
|
|
|
echo " Does Emacs use GSettings? ${HAVE_GSETTINGS}"
|
2013-06-03 13:03:05 +00:00
|
|
|
echo " Does Emacs use a file notification library? ${NOTIFY_SUMMARY}"
|
2014-03-28 22:03:42 +00:00
|
|
|
echo " Does Emacs use access control lists? ${ACL_SUMMARY}"
|
2010-12-03 14:45:09 +00:00
|
|
|
echo " Does Emacs use -lselinux? ${HAVE_LIBSELINUX}"
|
2011-11-04 22:16:46 +00:00
|
|
|
echo " Does Emacs use -lgnutls? ${HAVE_GNUTLS}"
|
2010-12-03 14:45:09 +00:00
|
|
|
echo " Does Emacs use -lxml2? ${HAVE_LIBXML2}"
|
|
|
|
|
|
|
|
echo " Does Emacs use -lfreetype? ${HAVE_FREETYPE}"
|
|
|
|
echo " Does Emacs use -lm17n-flt? ${HAVE_M17N_FLT}"
|
|
|
|
echo " Does Emacs use -lotf? ${HAVE_LIBOTF}"
|
|
|
|
echo " Does Emacs use -lxft? ${HAVE_XFT}"
|
2013-08-11 22:58:47 +00:00
|
|
|
echo " Does Emacs directly use zlib? ${HAVE_ZLIB}"
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
echo " Does Emacs use toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}"
|
|
|
|
echo
|
|
|
|
|
2011-11-22 08:02:21 +00:00
|
|
|
if test -n "${EMACSDATA}"; then
|
|
|
|
echo " Environment variable EMACSDATA set to: $EMACSDATA"
|
|
|
|
fi
|
|
|
|
if test -n "${EMACSDOC}"; then
|
|
|
|
echo " Environment variable EMACSDOC set to: $EMACSDOC"
|
|
|
|
fi
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
echo
|
|
|
|
|
|
|
|
if test "$HAVE_NS" = "yes"; then
|
|
|
|
echo
|
2011-10-25 20:46:31 +00:00
|
|
|
echo "You must run \"${MAKE-make} install\" in order to test the built application.
|
2010-12-03 14:45:09 +00:00
|
|
|
The installed application will go to nextstep/Emacs.app and can be
|
|
|
|
run or moved from there."
|
|
|
|
if test "$EN_NS_SELF_CONTAINED" = "yes"; then
|
|
|
|
echo "The application will be fully self-contained."
|
|
|
|
else
|
|
|
|
echo "The lisp resources for the application will be installed under ${prefix}.
|
2011-10-25 20:46:31 +00:00
|
|
|
You may need to run \"${MAKE-make} install\" with sudo. The application will fail
|
2010-12-03 14:45:09 +00:00
|
|
|
to run if these resources are not installed."
|
|
|
|
fi
|
|
|
|
echo
|
|
|
|
fi
|
|
|
|
|
2012-04-12 12:17:20 +00:00
|
|
|
if test "${opsys}" = "cygwin"; then
|
|
|
|
case `uname -r` in
|
|
|
|
1.5.*) AC_MSG_WARN([[building Emacs on Cygwin 1.5 is not supported.]])
|
|
|
|
echo
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
fi
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
# Remove any trailing slashes in these variables.
|
|
|
|
[test "${prefix}" != NONE &&
|
|
|
|
prefix=`echo "${prefix}" | sed 's,\([^/]\)/*$,\1,'`
|
|
|
|
test "${exec_prefix}" != NONE &&
|
|
|
|
exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'`]
|
|
|
|
|
Increase compartmentalization of Nextstep builds rules,
and store Emacs version number in fewer versioned files.
* configure.ac (ns_appsrc): Use relative names.
(ns_frag): Remove.
(Info-gnustep.plist, Emacs.desktop, Info.plist, InfoPlist.strings)
(nextstep/Makefile): Generate these nextstep files.
(SUBDIR_MAKEFILES): Add nextstep.
* Makefile.in (clean, distclean, bootstrap-clean): Add nextstep.
* make-dist (nextstep/templates): Add directory.
(nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj): Remove.
(nextstep/Cocoa/Emacs.base/Contents)
(nextstep/GNUstep/Emacs.base/Resources): Update contents.
* .bzrignore: Add some nextstep files.
* admin/admin.el (set-version): No more need to set nextstep versions.
(set-copyright): Update for moved nextstep files.
* nextstep/Makefile.in: New file.
* nextstep/templates: New directory.
* nextstep/templates/Emacs.desktop.in, nextstep/templates/Info-gnustep.plist.in:
* nextstep/templates/Info.plist.in, nextstep/templates/InfoPlist.strings.in:
Move here from various Cocoa/, GNUstep/ locations.
Let configure set the version number.
* nextstep/Cocoa/Emacs.base/Contents/Info.plist:
* nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
* nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist:
* nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop: Move to templates/.
* nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj: Remove directory.
* src/Makefile.in (ns_appdir, ns_appbindir, ns_appsrc): Remove variables.
(ns_frag): Remove.
(ns-app): Move here from ns.mk, and simplify.
(clean): Simplify nextstep entry.
* src/ns.mk: Remove file.
2012-09-16 18:49:00 +00:00
|
|
|
if test "$HAVE_NS" = "yes"; then
|
|
|
|
if test "$NS_IMPL_GNUSTEP" = yes; then
|
|
|
|
AC_CONFIG_FILES([nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist:nextstep/templates/Info-gnustep.plist.in \
|
|
|
|
nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop:nextstep/templates/Emacs.desktop.in])
|
2013-09-02 07:01:53 +00:00
|
|
|
ns_check_file=Resources/Info-gnustep.plist
|
Increase compartmentalization of Nextstep builds rules,
and store Emacs version number in fewer versioned files.
* configure.ac (ns_appsrc): Use relative names.
(ns_frag): Remove.
(Info-gnustep.plist, Emacs.desktop, Info.plist, InfoPlist.strings)
(nextstep/Makefile): Generate these nextstep files.
(SUBDIR_MAKEFILES): Add nextstep.
* Makefile.in (clean, distclean, bootstrap-clean): Add nextstep.
* make-dist (nextstep/templates): Add directory.
(nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj): Remove.
(nextstep/Cocoa/Emacs.base/Contents)
(nextstep/GNUstep/Emacs.base/Resources): Update contents.
* .bzrignore: Add some nextstep files.
* admin/admin.el (set-version): No more need to set nextstep versions.
(set-copyright): Update for moved nextstep files.
* nextstep/Makefile.in: New file.
* nextstep/templates: New directory.
* nextstep/templates/Emacs.desktop.in, nextstep/templates/Info-gnustep.plist.in:
* nextstep/templates/Info.plist.in, nextstep/templates/InfoPlist.strings.in:
Move here from various Cocoa/, GNUstep/ locations.
Let configure set the version number.
* nextstep/Cocoa/Emacs.base/Contents/Info.plist:
* nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
* nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist:
* nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop: Move to templates/.
* nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj: Remove directory.
* src/Makefile.in (ns_appdir, ns_appbindir, ns_appsrc): Remove variables.
(ns_frag): Remove.
(ns-app): Move here from ns.mk, and simplify.
(clean): Simplify nextstep entry.
* src/ns.mk: Remove file.
2012-09-16 18:49:00 +00:00
|
|
|
else
|
|
|
|
AC_CONFIG_FILES([nextstep/Cocoa/Emacs.base/Contents/Info.plist:nextstep/templates/Info.plist.in \
|
|
|
|
nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:nextstep/templates/InfoPlist.strings.in])
|
2013-09-02 07:01:53 +00:00
|
|
|
ns_check_file=Contents/Info.plist
|
Increase compartmentalization of Nextstep builds rules,
and store Emacs version number in fewer versioned files.
* configure.ac (ns_appsrc): Use relative names.
(ns_frag): Remove.
(Info-gnustep.plist, Emacs.desktop, Info.plist, InfoPlist.strings)
(nextstep/Makefile): Generate these nextstep files.
(SUBDIR_MAKEFILES): Add nextstep.
* Makefile.in (clean, distclean, bootstrap-clean): Add nextstep.
* make-dist (nextstep/templates): Add directory.
(nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj): Remove.
(nextstep/Cocoa/Emacs.base/Contents)
(nextstep/GNUstep/Emacs.base/Resources): Update contents.
* .bzrignore: Add some nextstep files.
* admin/admin.el (set-version): No more need to set nextstep versions.
(set-copyright): Update for moved nextstep files.
* nextstep/Makefile.in: New file.
* nextstep/templates: New directory.
* nextstep/templates/Emacs.desktop.in, nextstep/templates/Info-gnustep.plist.in:
* nextstep/templates/Info.plist.in, nextstep/templates/InfoPlist.strings.in:
Move here from various Cocoa/, GNUstep/ locations.
Let configure set the version number.
* nextstep/Cocoa/Emacs.base/Contents/Info.plist:
* nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
* nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist:
* nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop: Move to templates/.
* nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj: Remove directory.
* src/Makefile.in (ns_appdir, ns_appbindir, ns_appsrc): Remove variables.
(ns_frag): Remove.
(ns-app): Move here from ns.mk, and simplify.
(clean): Simplify nextstep entry.
* src/ns.mk: Remove file.
2012-09-16 18:49:00 +00:00
|
|
|
fi
|
2013-09-02 07:01:53 +00:00
|
|
|
AC_SUBST(ns_check_file)
|
Increase compartmentalization of Nextstep builds rules,
and store Emacs version number in fewer versioned files.
* configure.ac (ns_appsrc): Use relative names.
(ns_frag): Remove.
(Info-gnustep.plist, Emacs.desktop, Info.plist, InfoPlist.strings)
(nextstep/Makefile): Generate these nextstep files.
(SUBDIR_MAKEFILES): Add nextstep.
* Makefile.in (clean, distclean, bootstrap-clean): Add nextstep.
* make-dist (nextstep/templates): Add directory.
(nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj): Remove.
(nextstep/Cocoa/Emacs.base/Contents)
(nextstep/GNUstep/Emacs.base/Resources): Update contents.
* .bzrignore: Add some nextstep files.
* admin/admin.el (set-version): No more need to set nextstep versions.
(set-copyright): Update for moved nextstep files.
* nextstep/Makefile.in: New file.
* nextstep/templates: New directory.
* nextstep/templates/Emacs.desktop.in, nextstep/templates/Info-gnustep.plist.in:
* nextstep/templates/Info.plist.in, nextstep/templates/InfoPlist.strings.in:
Move here from various Cocoa/, GNUstep/ locations.
Let configure set the version number.
* nextstep/Cocoa/Emacs.base/Contents/Info.plist:
* nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
* nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist:
* nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop: Move to templates/.
* nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj: Remove directory.
* src/Makefile.in (ns_appdir, ns_appbindir, ns_appsrc): Remove variables.
(ns_frag): Remove.
(ns-app): Move here from ns.mk, and simplify.
(clean): Simplify nextstep entry.
* src/ns.mk: Remove file.
2012-09-16 18:49:00 +00:00
|
|
|
fi
|
|
|
|
|
2011-05-24 19:12:58 +00:00
|
|
|
dnl Obviously there is duplication here wrt $SUBDIR_MAKEFILES.
|
2011-05-26 00:55:14 +00:00
|
|
|
dnl You _can_ use that variable in AC_CONFIG_FILES, so long as any directory
|
|
|
|
dnl using automake (ie lib/) is explicitly listed and not "hidden" in a variable
|
2011-05-24 19:12:58 +00:00
|
|
|
dnl (else you get "no `Makefile.am' found for any configure output").
|
|
|
|
dnl This will work, but you get a config.status that is not quite right
|
|
|
|
dnl (see http://lists.gnu.org/archive/html/bug-autoconf/2008-08/msg00028.html).
|
|
|
|
dnl That doesn't have any obvious consequences for Emacs, but on the whole
|
|
|
|
dnl it seems better to just live with the duplication.
|
2013-04-01 13:18:20 +00:00
|
|
|
SUBDIR_MAKEFILES="lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile nt/Makefile"
|
2011-05-24 19:12:58 +00:00
|
|
|
|
|
|
|
AC_CONFIG_FILES([Makefile lib/Makefile lib-src/Makefile oldXMenu/Makefile \
|
|
|
|
doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \
|
|
|
|
doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile \
|
2013-04-01 13:18:20 +00:00
|
|
|
leim/Makefile nextstep/Makefile nt/Makefile])
|
2011-05-24 04:00:56 +00:00
|
|
|
|
|
|
|
dnl test/ is not present in release tarfiles.
|
2011-05-24 17:23:15 +00:00
|
|
|
opt_makefile=test/automated/Makefile
|
|
|
|
|
2012-12-09 02:22:39 +00:00
|
|
|
if test -f "$srcdir/$opt_makefile.in"; then
|
2011-05-24 17:23:15 +00:00
|
|
|
SUBDIR_MAKEFILES="$SUBDIR_MAKEFILES $opt_makefile"
|
2011-05-24 19:12:58 +00:00
|
|
|
dnl Again, it's best not to use a variable. Though you can add
|
|
|
|
dnl ", [], [opt_makefile='$opt_makefile']" and it should work.
|
|
|
|
AC_CONFIG_FILES([test/automated/Makefile])
|
|
|
|
fi
|
2011-05-24 17:23:15 +00:00
|
|
|
|
2012-04-10 07:18:02 +00:00
|
|
|
|
Stop keeping (all but one) generated cedet grammar files in the repository
* configure.ac (SUBDIR_MAKEFILES, AC_CONFIG_FILES):
Add admin/grammars Makefile.
* Makefile.in (distclean, bootstrap-clean, maintainer-clean):
Also clean admin/grammars, if present.
* admin/grammars/README: Remove.
* admin/grammars/Makefile.in: New file.
* admin/grammars/c.by, admin/grammars/java-tags.wy, admin/grammars/js.wy:
* admin/grammars/python.wy: Update declarations to match generated outputs.
* lisp/Makefile.in (semantic): New.
(compile-main): Depend on semantic.
* lisp/cedet/semantic/bovine/grammar.el (bovine--make-parser-1):
New function, split from bovine-make-parsers.
(bovine-make-parsers): Use bovine--make-parser-1.
(bovine-batch-make-parser): New function.
* lisp/cedet/semantic/wisent/grammar.el (wisent--make-parser-1):
New function, split from wisent-make-parsers.
(wisent-make-parsers): Use wisent--make-parser-1.
(wisent-batch-make-parser): New function.
* lisp/cedet/semantic/db.el (semanticdb-save-all-db):
Avoid prompting in batch mode.
* lisp/cedet/semantic/grammar.el (semantic-grammar-footer-template):
Disable version-control and autoloads in the output.
(semantic-grammar-create-package):
Add option to return nil if output is up-to-date.
* lisp/cedet/semantic/bovine/c-by.el, lisp/cedet/semantic/bovine/make-by.el:
* lisp/cedet/semantic/bovine/scm-by.el, lisp/cedet/semantic/wisent/javat-wy.el:
* lisp/cedet/semantic/wisent/js-wy.el, lisp/cedet/semantic/wisent/python-wy.el:
* lisp/cedet/srecode/srt-wy.el: Remove generated files from repository.
* .bzrignore: Update for this.
2013-11-30 02:06:34 +00:00
|
|
|
dnl The admin/ directory used to be excluded from tarfiles.
|
|
|
|
if test -d $srcdir/admin; then
|
|
|
|
SUBDIR_MAKEFILES="$SUBDIR_MAKEFILES admin/unidata/Makefile admin/grammars/Makefile"
|
2012-04-10 07:18:02 +00:00
|
|
|
AC_CONFIG_FILES([admin/unidata/Makefile])
|
Stop keeping (all but one) generated cedet grammar files in the repository
* configure.ac (SUBDIR_MAKEFILES, AC_CONFIG_FILES):
Add admin/grammars Makefile.
* Makefile.in (distclean, bootstrap-clean, maintainer-clean):
Also clean admin/grammars, if present.
* admin/grammars/README: Remove.
* admin/grammars/Makefile.in: New file.
* admin/grammars/c.by, admin/grammars/java-tags.wy, admin/grammars/js.wy:
* admin/grammars/python.wy: Update declarations to match generated outputs.
* lisp/Makefile.in (semantic): New.
(compile-main): Depend on semantic.
* lisp/cedet/semantic/bovine/grammar.el (bovine--make-parser-1):
New function, split from bovine-make-parsers.
(bovine-make-parsers): Use bovine--make-parser-1.
(bovine-batch-make-parser): New function.
* lisp/cedet/semantic/wisent/grammar.el (wisent--make-parser-1):
New function, split from wisent-make-parsers.
(wisent-make-parsers): Use wisent--make-parser-1.
(wisent-batch-make-parser): New function.
* lisp/cedet/semantic/db.el (semanticdb-save-all-db):
Avoid prompting in batch mode.
* lisp/cedet/semantic/grammar.el (semantic-grammar-footer-template):
Disable version-control and autoloads in the output.
(semantic-grammar-create-package):
Add option to return nil if output is up-to-date.
* lisp/cedet/semantic/bovine/c-by.el, lisp/cedet/semantic/bovine/make-by.el:
* lisp/cedet/semantic/bovine/scm-by.el, lisp/cedet/semantic/wisent/javat-wy.el:
* lisp/cedet/semantic/wisent/js-wy.el, lisp/cedet/semantic/wisent/python-wy.el:
* lisp/cedet/srecode/srt-wy.el: Remove generated files from repository.
* .bzrignore: Update for this.
2013-11-30 02:06:34 +00:00
|
|
|
AC_CONFIG_FILES([admin/grammars/Makefile])
|
|
|
|
fi dnl -d admin
|
2012-04-10 07:18:02 +00:00
|
|
|
|
|
|
|
|
2011-05-24 19:12:58 +00:00
|
|
|
SUBDIR_MAKEFILES_IN=`echo " ${SUBDIR_MAKEFILES}" | sed -e 's| | $(srcdir)/|g' -e 's|Makefile|Makefile.in|g'`
|
2011-05-24 17:23:15 +00:00
|
|
|
|
|
|
|
AC_SUBST(SUBDIR_MAKEFILES_IN)
|
2011-02-24 04:28:17 +00:00
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
dnl You might wonder (I did) why epaths.h is generated by running make,
|
|
|
|
dnl rather than just letting configure generate it from epaths.in.
|
|
|
|
dnl One reason is that the various paths are not fully expanded (see above);
|
|
|
|
dnl eg gamedir=${prefix}/var/games/emacs.
|
|
|
|
dnl Secondly, the GNU Coding standards require that one should be able
|
|
|
|
dnl to run `make prefix=/some/where/else' and override the values set
|
|
|
|
dnl by configure. This also explains the `move-if-change' test and
|
|
|
|
dnl the use of force in the `epaths-force' rule in Makefile.in.
|
2013-07-24 01:03:56 +00:00
|
|
|
AC_CONFIG_COMMANDS([src/epaths.h], [
|
2013-04-06 13:25:17 +00:00
|
|
|
if test "${opsys}" = "mingw32"; then
|
|
|
|
${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force-w32
|
|
|
|
else
|
|
|
|
${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force
|
2014-06-20 16:05:10 +00:00
|
|
|
fi || AC_MSG_ERROR(['src/epaths.h' could not be made.])
|
2013-04-06 13:25:17 +00:00
|
|
|
], [GCC="$GCC" CPPFLAGS="$CPPFLAGS" opsys="$opsys"])
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2013-10-23 23:27:19 +00:00
|
|
|
dnl NB we have to cheat and use the ac_... version because abs_top_srcdir
|
|
|
|
dnl is not yet set, sigh. Or we could use ../$srcdir/src/.gdbinit,
|
|
|
|
dnl or a symlink?
|
2013-07-24 01:03:56 +00:00
|
|
|
AC_CONFIG_COMMANDS([src/.gdbinit], [
|
2012-12-09 02:22:39 +00:00
|
|
|
if test ! -f src/.gdbinit && test -f "$srcdir/src/.gdbinit"; then
|
2013-10-23 23:27:19 +00:00
|
|
|
echo "source $ac_abs_top_srcdir/src/.gdbinit" > src/.gdbinit
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
2011-02-24 04:28:17 +00:00
|
|
|
])
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2011-02-24 04:28:17 +00:00
|
|
|
AC_OUTPUT
|
2014-06-05 08:03:22 +00:00
|
|
|
|
|
|
|
test "$MAKE" = make || AC_MSG_NOTICE([Now you can run '$MAKE'.])
|