1996-01-16 22:54:10 +00:00
|
|
|
|
dnl Autoconf script for GNU Emacs
|
2015-04-19 21:40:51 +00:00
|
|
|
|
dnl To rebuild the 'configure' script from this, execute the command
|
|
|
|
|
dnl autoconf
|
1994-08-26 14:57:46 +00:00
|
|
|
|
dnl in the directory containing this script.
|
2010-05-20 05:48:16 +00:00
|
|
|
|
dnl If you changed any AC_DEFINES, also run autoheader.
|
1996-01-16 22:54:10 +00:00
|
|
|
|
dnl
|
2020-01-01 00:19:43 +00:00
|
|
|
|
dnl Copyright (C) 1994-1996, 1999-2020 Free Software Foundation, Inc.
|
1996-03-08 20:31:40 +00:00
|
|
|
|
dnl
|
1996-01-16 22:54:10 +00:00
|
|
|
|
dnl This file is part of GNU Emacs.
|
1996-03-08 20:31:40 +00:00
|
|
|
|
dnl
|
2008-05-07 07:35:58 +00:00
|
|
|
|
dnl GNU Emacs is free software: you can redistribute it and/or modify
|
1996-01-16 22:54:10 +00:00
|
|
|
|
dnl it under the terms of the GNU General Public License as published by
|
2008-05-07 07:35:58 +00:00
|
|
|
|
dnl the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
dnl (at your option) any later version.
|
2009-08-22 08:47:01 +00:00
|
|
|
|
dnl
|
1996-01-16 22:54:10 +00:00
|
|
|
|
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.
|
2009-08-22 08:47:01 +00:00
|
|
|
|
dnl
|
1996-01-16 22:54:10 +00:00
|
|
|
|
dnl You should have received a copy of the GNU General Public License
|
2017-09-13 22:52:52 +00:00
|
|
|
|
dnl along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
1996-01-16 22:54:10 +00:00
|
|
|
|
|
2010-06-03 22:28:51 +00:00
|
|
|
|
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.
|
2019-12-23 16:00:52 +00:00
|
|
|
|
AC_INIT(GNU Emacs, 28.0.50, bug-gnu-emacs@gnu.org, , https://www.gnu.org/software/emacs/)
|
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.
|
2016-01-25 01:27:52 +00:00
|
|
|
|
for opt in "$@" CFLAGS CPPFLAGS LDFLAGS; do
|
2013-08-22 17:35:00 +00:00
|
|
|
|
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)
|
2007-12-06 07:06:50 +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
|
|
|
|
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
|
|
|
|
|
|
Switch from Automake to GNU Make
Emacs assumes GNU Make, and GNU Make has much of the functionality of
Automake built-in. The Emacs build process uses Automake primarily
because Emacs uses some Gnulib code and Gnulib formerly required
Automake. Now that Gnulib no longer requires Automake, Emacs can
stop using Automake and this should simplify Emacs maintenance
in the future (Bug#26100). Although this patch may look long, most of
it is generated automatically: the changes to build-aux/config.guess,
build-aux/config.sub, build-aux/install-sh, and lib/gnulib.mk.in are
all done by admin/merge-gnulib.
* .gitignore: Remove build-aux/ar-lib, build-aux/compile,
build-aux/config.guess, build-aux/config.sub, build-aux/depcomp,
build-aux/install-sh, build-aux/missing, and lib/Makefile.in,
as they are no longer built by autogen.sh.
Add lib/gnulib.mk, as it is now built by 'configure'.
Remove nt/gnulib.mk, as it is no longer built by 'make'.
* INSTALL.REPO, README, admin/make-tarball.txt:
Remove mention of Automake.
* Makefile.in (AUTOCONF, AUTOMAKE, AUTOHEADER, ACLOCAL, lib)
(AUTOCONF_INPUTS, ACLOCAL_PATH, ACLOCAL_INPUTS)
($(srcdir)/aclocal.m4, AUTOMAKE_INPUTS)
($(srcdir)/lib/Makefile.in, $(srcdir)/nt/gnulib.mk, am--refresh):
Remove.
($(MAKEFILE_NAME)): Depend on lib/gnulib.mk.in.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in)
($(srcdir)/src/config.in):
Use autogen.sh instead of doing it by hand.
* admin/merge-gnulib (AVOIDED_MODULES, avoided_flags)):
New vars, to simplify processing of avoided modules.
(GNULIB_TOOL_FLAGS): Move --avoid flags into AVOIDED_MODULES.
Add --gnu-make, and change makefile name to gnulib.mk.in.
Copy config.guess, config.sub, and install-sh too, since
Automake no longer does that for us.
* admin/notes/copyright:
* admin/update_autogen (genfiles):
Update list of files.
Remove hack for nt/gnulib.mk, a file that is no longer needed.
* autogen.sh (progs): Remove Automake.
(automake_min): Remove.
Build aclocal.m4 so that autoreconf need not use aclocal.
* build-aux/config.guess, build-aux/config.sub:
* build-aux/install-sh:
New files, copied from Gnulib. These are now updated by
admin/merge-gnulib instead by autogen.sh.
* configure.ac (AC_PROG_MAKE_SET, ACLOCAL_PATH, AM_CONDITIONAL):
Remove.
(AM_INIT_AUTOMAKE, AM_SILENT_RULES): Remove call.
(AC_PROG_CC_C_O): Call this instead of AM_PROG_CC_C_O.
(BUILDING_FOR_WINDOWSNT, HYBRID_MALLOC_LIB): Remove; no longer needed.
(--disable-silent-rules): New option, since Automake no longer
does this for us.
(AM_V, AM_DEFAULT_V): Set unconditionally, and do not bother
with AM_SUBST_NOTMAKE.
(AC_PROG_INSTALL): Add call.
(MAKEINFO): Do not bother with the 'missing' program.
(MAKEINFO, SYSTEM_TYPE): AC_SUBST.
(AC_CONFIG_FILES): Add Makefile, lib/gnulib.mk.
(SUBDIR_MAKEFILES): Remove duplication.
* lib/Makefile.am: Remove, replacing with:
* lib/Makefile.in: New file, with the old Makefile.am contents
and with the following changes:
(AUTOMAKE_OPTIONS, BUILT_SOURCES, CLEANFILES, EXTRA_DIST)
(MOSTLYCLEANDIRS, MOSTLYCLEANFILES, noinst_LIBRARIES, SUFFIXES)
(AM_CFLAGS, DEFAULT_INCLUDES, libegnu_a_SOURCES, libegnu_a_LIBADD)
(EXTRA_libegnu_a_SOURCES, libegnu_a_SHORTNAME, libegnu_a_CPPFLAGS):
Remove.
(VPATH, abs_top_builddir, top_builddir, top_srcdir, all, AM_V_AR)
(AM_V_CC, AM_V_GEN, AM_V_at, DEPDIR, DEPFLAGS, MKDEPDIR, SYSTEM_TYPE)
(libgnu.a, libegnu.a, ETAGS, $(ETAGS), tags, TAGS, clean)
(mostlyclean, distclean, bootstrap-clean, maintainer-clean):
New macros and rules, since Automake no longer does them.
Include ../nt/gnulib-cfg.mk if SYSTEM_TYPE is windows-nt,
instead of including ../nt/gnulib.mk if BUILDING_FOR_WINDOWS_NT.
Include dependency files if AUTO_DEPEND.
(ALL_CFLAGS, AUTOCONF_INPUTS, libgnu_a_OBJECTS, libegnu_a_OBJECTS):
New macros.
(bootstrap-clean): Depend on distclean, not maintainer-clean,
and remove gnulib.mk.
(AUTOCONF_INPUTS, $(top_srcdir)/configure, ../config.status, Makefile):
New macros and rules, copied from ../Makefile.in.
($(libegnu_a_OBJECTS), $(libgnu_a_OBJECTS)): Depend on BUILT_SOURCES.
(.c.o, e-%.o): New generic rules.
* lib/gnulib.mk: Remove.
* lib/gnulib.mk.in: New file, which is built by autogen.sh
and contains much of what used to be in lib/gnulib.mk.
* m4/gnulib-common.m4: Copy from gnulib.
* make-dist: Do not distribute build-aux/compile, build-aux/depcomp,
build-aux/missing, build-aux/ar-lib, lib/Makefile.am, nt/gnulib.mk,
nt/gnulib-modules-to-delete.cfg. Distribute lib/Makefile.in,
lib/gnulib.mk.in, and nt/gnulib-cfg.mk instead.
* nt/Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0)
(am__v_GEN_1, ${srcdir}/gnulib.mk): Remove.
* nt/gnulib-cfg.mk: New file, which supersedes ...
* nt/gnulib-modules-to-delete.cfg: ... this file, which is removed.
* src/Makefile.in (ACLOCAL_INPUTS): Remove.
(AUTOCONF_INPUTS): Merge ACLOCAL_INPUTS into it.
($(top_srcdir)/configure, ../config.status, config.in Makefile):
Defer to parent Makefile.
2017-03-17 18:33:47 +00:00
|
|
|
|
dnl Check for GNU Make and possibly set MAKE.
|
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
|
|
|
|
|
2014-06-10 19:43:13 +00:00
|
|
|
|
dnl Canonicalize the configuration name.
|
|
|
|
|
AC_CANONICAL_HOST
|
|
|
|
|
|
2014-11-26 19:59:07 +00:00
|
|
|
|
case $host in
|
2014-06-10 19:43:13 +00:00
|
|
|
|
*-mingw*)
|
|
|
|
|
|
2014-11-26 19:59:07 +00:00
|
|
|
|
if test -z "$host_alias"; then
|
|
|
|
|
|
|
|
|
|
# No --host argument was given to 'configure'; therefore $host
|
|
|
|
|
# was set to a default value based on the build platform. But
|
|
|
|
|
# this default value may be wrong if we are building from a
|
|
|
|
|
# 64-bit MSYS[2] pre-configured to build 32-bit MinGW programs.
|
|
|
|
|
# Therefore, we'll try to get the right host platform from the
|
|
|
|
|
# compiler's target.
|
|
|
|
|
|
2014-11-25 02:29:43 +00:00
|
|
|
|
AC_MSG_CHECKING([the compiler's target])
|
2014-11-26 19:59:07 +00:00
|
|
|
|
if test -z "$CC"; then
|
2014-11-25 02:29:43 +00:00
|
|
|
|
cc=gcc
|
|
|
|
|
else
|
|
|
|
|
cc=$CC
|
|
|
|
|
fi
|
2014-11-26 19:59:07 +00:00
|
|
|
|
cc_target=`$cc -v 2>&1 | sed -n 's/Target: //p'`
|
|
|
|
|
case "$cc_target" in
|
|
|
|
|
*-*) host=$cc_target
|
2014-11-25 02:29:43 +00:00
|
|
|
|
;;
|
|
|
|
|
"") AC_MSG_ERROR([Impossible to obtain $cc compiler target.
|
2014-11-26 19:59:07 +00:00
|
|
|
|
Please explicitly provide --host.])
|
2014-11-25 02:29:43 +00:00
|
|
|
|
;;
|
|
|
|
|
*) AC_MSG_WARN([Compiler reported non-standard target.
|
2014-11-26 19:59:07 +00:00
|
|
|
|
Defaulting to $host.])
|
2014-11-25 02:29:43 +00:00
|
|
|
|
;;
|
|
|
|
|
esac
|
2014-11-26 19:59:07 +00:00
|
|
|
|
AC_MSG_RESULT([$host])
|
2014-11-25 02:29:43 +00:00
|
|
|
|
fi
|
|
|
|
|
|
2014-06-10 19:43:13 +00:00
|
|
|
|
. $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).
|
2017-09-10 14:52:41 +00:00
|
|
|
|
# We downcase the drive letter to avoid warnings when
|
|
|
|
|
# generating autoloads.
|
2017-09-10 16:01:16 +00:00
|
|
|
|
eval 'srcdir=/`echo ${srcdir:0:1} | sed "y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/"`"${srcdir:2}"'
|
2014-06-10 19:43:13 +00:00
|
|
|
|
;;
|
|
|
|
|
esac;;
|
|
|
|
|
esac
|
|
|
|
|
|
2014-11-26 19:59:07 +00:00
|
|
|
|
canonical=$host
|
|
|
|
|
configuration=${host_alias-${build_alias-$host}}
|
2017-07-29 07:01:02 +00:00
|
|
|
|
emacs_uname_r=`uname -r`
|
2014-11-26 19:59:07 +00:00
|
|
|
|
|
2001-11-15 20:37:20 +00:00
|
|
|
|
dnl Support for --program-prefix, --program-suffix and
|
|
|
|
|
dnl --program-transform-name options
|
|
|
|
|
AC_ARG_PROGRAM
|
|
|
|
|
|
2010-05-29 18:54:16 +00:00
|
|
|
|
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.
|
1994-08-26 14:57:46 +00:00
|
|
|
|
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}'
|
1996-01-09 22:56:20 +00:00
|
|
|
|
locallisppath='${datadir}/emacs/${version}/site-lisp:'\
|
2006-09-28 05:47:26 +00:00
|
|
|
|
'${datadir}/emacs/site-lisp'
|
2012-06-30 21:10:50 +00:00
|
|
|
|
lisppath='${locallisppath}:${standardlisppath}'
|
1994-08-26 14:57:46 +00:00
|
|
|
|
etcdir='${datadir}/emacs/${version}/etc'
|
1995-07-06 05:42:45 +00:00
|
|
|
|
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'
|
2002-07-21 20:19:22 +00:00
|
|
|
|
gamedir='${localstatedir}/games/emacs'
|
2002-04-10 19:04:08 +00:00
|
|
|
|
|
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
|
|
|
|
|
2008-01-23 03:43:32 +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
|
2007-09-02 08:25:00 +00:00
|
|
|
|
])dnl
|
2008-01-23 03:43:32 +00:00
|
|
|
|
|
2020-08-14 17:31:16 +00:00
|
|
|
|
dnl OPTION_DEFAULT_IFAVAILABLE(NAME, HELP-STRING)
|
|
|
|
|
dnl Create a new --with option that defaults to 'ifavailable'.
|
|
|
|
|
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 'ifavailable' (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_IFAVAILABLE], [dnl
|
|
|
|
|
AC_ARG_WITH([$1],[AS_HELP_STRING([--with-$1],[$2])],[],[dnl
|
|
|
|
|
m4_bpatsubst([with_$1], [[^0-9a-z]], [_])=ifavailable])dnl
|
|
|
|
|
])dnl
|
|
|
|
|
|
|
|
|
|
|
2008-01-23 03:43:32 +00:00
|
|
|
|
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
|
2008-01-23 03:43:32 +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
|
2007-09-02 08:25:00 +00:00
|
|
|
|
])dnl
|
|
|
|
|
|
2017-10-03 22:42:10 +00:00
|
|
|
|
# For retrieving mail, unencrypted network connections are the default
|
|
|
|
|
# only on native MS-Windows platforms. (FIXME: These platforms should
|
|
|
|
|
# also be secure by default.)
|
2017-03-21 19:04:56 +00:00
|
|
|
|
|
2017-08-03 02:13:26 +00:00
|
|
|
|
AC_ARG_WITH([mailutils],
|
|
|
|
|
[AS_HELP_STRING([--with-mailutils],
|
|
|
|
|
[rely on GNU Mailutils, so that the --without-pop through --with-mailhost
|
|
|
|
|
options are irrelevant; this is the default if GNU Mailutils is
|
|
|
|
|
installed])],
|
|
|
|
|
[],
|
|
|
|
|
[with_mailutils=$with_features
|
|
|
|
|
if test "$with_mailutils" = yes; then
|
|
|
|
|
(movemail --version) >/dev/null 2>&1 || with_mailutils=no
|
|
|
|
|
fi])
|
2017-03-17 06:50:37 +00:00
|
|
|
|
if test "$with_mailutils" = no; then
|
|
|
|
|
with_mailutils=
|
|
|
|
|
fi
|
|
|
|
|
AC_SUBST([with_mailutils])
|
|
|
|
|
|
2017-10-03 22:42:10 +00:00
|
|
|
|
AC_ARG_WITH([pop],
|
|
|
|
|
[AS_HELP_STRING([--with-pop],
|
|
|
|
|
[Support POP mail retrieval if Emacs movemail is used (not recommended,
|
|
|
|
|
as Emacs movemail POP is insecure). This is the default only on
|
|
|
|
|
native MS-Windows.])],
|
|
|
|
|
[],
|
|
|
|
|
[case $host in
|
|
|
|
|
*-mingw*) with_pop=yes;;
|
2017-10-03 22:42:10 +00:00
|
|
|
|
*) with_pop=no-by-default;;
|
2017-10-03 22:42:10 +00:00
|
|
|
|
esac])
|
2008-01-23 03:43:32 +00:00
|
|
|
|
if test "$with_pop" = yes; then
|
1999-10-12 17:13:27 +00:00
|
|
|
|
AC_DEFINE(MAIL_USE_POP)
|
2008-01-23 03:43:32 +00:00
|
|
|
|
fi
|
2002-04-14 01:40:58 +00:00
|
|
|
|
AH_TEMPLATE(MAIL_USE_POP, [Define to support POP mail retrieval.])dnl
|
2007-09-02 08:25:00 +00:00
|
|
|
|
|
2008-01-23 03:43:32 +00:00
|
|
|
|
OPTION_DEFAULT_OFF([kerberos],[support Kerberos-authenticated POP])
|
2008-07-16 07:55:50 +00:00
|
|
|
|
if test "$with_kerberos" != no; then
|
2007-03-19 01:05:29 +00:00
|
|
|
|
AC_DEFINE(KERBEROS)
|
2008-01-23 03:43:32 +00:00
|
|
|
|
fi
|
2002-04-14 01:40:58 +00:00
|
|
|
|
AH_TEMPLATE(KERBEROS,
|
|
|
|
|
[Define to support Kerberos-authenticated POP mail retrieval.])dnl
|
2007-09-02 08:25:00 +00:00
|
|
|
|
|
2008-01-23 03:43:32 +00:00
|
|
|
|
OPTION_DEFAULT_OFF([kerberos5],[support Kerberos version 5 authenticated POP])
|
2008-07-16 07:55:50 +00:00
|
|
|
|
if test "${with_kerberos5}" != no; then
|
|
|
|
|
if test "${with_kerberos}" = no; then
|
1999-11-23 22:16:16 +00:00
|
|
|
|
with_kerberos=yes
|
|
|
|
|
AC_DEFINE(KERBEROS)
|
|
|
|
|
fi
|
2007-03-19 01:05:29 +00:00
|
|
|
|
AC_DEFINE(KERBEROS5, 1, [Define to use Kerberos 5 instead of Kerberos 4.])
|
2008-01-23 03:43:32 +00:00
|
|
|
|
fi
|
2007-09-02 08:25:00 +00:00
|
|
|
|
|
2008-01-23 03:43:32 +00:00
|
|
|
|
OPTION_DEFAULT_OFF([hesiod],[support Hesiod to get the POP server host])
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +00:00
|
|
|
|
dnl FIXME hesiod support may not be present, so it seems like an error
|
|
|
|
|
dnl to define, or at least use, this unconditionally.
|
2008-07-16 07:55:50 +00:00
|
|
|
|
if test "$with_hesiod" != no; then
|
2007-03-19 01:05:29 +00:00
|
|
|
|
AC_DEFINE(HESIOD, 1, [Define to support using a Hesiod database to find the POP server.])
|
2008-01-23 03:43:32 +00:00
|
|
|
|
fi
|
2002-04-08 06:16:33 +00:00
|
|
|
|
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +00:00
|
|
|
|
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-09-10 21:52:26 +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-09-10 21:52:26 +00:00
|
|
|
|
yes|no|alsa|oss|bsd-ossaudio) val=$withval ;;
|
2015-04-19 21:40:51 +00:00
|
|
|
|
*) AC_MSG_ERROR(['--with-sound=$withval' is invalid;
|
|
|
|
|
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])
|
2002-04-08 06:16:33 +00:00
|
|
|
|
|
Add portable dumper
Add a new portable dumper as an alternative to unexec. Use it by default.
* src/dmpstruct.awk: New file.
* src/doc.c (get_doc_string): use will_dump_p().
* src/editfns.c (styled_format): silence compiler warning
with UNINIT.
* src/emacs-module.c (syms_of_module): staticpro ltv_mark.
* src/emacs.c (gflags): new variable.
(init_cmdargs): unwrap
(string_starts_with_p, find_argument, dump_error_to_string)
(load_pdump): new functions.
(main): detect pdumper and --temacs invocation; actually load
portable dump when detected; set gflags as appropriate; changes to
init functions throughout to avoid passing explicit
'initialized' argument.
* src/eval.c (inhibit_lisp_code): remove unused variable.
(init_eval_once_for_pdumper): new function.
(init_eval_once): call it.
* src/filelock.c: CANNOT_DUMP -> will_dump_p()
* src/fingerprint-dummy.c: new file
* src/fingerprint.h: new file
* src/fns.c: CANNOT_DUMP -> will_dump_p(), etc.
(weak_hash_tables): remove
(hashfn_equal, hashfn_eql): un-staticify
(make_hash_table): set new 'next_weak' hash table field; drop
global weak_hash_tables logic.
(copy_hash_table): drop global weak_hash_tables logic.
(hash_table_rehash): new function.
(hash_lookup, hash_put, hash_remove_from_table, hash_clear):
rehash if needed.
(sweep_weak_table): un-staticify; explain logic; bool-ify.
(sweep_weak_hash_tables): remove function.
* src/font.c (syms_of_font): remember pdumper stuff.
* src/fontset.c (syms_of_fontset): remember pdumper stuff.
* src/frame.c (make_initial_frame): don't reset Vframe_list.
(init_frame_once_for_pdumper, init_frame_once): new functions.
(syms_of_frame): remove redundant staticpro.
* src/fringe.c (init_fringe_once_for_pdumper): new functin.
(init_fringe_once): call it.
* src/ftcrfont.c (syms_of_ftcrfont_for_pdumper): new function.
(syms_of_ftcrfont): call it.
* src/ftfont.c (syms_of_ftfont_for_pdumper): new function.
(syms_of_ftfont): call it.
* src/ftxont.c (syms_of_ftxfont_for_pdumper): new function.
(syms_of_ftxfont): call it.
* src/gmalloc.c: adjust for pdumper througout
(DUMPED): remove weird custom dumped indicator.
* src/gnutls.c (syms_of_gnutls): pdumper note for
gnutls_global_initialized.
* src/image.c (syms_of_image): add pdumper comment,
initializer note.
* src/insdel.c (prepare_to_modify_buffer_1): account
for buffer contents possibly being in dump image.
* src/keyboard.c (syms_of_keyboard_for_pdumper): new function.
(syms_of_keyboard): staticpro more; call pdumper syms function.
* src/lisp.h: add comments throughout
(gflags): declare.
(will_dump_p, will_bootstrap_p, will_dump_with_pdumper_p)
(dumped_with_pdumper_p, will_dump_with_unexec_p)
(dumped_with_unexec_p, definitely_will_not_unexec_p): new
functions.
(POWER_OF_2, ROUNDUP): move macros.
(PSEUDOVECTOR_TYPE, PSEUDOVECTOR_TYPEP): take vectorlike header
pointer instead of vector; constify.
(Lisp_Hash_Table): add comment about need to rehash on access; add
comment for next_weak.
(HASH_KEY, HASH_VALUE, HASH_HASH, HASH_TABLE_SIZE): const-ify.
(hash_table_rehash): declare.
(hash_rehash_needed_p, hash_rehash_if_needed): new functions.
(finalizers, doomed_finalizers): declare extern.
(SUBR_SECTION_ATTRIBUTE): new macro.
(staticvec, staticidx): un-static-ify.
(sweep_weak_hash_tables): remove declaration.
(sweep_weak_table): declare.
(hashfn_eql, hashfn_equal): declare.
(number_finalizers_run): new variable.
(Vdead): externify when ENABLE_CHECKING.
(gc_root_type): new enumeration.
(gc_root_visitor): new struct.
(visit_static_gc_roots): declare.
(vectorlike_nbytes): declare.
(vector_nbytes): define as trivial inline function wrapper for
vectorlike_nbytes.
(init_obarray_once): change signature.
(primary_thread): extern-ify.
(init_buffer): change signature.
(init_frame_once): declare.
* src/lread.c (readevalloop): adjust for new dumped predicates.
(init_obarray_once): new function.
(ndefsubr): new variable.
(defsubr): increment it.
(load_path_check): adjust for pdumper.
(load_path_default): use pdumper functions; adjust for
dump search.
* src/macfont.m (macfont_init_font_change_handler): avoid
shadowing global.
(syms_of_macfont_for_pdumper): new function.
(syms_of_macfont): call it.
* src/menu.c (syms_of_menu): staticpro more stuff.
* src/minibuf.c (Ftry_completion): rehash if needed.
(init_minibuf_once_for_pdumper): new function.
(init_minibuf_once): call it.
* src/nsfont.m (syms_of_nsfns): staticpro more.
* src/nsfont.m (syms_of_nsfont_for_pdumper): new function.
(syms_of_nsfont): call it.
* src/nsterm.m (syms_of_nsfont): remember pdumper stuff.
* src/pdumper.c: new file.
* src/pdumper.h: new file.
* src/process.c (init_process_emacs): use new pdumper functions
instead of CANNOT_DUMP.
* src/profiler.c (syms_of_profiler_for_pdumper): new function.
(syms_of_profiler_for_pdumper): call it.
* src/search.c (syms_of_search_for_pdumper): new function.
(syms_of_search_for_pdumper): call it.
* src/sheap.c (bss_sbrk_did_unexec): remove.
* src/sheap.h (bss_sbrk_did_unexec): remove.
* src/syntax.c (syms_of_syntax): don't redundantly staticpro
re_match_object.
* src/sysdep.c: use will_dump_with_unexec_p() instead of bss
hack thing.
* src/syssignals.h (init_sigsegv): declare.
* src/systime.h (init_timefns): remove bool from signature.
* src/textprop.c (syms_of_textprop): move staticpro.
* src/thread.c (main_thread_p): constify.
* src/thread.h (main_thread_p): constify.
* src/timefns.c (init_timefns): remove bool from signature.
(syms_of_timefns_for_pdumper): new function.
(syms_of_timefns): call it.
* src/w32.c: rearrange code.
* src/w32.h (w32_relocate): declare.
* src/w32fns.c (syms_of_w32fns): add pdumper note.
* src/w32font.c (syms_of_w32font_for_pdumper): new function.
(syms_of_w32font): call it.
* src/w32heap.c (using_dynamic_heap): new variable.
(init_heap): use it.
* src/w32menu.c (syms_of_w32menu): add pdumper note.
* src/w32proc.c
(ctrl_c_handler, mainCRTStartup, _start, open_input_file)
(rva_to_section, close_file_data): move here.
* src/w32uniscribe.c (syms_of_w32uniscribe_for_pdumper):
new function.
(syms_of_w32uniscribe): call it.
* src/window.c (init_window_once_for_pdumper): new function.
(init_window_once): call it; staticpro more stuff.
* src/xfont.c (syms_of_xfont_for_pdumper): new function.
(syms_of_xfont): call it.
* src/xftfont.c (syms_of_xftfont_for_pdumper): new function.
(syms_of_xftfont): call it.
* src/xmenu.c (syms_of_xmenu_for_pdumper): new function.
(syms_of_xmenu): call it.
* src/xselect.c (syms_of_xselect_for_pdumper): new function.
(syms_of_xselect): call it.
* src/xsettings.c (syms_of_xsettings): add more pdumper notes.
* src/term.c (syms_of_xterm): add pdumper note.
* src/dispnew.c (init_faces_initial): new function.
(init_display_interactive): rename from init_display; use
will_dump_p instead of !initialized. Initialize faces early for
pdumper if needed.
(init_display): new function.
(syms_of_display_for_pdumper): new function.
(syms_of_display): call it.
* src/dbusbind.c (syms_of_dbusbind): Add TODO for bus reset
on pdumper load.
* src/data.c (Fdefalias): Use will_dump_p
instead of Vpurify_flag.
(Fmake_variable_buffer_local): silence compiler warning with -Og
by making valcontents UNINIT.
(arith_driver): silence compiler warning with UNINIT.
* src/conf_post.h (ATTRIBUTE_SECTION): new macro.
* src/composite.c (composition_gstring_put_cache): rehash hash
table if needed.
* src/coding.c (init_coding_once, syms_of_coding): remember
pdumper stuff.
* src/charset.h (charset_table_size, charset_table_user): declare.
* src/charset.c (charset_table_used, charset_table_size): un-static.
(init_charset_oncem, syms_of_charset): remember pdumper stuff.
* src/category.c (category_table_version): remove obsolete
variable.
* src/callint.c (syms_of_callint): staticpro 'preserved_fns'
(init_callproc): use will_dump_p instead of !CANNOT_DUMP.
* src/bytecode.c (exec_byte_code): rehash table tables if needed
* src/buffer.c (alloc_buffer_text, free_buffer_text): account for
pdumper
(init_buffer_once): add TODO; remember stuff for pdumper.
(init_buffer): don't take initialized argument; adjust
for pdumper.
* src/atimer.c (init_atimer): initialize subr only if
!initialized.
* src/alloc.c: (vector_marked_p, set_vector_marked)
(vectorlike_marked_p, set_vectorlike_marked, cons_marked_p)
(set_cons_marked, string_marked_p, set_string_marked)
(symbol_marked_p, set_symbol_marked, interval_marked_p)
(set_interval_marked): new accessor routines. Use them
instead of raw GC access throughout.
(Vdead): make non-static when ENABLE_CHECKING.
(vectorlike_nbytes): rename of 'vector_nbytes'; take a vectorlike
header as input instead of a vector.
(number_finalizers_run): new internal C variable.
(mark_maybe_object): check for pdumper objects.
(valid_pointer_p): don't be gratuitously inefficient under rr(1).
(make_pure_c_string): add support for size_byte = -2 mode
indicating that string data points into Emacs image rodata.
(visit_vectorlike_root): visits GC roots embedded in
vectorlike objects.
(visit_buffer_root): visits GC roots embedded in
our totally-not-a-buffer buffer global objects.
(visit_static_gc_roots): visit GC roots in the Emacs data section.
(mark_object_root_visitor): root callback used for conventional GC
marking
(weak_hash_tables): new internal variable for tracking found weak
hash tables during GC.
(mark_and_sweep_weak_table_contents): new weak hash table marking.
(garbage_collect_1): use new GC root visitor machinery.
(mark_vectorlike): accept a vectorlike_header instead of a
Lisp_Vector.
(mark_frame, mark_window, mark_hash_table): new functions.
(mark_object): initialize 'm'; check for pdumper objects and use
new mark-bit accessors throughout. Remove some object-specific
marking code and move to helper functions above.
(survives_gc_p): check for pdumper objects.
(gc-sweep): clear pdumper mark bits.
(init_alloc_once_for_pdumper): new helper function for early init
called both during normal init and pdumper load.
(init_alloc_once): pdumper integration.
* src/Makefile.in: Rewrite dumping for pdumper; add pdumper.o;
invoke temacs with --temacs command line option; build dmpstruct.h
from dmpstruct.awk; stop relying on CANNOT_DUMP; clean up pdumper
intermediate files during build.
* nextstep/Makefile.in: build emacs.pdmp into NS packages
* lisp/startup.el: account for new '--temacs' and '--dump-file'
command line option.
* lisp/loadup.el: rewrite early init to account for pdumper; use
injected 'dump-mode' variable (set via the new '--temacs' option)
instead of parsing command line.
* lisp/cus-start.el: Check 'dump-mode' instead of 'purify-flag',
since the new 'dump-mode'
* lib-src/make-fingerprint.c: new program
* lib-src/Makefile.in: built make-fingerprint utility program
* configure.ac: Add --with-pdumper toggle to control pdumper
support; add --with-unexec toggle to control unexec support.
Add --with-dumping option to control which dumping strategy we use
by default. Adjust for pdumper throughout. Check for
posix_madvise.
* Makefile.in: Add @DUMPING@ substitution; add pdumper mode.
* .gitignore: Add make-fingerprint, temacs.in, fingerprint.c,
dmpstruct.h, and pdumper dump files.
2019-01-15 22:36:54 +00:00
|
|
|
|
AC_ARG_WITH([pdumper],
|
|
|
|
|
AS_HELP_STRING(
|
|
|
|
|
[--with-pdumper=VALUE],
|
|
|
|
|
[enable pdumper support unconditionally
|
|
|
|
|
('yes', 'no', or 'auto': default 'auto')]),
|
|
|
|
|
[ case "${withval}" in
|
|
|
|
|
yes|no|auto) val=$withval ;;
|
|
|
|
|
*) AC_MSG_ERROR(
|
|
|
|
|
['--with-pdumper=$withval' is invalid;
|
|
|
|
|
this option's value should be 'yes' or 'no'.]) ;;
|
|
|
|
|
esac
|
|
|
|
|
with_pdumper=$val
|
|
|
|
|
],
|
|
|
|
|
[with_pdumper=auto])
|
|
|
|
|
|
|
|
|
|
AC_ARG_WITH([unexec],
|
|
|
|
|
AS_HELP_STRING(
|
|
|
|
|
[--with-unexec=VALUE],
|
|
|
|
|
[enable unexec support unconditionally
|
|
|
|
|
('yes', 'no', or 'auto': default 'auto')]),
|
|
|
|
|
[ case "${withval}" in
|
|
|
|
|
yes|no|auto) val=$withval ;;
|
|
|
|
|
*) AC_MSG_ERROR(
|
|
|
|
|
['--with-unexec=$withval' is invalid;
|
|
|
|
|
this option's value should be 'yes' or 'no'.]) ;;
|
|
|
|
|
esac
|
|
|
|
|
with_unexec=$val
|
|
|
|
|
],
|
|
|
|
|
[with_unexec=auto])
|
|
|
|
|
|
|
|
|
|
AC_ARG_WITH([dumping],[AS_HELP_STRING([--with-dumping=VALUE],
|
|
|
|
|
[kind of dumping to use for initial Emacs build
|
|
|
|
|
(VALUE one of: pdumper, unexec, none; default pdumper)])],
|
|
|
|
|
[ case "${withval}" in
|
|
|
|
|
pdumper|unexec|none) val=$withval ;;
|
|
|
|
|
*) AC_MSG_ERROR(['--with-dumping=$withval is invalid;
|
|
|
|
|
this option's value should be 'pdumper', 'unexec', or 'none'.])
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
with_dumping=$val
|
|
|
|
|
],
|
|
|
|
|
[with_dumping=pdumper])
|
|
|
|
|
|
|
|
|
|
if test "$with_pdumper" = "auto"; then
|
|
|
|
|
if test "$with_dumping" = "pdumper"; then
|
|
|
|
|
with_pdumper=yes
|
|
|
|
|
else
|
|
|
|
|
with_pdumper=no
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if test "$with_unexec" = "auto"; then
|
|
|
|
|
if test "$with_dumping" = "unexec"; then
|
|
|
|
|
with_unexec=yes
|
|
|
|
|
else
|
|
|
|
|
with_unexec=no
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if test "$with_dumping" = "pdumper" && test "$with_pdumper" = "no"; then
|
|
|
|
|
AC_MSG_ERROR(['--with-dumping=pdumper' requires pdumper support])
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if test "$with_dumping" = "unexec" && test "$with_unexec" = "no"; then
|
|
|
|
|
AC_MSG_ERROR(['--with-dumping=unexec' requires unexec support])
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if test "$with_pdumper" = "yes"; then
|
Replace executable’s fingerprint in place
* admin/merge-gnulib (GNULIB_MODULES): Add memmem-simple.
(AVOIDED_MODULES): Add memchr.
* configure.ac (HAVE_PDUMPER): AC_SUBST it, too, for use in makefiles.
* lib/Makefile.in (libgnu_a_OBJECTS): Add fingerprint.o.
* lib/fingerprint.c: New file.
* lib/memmem.c, lib/str-two-way.h, m4/memmem.m4: New files,
copied from Gnulib.
* lib/fingerprint.h: Rename from src/fingerprint.h.
* lib-src/make-fingerprint.c: Include limits.h, sys/stat.h,
fingerprint.h, intprops.h, min-max.h.
(SSIZE_MAX): New macro, if not already defined.
(main): Without -r, Replace the fingerprint in the input file
instead of generating a fingerprint.c.
* lib/Makefile.in (libgnu_a_OBJECTS): Add fingerprint.o.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
* src/Makefile.in (HAVE_PDUMPER, MAKE_PDUMPER_FINGERPRINT):
New macros.
(temacs$(EXEEXT)): Use them to replace the fingerprint instead
of precalculating it.
(mostlyclean, ctagsfiles1): Do not worry about fingerprint.c.
2019-04-14 23:31:24 +00:00
|
|
|
|
AC_DEFINE([HAVE_PDUMPER], 1, [Define to build with portable dumper support])
|
|
|
|
|
HAVE_PDUMPER=yes
|
|
|
|
|
else
|
|
|
|
|
HAVE_PDUMPER=no
|
Add portable dumper
Add a new portable dumper as an alternative to unexec. Use it by default.
* src/dmpstruct.awk: New file.
* src/doc.c (get_doc_string): use will_dump_p().
* src/editfns.c (styled_format): silence compiler warning
with UNINIT.
* src/emacs-module.c (syms_of_module): staticpro ltv_mark.
* src/emacs.c (gflags): new variable.
(init_cmdargs): unwrap
(string_starts_with_p, find_argument, dump_error_to_string)
(load_pdump): new functions.
(main): detect pdumper and --temacs invocation; actually load
portable dump when detected; set gflags as appropriate; changes to
init functions throughout to avoid passing explicit
'initialized' argument.
* src/eval.c (inhibit_lisp_code): remove unused variable.
(init_eval_once_for_pdumper): new function.
(init_eval_once): call it.
* src/filelock.c: CANNOT_DUMP -> will_dump_p()
* src/fingerprint-dummy.c: new file
* src/fingerprint.h: new file
* src/fns.c: CANNOT_DUMP -> will_dump_p(), etc.
(weak_hash_tables): remove
(hashfn_equal, hashfn_eql): un-staticify
(make_hash_table): set new 'next_weak' hash table field; drop
global weak_hash_tables logic.
(copy_hash_table): drop global weak_hash_tables logic.
(hash_table_rehash): new function.
(hash_lookup, hash_put, hash_remove_from_table, hash_clear):
rehash if needed.
(sweep_weak_table): un-staticify; explain logic; bool-ify.
(sweep_weak_hash_tables): remove function.
* src/font.c (syms_of_font): remember pdumper stuff.
* src/fontset.c (syms_of_fontset): remember pdumper stuff.
* src/frame.c (make_initial_frame): don't reset Vframe_list.
(init_frame_once_for_pdumper, init_frame_once): new functions.
(syms_of_frame): remove redundant staticpro.
* src/fringe.c (init_fringe_once_for_pdumper): new functin.
(init_fringe_once): call it.
* src/ftcrfont.c (syms_of_ftcrfont_for_pdumper): new function.
(syms_of_ftcrfont): call it.
* src/ftfont.c (syms_of_ftfont_for_pdumper): new function.
(syms_of_ftfont): call it.
* src/ftxont.c (syms_of_ftxfont_for_pdumper): new function.
(syms_of_ftxfont): call it.
* src/gmalloc.c: adjust for pdumper througout
(DUMPED): remove weird custom dumped indicator.
* src/gnutls.c (syms_of_gnutls): pdumper note for
gnutls_global_initialized.
* src/image.c (syms_of_image): add pdumper comment,
initializer note.
* src/insdel.c (prepare_to_modify_buffer_1): account
for buffer contents possibly being in dump image.
* src/keyboard.c (syms_of_keyboard_for_pdumper): new function.
(syms_of_keyboard): staticpro more; call pdumper syms function.
* src/lisp.h: add comments throughout
(gflags): declare.
(will_dump_p, will_bootstrap_p, will_dump_with_pdumper_p)
(dumped_with_pdumper_p, will_dump_with_unexec_p)
(dumped_with_unexec_p, definitely_will_not_unexec_p): new
functions.
(POWER_OF_2, ROUNDUP): move macros.
(PSEUDOVECTOR_TYPE, PSEUDOVECTOR_TYPEP): take vectorlike header
pointer instead of vector; constify.
(Lisp_Hash_Table): add comment about need to rehash on access; add
comment for next_weak.
(HASH_KEY, HASH_VALUE, HASH_HASH, HASH_TABLE_SIZE): const-ify.
(hash_table_rehash): declare.
(hash_rehash_needed_p, hash_rehash_if_needed): new functions.
(finalizers, doomed_finalizers): declare extern.
(SUBR_SECTION_ATTRIBUTE): new macro.
(staticvec, staticidx): un-static-ify.
(sweep_weak_hash_tables): remove declaration.
(sweep_weak_table): declare.
(hashfn_eql, hashfn_equal): declare.
(number_finalizers_run): new variable.
(Vdead): externify when ENABLE_CHECKING.
(gc_root_type): new enumeration.
(gc_root_visitor): new struct.
(visit_static_gc_roots): declare.
(vectorlike_nbytes): declare.
(vector_nbytes): define as trivial inline function wrapper for
vectorlike_nbytes.
(init_obarray_once): change signature.
(primary_thread): extern-ify.
(init_buffer): change signature.
(init_frame_once): declare.
* src/lread.c (readevalloop): adjust for new dumped predicates.
(init_obarray_once): new function.
(ndefsubr): new variable.
(defsubr): increment it.
(load_path_check): adjust for pdumper.
(load_path_default): use pdumper functions; adjust for
dump search.
* src/macfont.m (macfont_init_font_change_handler): avoid
shadowing global.
(syms_of_macfont_for_pdumper): new function.
(syms_of_macfont): call it.
* src/menu.c (syms_of_menu): staticpro more stuff.
* src/minibuf.c (Ftry_completion): rehash if needed.
(init_minibuf_once_for_pdumper): new function.
(init_minibuf_once): call it.
* src/nsfont.m (syms_of_nsfns): staticpro more.
* src/nsfont.m (syms_of_nsfont_for_pdumper): new function.
(syms_of_nsfont): call it.
* src/nsterm.m (syms_of_nsfont): remember pdumper stuff.
* src/pdumper.c: new file.
* src/pdumper.h: new file.
* src/process.c (init_process_emacs): use new pdumper functions
instead of CANNOT_DUMP.
* src/profiler.c (syms_of_profiler_for_pdumper): new function.
(syms_of_profiler_for_pdumper): call it.
* src/search.c (syms_of_search_for_pdumper): new function.
(syms_of_search_for_pdumper): call it.
* src/sheap.c (bss_sbrk_did_unexec): remove.
* src/sheap.h (bss_sbrk_did_unexec): remove.
* src/syntax.c (syms_of_syntax): don't redundantly staticpro
re_match_object.
* src/sysdep.c: use will_dump_with_unexec_p() instead of bss
hack thing.
* src/syssignals.h (init_sigsegv): declare.
* src/systime.h (init_timefns): remove bool from signature.
* src/textprop.c (syms_of_textprop): move staticpro.
* src/thread.c (main_thread_p): constify.
* src/thread.h (main_thread_p): constify.
* src/timefns.c (init_timefns): remove bool from signature.
(syms_of_timefns_for_pdumper): new function.
(syms_of_timefns): call it.
* src/w32.c: rearrange code.
* src/w32.h (w32_relocate): declare.
* src/w32fns.c (syms_of_w32fns): add pdumper note.
* src/w32font.c (syms_of_w32font_for_pdumper): new function.
(syms_of_w32font): call it.
* src/w32heap.c (using_dynamic_heap): new variable.
(init_heap): use it.
* src/w32menu.c (syms_of_w32menu): add pdumper note.
* src/w32proc.c
(ctrl_c_handler, mainCRTStartup, _start, open_input_file)
(rva_to_section, close_file_data): move here.
* src/w32uniscribe.c (syms_of_w32uniscribe_for_pdumper):
new function.
(syms_of_w32uniscribe): call it.
* src/window.c (init_window_once_for_pdumper): new function.
(init_window_once): call it; staticpro more stuff.
* src/xfont.c (syms_of_xfont_for_pdumper): new function.
(syms_of_xfont): call it.
* src/xftfont.c (syms_of_xftfont_for_pdumper): new function.
(syms_of_xftfont): call it.
* src/xmenu.c (syms_of_xmenu_for_pdumper): new function.
(syms_of_xmenu): call it.
* src/xselect.c (syms_of_xselect_for_pdumper): new function.
(syms_of_xselect): call it.
* src/xsettings.c (syms_of_xsettings): add more pdumper notes.
* src/term.c (syms_of_xterm): add pdumper note.
* src/dispnew.c (init_faces_initial): new function.
(init_display_interactive): rename from init_display; use
will_dump_p instead of !initialized. Initialize faces early for
pdumper if needed.
(init_display): new function.
(syms_of_display_for_pdumper): new function.
(syms_of_display): call it.
* src/dbusbind.c (syms_of_dbusbind): Add TODO for bus reset
on pdumper load.
* src/data.c (Fdefalias): Use will_dump_p
instead of Vpurify_flag.
(Fmake_variable_buffer_local): silence compiler warning with -Og
by making valcontents UNINIT.
(arith_driver): silence compiler warning with UNINIT.
* src/conf_post.h (ATTRIBUTE_SECTION): new macro.
* src/composite.c (composition_gstring_put_cache): rehash hash
table if needed.
* src/coding.c (init_coding_once, syms_of_coding): remember
pdumper stuff.
* src/charset.h (charset_table_size, charset_table_user): declare.
* src/charset.c (charset_table_used, charset_table_size): un-static.
(init_charset_oncem, syms_of_charset): remember pdumper stuff.
* src/category.c (category_table_version): remove obsolete
variable.
* src/callint.c (syms_of_callint): staticpro 'preserved_fns'
(init_callproc): use will_dump_p instead of !CANNOT_DUMP.
* src/bytecode.c (exec_byte_code): rehash table tables if needed
* src/buffer.c (alloc_buffer_text, free_buffer_text): account for
pdumper
(init_buffer_once): add TODO; remember stuff for pdumper.
(init_buffer): don't take initialized argument; adjust
for pdumper.
* src/atimer.c (init_atimer): initialize subr only if
!initialized.
* src/alloc.c: (vector_marked_p, set_vector_marked)
(vectorlike_marked_p, set_vectorlike_marked, cons_marked_p)
(set_cons_marked, string_marked_p, set_string_marked)
(symbol_marked_p, set_symbol_marked, interval_marked_p)
(set_interval_marked): new accessor routines. Use them
instead of raw GC access throughout.
(Vdead): make non-static when ENABLE_CHECKING.
(vectorlike_nbytes): rename of 'vector_nbytes'; take a vectorlike
header as input instead of a vector.
(number_finalizers_run): new internal C variable.
(mark_maybe_object): check for pdumper objects.
(valid_pointer_p): don't be gratuitously inefficient under rr(1).
(make_pure_c_string): add support for size_byte = -2 mode
indicating that string data points into Emacs image rodata.
(visit_vectorlike_root): visits GC roots embedded in
vectorlike objects.
(visit_buffer_root): visits GC roots embedded in
our totally-not-a-buffer buffer global objects.
(visit_static_gc_roots): visit GC roots in the Emacs data section.
(mark_object_root_visitor): root callback used for conventional GC
marking
(weak_hash_tables): new internal variable for tracking found weak
hash tables during GC.
(mark_and_sweep_weak_table_contents): new weak hash table marking.
(garbage_collect_1): use new GC root visitor machinery.
(mark_vectorlike): accept a vectorlike_header instead of a
Lisp_Vector.
(mark_frame, mark_window, mark_hash_table): new functions.
(mark_object): initialize 'm'; check for pdumper objects and use
new mark-bit accessors throughout. Remove some object-specific
marking code and move to helper functions above.
(survives_gc_p): check for pdumper objects.
(gc-sweep): clear pdumper mark bits.
(init_alloc_once_for_pdumper): new helper function for early init
called both during normal init and pdumper load.
(init_alloc_once): pdumper integration.
* src/Makefile.in: Rewrite dumping for pdumper; add pdumper.o;
invoke temacs with --temacs command line option; build dmpstruct.h
from dmpstruct.awk; stop relying on CANNOT_DUMP; clean up pdumper
intermediate files during build.
* nextstep/Makefile.in: build emacs.pdmp into NS packages
* lisp/startup.el: account for new '--temacs' and '--dump-file'
command line option.
* lisp/loadup.el: rewrite early init to account for pdumper; use
injected 'dump-mode' variable (set via the new '--temacs' option)
instead of parsing command line.
* lisp/cus-start.el: Check 'dump-mode' instead of 'purify-flag',
since the new 'dump-mode'
* lib-src/make-fingerprint.c: new program
* lib-src/Makefile.in: built make-fingerprint utility program
* configure.ac: Add --with-pdumper toggle to control pdumper
support; add --with-unexec toggle to control unexec support.
Add --with-dumping option to control which dumping strategy we use
by default. Adjust for pdumper throughout. Check for
posix_madvise.
* Makefile.in: Add @DUMPING@ substitution; add pdumper mode.
* .gitignore: Add make-fingerprint, temacs.in, fingerprint.c,
dmpstruct.h, and pdumper dump files.
2019-01-15 22:36:54 +00:00
|
|
|
|
fi
|
Replace executable’s fingerprint in place
* admin/merge-gnulib (GNULIB_MODULES): Add memmem-simple.
(AVOIDED_MODULES): Add memchr.
* configure.ac (HAVE_PDUMPER): AC_SUBST it, too, for use in makefiles.
* lib/Makefile.in (libgnu_a_OBJECTS): Add fingerprint.o.
* lib/fingerprint.c: New file.
* lib/memmem.c, lib/str-two-way.h, m4/memmem.m4: New files,
copied from Gnulib.
* lib/fingerprint.h: Rename from src/fingerprint.h.
* lib-src/make-fingerprint.c: Include limits.h, sys/stat.h,
fingerprint.h, intprops.h, min-max.h.
(SSIZE_MAX): New macro, if not already defined.
(main): Without -r, Replace the fingerprint in the input file
instead of generating a fingerprint.c.
* lib/Makefile.in (libgnu_a_OBJECTS): Add fingerprint.o.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
* src/Makefile.in (HAVE_PDUMPER, MAKE_PDUMPER_FINGERPRINT):
New macros.
(temacs$(EXEEXT)): Use them to replace the fingerprint instead
of precalculating it.
(mostlyclean, ctagsfiles1): Do not worry about fingerprint.c.
2019-04-14 23:31:24 +00:00
|
|
|
|
AC_SUBST([HAVE_PDUMPER])
|
Add portable dumper
Add a new portable dumper as an alternative to unexec. Use it by default.
* src/dmpstruct.awk: New file.
* src/doc.c (get_doc_string): use will_dump_p().
* src/editfns.c (styled_format): silence compiler warning
with UNINIT.
* src/emacs-module.c (syms_of_module): staticpro ltv_mark.
* src/emacs.c (gflags): new variable.
(init_cmdargs): unwrap
(string_starts_with_p, find_argument, dump_error_to_string)
(load_pdump): new functions.
(main): detect pdumper and --temacs invocation; actually load
portable dump when detected; set gflags as appropriate; changes to
init functions throughout to avoid passing explicit
'initialized' argument.
* src/eval.c (inhibit_lisp_code): remove unused variable.
(init_eval_once_for_pdumper): new function.
(init_eval_once): call it.
* src/filelock.c: CANNOT_DUMP -> will_dump_p()
* src/fingerprint-dummy.c: new file
* src/fingerprint.h: new file
* src/fns.c: CANNOT_DUMP -> will_dump_p(), etc.
(weak_hash_tables): remove
(hashfn_equal, hashfn_eql): un-staticify
(make_hash_table): set new 'next_weak' hash table field; drop
global weak_hash_tables logic.
(copy_hash_table): drop global weak_hash_tables logic.
(hash_table_rehash): new function.
(hash_lookup, hash_put, hash_remove_from_table, hash_clear):
rehash if needed.
(sweep_weak_table): un-staticify; explain logic; bool-ify.
(sweep_weak_hash_tables): remove function.
* src/font.c (syms_of_font): remember pdumper stuff.
* src/fontset.c (syms_of_fontset): remember pdumper stuff.
* src/frame.c (make_initial_frame): don't reset Vframe_list.
(init_frame_once_for_pdumper, init_frame_once): new functions.
(syms_of_frame): remove redundant staticpro.
* src/fringe.c (init_fringe_once_for_pdumper): new functin.
(init_fringe_once): call it.
* src/ftcrfont.c (syms_of_ftcrfont_for_pdumper): new function.
(syms_of_ftcrfont): call it.
* src/ftfont.c (syms_of_ftfont_for_pdumper): new function.
(syms_of_ftfont): call it.
* src/ftxont.c (syms_of_ftxfont_for_pdumper): new function.
(syms_of_ftxfont): call it.
* src/gmalloc.c: adjust for pdumper througout
(DUMPED): remove weird custom dumped indicator.
* src/gnutls.c (syms_of_gnutls): pdumper note for
gnutls_global_initialized.
* src/image.c (syms_of_image): add pdumper comment,
initializer note.
* src/insdel.c (prepare_to_modify_buffer_1): account
for buffer contents possibly being in dump image.
* src/keyboard.c (syms_of_keyboard_for_pdumper): new function.
(syms_of_keyboard): staticpro more; call pdumper syms function.
* src/lisp.h: add comments throughout
(gflags): declare.
(will_dump_p, will_bootstrap_p, will_dump_with_pdumper_p)
(dumped_with_pdumper_p, will_dump_with_unexec_p)
(dumped_with_unexec_p, definitely_will_not_unexec_p): new
functions.
(POWER_OF_2, ROUNDUP): move macros.
(PSEUDOVECTOR_TYPE, PSEUDOVECTOR_TYPEP): take vectorlike header
pointer instead of vector; constify.
(Lisp_Hash_Table): add comment about need to rehash on access; add
comment for next_weak.
(HASH_KEY, HASH_VALUE, HASH_HASH, HASH_TABLE_SIZE): const-ify.
(hash_table_rehash): declare.
(hash_rehash_needed_p, hash_rehash_if_needed): new functions.
(finalizers, doomed_finalizers): declare extern.
(SUBR_SECTION_ATTRIBUTE): new macro.
(staticvec, staticidx): un-static-ify.
(sweep_weak_hash_tables): remove declaration.
(sweep_weak_table): declare.
(hashfn_eql, hashfn_equal): declare.
(number_finalizers_run): new variable.
(Vdead): externify when ENABLE_CHECKING.
(gc_root_type): new enumeration.
(gc_root_visitor): new struct.
(visit_static_gc_roots): declare.
(vectorlike_nbytes): declare.
(vector_nbytes): define as trivial inline function wrapper for
vectorlike_nbytes.
(init_obarray_once): change signature.
(primary_thread): extern-ify.
(init_buffer): change signature.
(init_frame_once): declare.
* src/lread.c (readevalloop): adjust for new dumped predicates.
(init_obarray_once): new function.
(ndefsubr): new variable.
(defsubr): increment it.
(load_path_check): adjust for pdumper.
(load_path_default): use pdumper functions; adjust for
dump search.
* src/macfont.m (macfont_init_font_change_handler): avoid
shadowing global.
(syms_of_macfont_for_pdumper): new function.
(syms_of_macfont): call it.
* src/menu.c (syms_of_menu): staticpro more stuff.
* src/minibuf.c (Ftry_completion): rehash if needed.
(init_minibuf_once_for_pdumper): new function.
(init_minibuf_once): call it.
* src/nsfont.m (syms_of_nsfns): staticpro more.
* src/nsfont.m (syms_of_nsfont_for_pdumper): new function.
(syms_of_nsfont): call it.
* src/nsterm.m (syms_of_nsfont): remember pdumper stuff.
* src/pdumper.c: new file.
* src/pdumper.h: new file.
* src/process.c (init_process_emacs): use new pdumper functions
instead of CANNOT_DUMP.
* src/profiler.c (syms_of_profiler_for_pdumper): new function.
(syms_of_profiler_for_pdumper): call it.
* src/search.c (syms_of_search_for_pdumper): new function.
(syms_of_search_for_pdumper): call it.
* src/sheap.c (bss_sbrk_did_unexec): remove.
* src/sheap.h (bss_sbrk_did_unexec): remove.
* src/syntax.c (syms_of_syntax): don't redundantly staticpro
re_match_object.
* src/sysdep.c: use will_dump_with_unexec_p() instead of bss
hack thing.
* src/syssignals.h (init_sigsegv): declare.
* src/systime.h (init_timefns): remove bool from signature.
* src/textprop.c (syms_of_textprop): move staticpro.
* src/thread.c (main_thread_p): constify.
* src/thread.h (main_thread_p): constify.
* src/timefns.c (init_timefns): remove bool from signature.
(syms_of_timefns_for_pdumper): new function.
(syms_of_timefns): call it.
* src/w32.c: rearrange code.
* src/w32.h (w32_relocate): declare.
* src/w32fns.c (syms_of_w32fns): add pdumper note.
* src/w32font.c (syms_of_w32font_for_pdumper): new function.
(syms_of_w32font): call it.
* src/w32heap.c (using_dynamic_heap): new variable.
(init_heap): use it.
* src/w32menu.c (syms_of_w32menu): add pdumper note.
* src/w32proc.c
(ctrl_c_handler, mainCRTStartup, _start, open_input_file)
(rva_to_section, close_file_data): move here.
* src/w32uniscribe.c (syms_of_w32uniscribe_for_pdumper):
new function.
(syms_of_w32uniscribe): call it.
* src/window.c (init_window_once_for_pdumper): new function.
(init_window_once): call it; staticpro more stuff.
* src/xfont.c (syms_of_xfont_for_pdumper): new function.
(syms_of_xfont): call it.
* src/xftfont.c (syms_of_xftfont_for_pdumper): new function.
(syms_of_xftfont): call it.
* src/xmenu.c (syms_of_xmenu_for_pdumper): new function.
(syms_of_xmenu): call it.
* src/xselect.c (syms_of_xselect_for_pdumper): new function.
(syms_of_xselect): call it.
* src/xsettings.c (syms_of_xsettings): add more pdumper notes.
* src/term.c (syms_of_xterm): add pdumper note.
* src/dispnew.c (init_faces_initial): new function.
(init_display_interactive): rename from init_display; use
will_dump_p instead of !initialized. Initialize faces early for
pdumper if needed.
(init_display): new function.
(syms_of_display_for_pdumper): new function.
(syms_of_display): call it.
* src/dbusbind.c (syms_of_dbusbind): Add TODO for bus reset
on pdumper load.
* src/data.c (Fdefalias): Use will_dump_p
instead of Vpurify_flag.
(Fmake_variable_buffer_local): silence compiler warning with -Og
by making valcontents UNINIT.
(arith_driver): silence compiler warning with UNINIT.
* src/conf_post.h (ATTRIBUTE_SECTION): new macro.
* src/composite.c (composition_gstring_put_cache): rehash hash
table if needed.
* src/coding.c (init_coding_once, syms_of_coding): remember
pdumper stuff.
* src/charset.h (charset_table_size, charset_table_user): declare.
* src/charset.c (charset_table_used, charset_table_size): un-static.
(init_charset_oncem, syms_of_charset): remember pdumper stuff.
* src/category.c (category_table_version): remove obsolete
variable.
* src/callint.c (syms_of_callint): staticpro 'preserved_fns'
(init_callproc): use will_dump_p instead of !CANNOT_DUMP.
* src/bytecode.c (exec_byte_code): rehash table tables if needed
* src/buffer.c (alloc_buffer_text, free_buffer_text): account for
pdumper
(init_buffer_once): add TODO; remember stuff for pdumper.
(init_buffer): don't take initialized argument; adjust
for pdumper.
* src/atimer.c (init_atimer): initialize subr only if
!initialized.
* src/alloc.c: (vector_marked_p, set_vector_marked)
(vectorlike_marked_p, set_vectorlike_marked, cons_marked_p)
(set_cons_marked, string_marked_p, set_string_marked)
(symbol_marked_p, set_symbol_marked, interval_marked_p)
(set_interval_marked): new accessor routines. Use them
instead of raw GC access throughout.
(Vdead): make non-static when ENABLE_CHECKING.
(vectorlike_nbytes): rename of 'vector_nbytes'; take a vectorlike
header as input instead of a vector.
(number_finalizers_run): new internal C variable.
(mark_maybe_object): check for pdumper objects.
(valid_pointer_p): don't be gratuitously inefficient under rr(1).
(make_pure_c_string): add support for size_byte = -2 mode
indicating that string data points into Emacs image rodata.
(visit_vectorlike_root): visits GC roots embedded in
vectorlike objects.
(visit_buffer_root): visits GC roots embedded in
our totally-not-a-buffer buffer global objects.
(visit_static_gc_roots): visit GC roots in the Emacs data section.
(mark_object_root_visitor): root callback used for conventional GC
marking
(weak_hash_tables): new internal variable for tracking found weak
hash tables during GC.
(mark_and_sweep_weak_table_contents): new weak hash table marking.
(garbage_collect_1): use new GC root visitor machinery.
(mark_vectorlike): accept a vectorlike_header instead of a
Lisp_Vector.
(mark_frame, mark_window, mark_hash_table): new functions.
(mark_object): initialize 'm'; check for pdumper objects and use
new mark-bit accessors throughout. Remove some object-specific
marking code and move to helper functions above.
(survives_gc_p): check for pdumper objects.
(gc-sweep): clear pdumper mark bits.
(init_alloc_once_for_pdumper): new helper function for early init
called both during normal init and pdumper load.
(init_alloc_once): pdumper integration.
* src/Makefile.in: Rewrite dumping for pdumper; add pdumper.o;
invoke temacs with --temacs command line option; build dmpstruct.h
from dmpstruct.awk; stop relying on CANNOT_DUMP; clean up pdumper
intermediate files during build.
* nextstep/Makefile.in: build emacs.pdmp into NS packages
* lisp/startup.el: account for new '--temacs' and '--dump-file'
command line option.
* lisp/loadup.el: rewrite early init to account for pdumper; use
injected 'dump-mode' variable (set via the new '--temacs' option)
instead of parsing command line.
* lisp/cus-start.el: Check 'dump-mode' instead of 'purify-flag',
since the new 'dump-mode'
* lib-src/make-fingerprint.c: new program
* lib-src/Makefile.in: built make-fingerprint utility program
* configure.ac: Add --with-pdumper toggle to control pdumper
support; add --with-unexec toggle to control unexec support.
Add --with-dumping option to control which dumping strategy we use
by default. Adjust for pdumper throughout. Check for
posix_madvise.
* Makefile.in: Add @DUMPING@ substitution; add pdumper mode.
* .gitignore: Add make-fingerprint, temacs.in, fingerprint.c,
dmpstruct.h, and pdumper dump files.
2019-01-15 22:36:54 +00:00
|
|
|
|
|
|
|
|
|
DUMPING=$with_dumping
|
|
|
|
|
AC_SUBST(DUMPING)
|
|
|
|
|
|
2008-01-25 04:32:52 +00:00
|
|
|
|
dnl FIXME currently it is not the last.
|
1994-11-22 03:22:43 +00:00
|
|
|
|
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
|
1994-11-22 03:22:43 +00:00
|
|
|
|
dnl keep them together visually.
|
2007-09-02 08:25:00 +00:00
|
|
|
|
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)])],
|
1994-08-26 14:57:46 +00:00
|
|
|
|
[ case "${withval}" in
|
2007-06-08 03:46:32 +00:00
|
|
|
|
y | ye | yes ) val=gtk ;;
|
1994-08-26 14:57:46 +00:00
|
|
|
|
n | no ) val=no ;;
|
|
|
|
|
l | lu | luc | luci | lucid ) val=lucid ;;
|
1995-10-05 16:35:45 +00:00
|
|
|
|
a | at | ath | athe | athen | athena ) val=athena ;;
|
1994-10-27 19:58:25 +00:00
|
|
|
|
m | mo | mot | moti | motif ) val=motif ;;
|
2003-01-19 21:50:03 +00:00
|
|
|
|
g | gt | gtk ) val=gtk ;;
|
2012-09-12 20:21:39 +00:00
|
|
|
|
gtk2 ) val=gtk2 ;;
|
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
* configure.in: Add --with-x-toolkit=gtk3. Remove HAVE_GTK_MULTIDISPLAY,
check for gtk_file_chooser_dialog_new, and HAVE_GTK_FILE_BOTH (implied
by minimum required Gtk+ 2.6). Add checks for functions introduced
in Gtk+ 2.14 or newer.
* xterm.h (gtk_widget_get_window, gtk_widget_get_mapped)
(gtk_adjustment_get_page_size, gtk_adjustment_get_upper): New
defines based on what configure finds.
* xterm.c (XTflash): Use gtk_widget_get_window.
(xg_scroll_callback): Use gtk_adjustment_get_upper and
gtk_adjustment_get_page_size.
(handle_one_xevent): Use gtk_widget_get_mapped.
(x_term_init): Remove HAVE_GTK_MULTIDISPLAY and associated error
messages.
* xmenu.c (create_and_show_popup_menu): Call gtk_widget_get_mapped.
* gtkutil.h: Replace HAVE_GTK_FILE_BOTH with
HAVE_GTK_FILE_SELECTION_NEW.
* gtkutil.c (xg_display_open, xg_display_close): Remove
HAVE_GTK_MULTIDISPLAY, it is always defined.
(xg_display_open): Return type is void.
(gtk_widget_set_has_window)
(gtk_dialog_get_action_area, gtk_dialog_get_content_area)
(gtk_widget_get_sensitive, gtk_adjustment_set_page_size)
(gtk_adjustment_set_page_increment)
(gtk_adjustment_get_step_increment): #define these if not found
by configure.
(remove_submenu): New define based on Gtk+ version.
(xg_set_cursor, xg_frame_resized, xg_event_is_for_scrollbar): Use
gtk_widget_get_window.
(xg_frame_resized, xg_update_frame_menubar): Use gtk_widget_get_mapped.
(xg_create_frame_widgets): Use gtk_widget_set_has_window.
(create_dialog): Use gtk_dialog_get_action_area and
gtk_dialog_get_content_area.
(xg_uses_old_file_dialog, xg_get_file_name): Remove HAVE_GTK_FILE_BOTH
and HAVE_GTK_FILE_CHOOSER_DIALOG_NEW. File chooser is always
available, so checking for HAVE_GTK_FILE_SELECTION_NEW is enough.
(xg_update_menubar, xg_update_submenu, xg_show_toolbar_item): Use
g_object_ref and g_object_unref.
(xg_update_menu_item, xg_tool_bar_menu_proxy): Use
gtk_widget_get_sensitive.
(xg_update_submenu): Use remove_submenu.
(xg_update_scrollbar_pos): Don't use GtkFixedChild, use child
properties instead to get old x and y position.
(xg_set_toolkit_scroll_bar_thumb): Use gtk_adjustment_get_page_size,
gtk_adjustment_get_step_increment, gtk_adjustment_set_page_size,
gtk_adjustment_set_step_increment and gtk_adjustment_set_page_increment.
(xg_get_tool_bar_widgets): New function.
(xg_tool_bar_menu_proxy, xg_show_toolbar_item)
(update_frame_tool_bar): Call xg_get_tool_bar_widgets.
(toolbar_set_orientation): New #define based on if configure
finds gtk_orientable_set_orientation.
(xg_create_tool_bar): Call toolbar_set_orientation.
(xg_make_tool_item, xg_show_toolbar_item): Call gtk_box_pack_start
instead of gtk_box_pack_start_defaults.
2010-06-28 10:11:26 +00:00
|
|
|
|
gtk3 ) val=gtk3 ;;
|
1994-08-26 14:57:46 +00:00
|
|
|
|
* )
|
2015-04-19 21:40:51 +00:00
|
|
|
|
AC_MSG_ERROR(['--with-x-toolkit=$withval' is invalid;
|
|
|
|
|
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.])
|
1994-08-26 14:57:46 +00:00
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
with_x_toolkit=$val
|
|
|
|
|
])
|
2007-09-02 08:25:00 +00:00
|
|
|
|
|
2020-05-27 16:45:49 +00:00
|
|
|
|
OPTION_DEFAULT_OFF([wide-int],
|
|
|
|
|
[prefer wide Emacs integers (typically 62-bit);
|
|
|
|
|
on 32-bit hosts, this allows buffer and string size up to 2GB,
|
|
|
|
|
at the cost of 10% to 30% slowdown of Lisp interpreter
|
|
|
|
|
and larger memory footprint])
|
2011-06-07 04:16:37 +00:00
|
|
|
|
if test "$with_wide_int" = yes; then
|
|
|
|
|
AC_DEFINE([WIDE_EMACS_INT], 1, [Use long long for EMACS_INT if available.])
|
|
|
|
|
fi
|
|
|
|
|
|
2008-01-25 04:32:52 +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}
|
2008-01-25 04:32:52 +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])
|
2017-09-14 19:22:29 +00:00
|
|
|
|
OPTION_DEFAULT_ON([lcms2],[don't compile with Little CMS support])
|
2016-04-16 09:43:01 +00:00
|
|
|
|
OPTION_DEFAULT_ON([libsystemd],[don't compile with libsystemd support])
|
2020-01-14 10:18:20 +00:00
|
|
|
|
OPTION_DEFAULT_ON([cairo],[don't compile with Cairo drawing])
|
2010-09-10 16:44:35 +00:00
|
|
|
|
OPTION_DEFAULT_ON([xml2],[don't compile with XML parsing support])
|
2019-05-14 05:59:29 +00:00
|
|
|
|
OPTION_DEFAULT_OFF([imagemagick],[compile with ImageMagick image support])
|
2020-04-15 13:54:38 +00:00
|
|
|
|
OPTION_DEFAULT_ON([native-image-api], [don't use native image APIs (GDI+ on Windows)])
|
2020-10-02 01:14:31 +00:00
|
|
|
|
OPTION_DEFAULT_IFAVAILABLE([json], [compile with native JSON support])
|
2008-01-25 04:32:52 +00:00
|
|
|
|
|
2008-01-30 19:52:04 +00:00
|
|
|
|
OPTION_DEFAULT_ON([xft],[don't use XFT for anti aliased fonts])
|
2018-12-13 20:13:18 +00:00
|
|
|
|
OPTION_DEFAULT_ON([harfbuzz],[don't use HarfBuzz for text shaping])
|
2008-01-30 07:57:28 +00:00
|
|
|
|
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])
|
|
|
|
|
|
2018-10-13 08:52:06 +00:00
|
|
|
|
OPTION_DEFAULT_ON([toolkit-scroll-bars],[don't use Motif/Xaw3d/GTK toolkit scroll bars])
|
2008-01-23 03:43:32 +00:00
|
|
|
|
OPTION_DEFAULT_ON([xaw3d],[don't use Xaw3d])
|
2018-08-28 01:44:29 +00:00
|
|
|
|
OPTION_DEFAULT_ON([xim],[at runtime, default X11 XIM to off])
|
2020-08-26 13:03:08 +00:00
|
|
|
|
OPTION_DEFAULT_ON([xdbe],[don't use X11 double buffering support])
|
2015-06-23 02:03:33 +00:00
|
|
|
|
AC_ARG_WITH([ns],[AS_HELP_STRING([--with-ns],
|
2016-11-06 07:33:43 +00:00
|
|
|
|
[use Nextstep (macOS Cocoa or GNUstep) windowing system.
|
|
|
|
|
On by default on macOS.])],[],[with_ns=maybe])
|
2012-11-22 17:32:57 +00:00
|
|
|
|
OPTION_DEFAULT_OFF([w32], [use native MS Windows GUI in a Cygwin build])
|
2020-07-02 06:27:30 +00:00
|
|
|
|
OPTION_DEFAULT_OFF([pgtk], [use pure GTK build without reliance on X libs (Wayland support) - Experimental])
|
2008-01-25 04:32:52 +00:00
|
|
|
|
|
|
|
|
|
OPTION_DEFAULT_ON([gpm],[don't use -lgpm for mouse support on a GNU/Linux console])
|
2008-02-05 05:13:13 +00:00
|
|
|
|
OPTION_DEFAULT_ON([dbus],[don't compile with D-Bus support])
|
2017-07-23 01:43:28 +00:00
|
|
|
|
AC_ARG_WITH([gconf],[AS_HELP_STRING([--with-gconf],
|
2018-02-28 20:20:42 +00:00
|
|
|
|
[compile with Gconf support (Gsettings replaces this)])],[],
|
|
|
|
|
[if test $with_features = yes; then
|
|
|
|
|
with_gconf=maybe
|
|
|
|
|
else
|
|
|
|
|
with_gconf=no
|
|
|
|
|
fi])
|
2011-06-30 14:00:26 +00:00
|
|
|
|
OPTION_DEFAULT_ON([gsettings],[don't compile with GSettings support])
|
2010-04-21 03:02:58 +00:00
|
|
|
|
OPTION_DEFAULT_ON([selinux],[don't compile with SELinux support])
|
2010-09-26 06:06:28 +00:00
|
|
|
|
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])
|
2020-01-26 09:06:09 +00:00
|
|
|
|
OPTION_DEFAULT_ON([modules],[don't compile with dynamic modules support])
|
2013-08-26 14:46:30 +00:00
|
|
|
|
OPTION_DEFAULT_ON([threads],[don't compile with elisp threading support])
|
2013-06-03 13:03:05 +00:00
|
|
|
|
|
|
|
|
|
AC_ARG_WITH([file-notification],[AS_HELP_STRING([--with-file-notification=LIB],
|
2015-11-09 09:00:56 +00:00
|
|
|
|
[use a file notification library (LIB one of: yes, inotify, kqueue, gfile, w32, no)])],
|
2013-06-03 13:03:05 +00:00
|
|
|
|
[ case "${withval}" in
|
|
|
|
|
y | ye | yes ) val=yes ;;
|
|
|
|
|
n | no ) val=no ;;
|
|
|
|
|
i | in | ino | inot | inoti | inotif | inotify ) val=inotify ;;
|
2015-11-09 09:00:56 +00:00
|
|
|
|
k | kq | kqu | kque | kqueu | kqueue ) val=kqueue ;;
|
|
|
|
|
g | gf | gfi | gfil | gfile ) val=gfile ;;
|
2013-06-03 13:03:05 +00:00
|
|
|
|
w | w3 | w32 ) val=w32 ;;
|
2015-04-19 21:40:51 +00:00
|
|
|
|
* ) AC_MSG_ERROR(['--with-file-notification=$withval' is invalid;
|
2016-01-04 22:46:35 +00:00
|
|
|
|
this option's value should be 'yes', 'no', 'inotify', 'kqueue', 'gfile' or 'w32'.
|
2015-04-19 21:40:51 +00:00
|
|
|
|
'yes' is a synonym for 'w32' on MS-Windows, for 'no' on Nextstep,
|
2015-11-09 09:00:56 +00:00
|
|
|
|
otherwise for the first of 'inotify', 'kqueue' or 'gfile' 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])
|
2008-01-25 04:32:52 +00:00
|
|
|
|
|
Support for the new Xwidget feature.
* configure.ac:
(HAVE_XWIDGETS, WIDGET_OBJ, EMACS_CONFIG_FEATURES):
* xterm.c (x_draw_glyph_string, x_draw_bar_cursor):
* xdisp.c:
(handle_display_spec, handle_single_display_spec, push_it)
(pop_it, set_iterator_to_next, dump_glyph)
(calc_pixel_width_or_height, fill_xwidget_glyph_string)
(BUILD_XWIDGET_GLYPH_STRING, BUILD_GLYPH_STRINGS)
(produce_xwidget_glyph, x_produce_glyphs)
(get_window_cursor_type):
* window.c (Fdelete_window_internal):
* termhooks.h (e):
* print.c (print_object):
* lisp.h (ptrdiff_t):
* keyboard.c (kbd_buffer_get_event, make_lispy_event)
(syms_of_keyboard):
* emacs.c (main):
* dispnew.c (update_window, scrolling_window):
* dispextern.h (g, i):
* Makefile.in (XWIDGETS_OBJ, WEBKIT_CFLAGS, WEBKIT_LIBS)
(GIR_LIBS, ALL_CFLAGS, base_obj, LIBES):
* keyboard.c (kbd_buffer_get_event):
* emacsgtkfixed.c (emacs_fixed_gtk_widget_size_allocate)
(emacs_fixed_class_init): Add case for an xwidget view.
* xwidget.c, xwidget.h, xwidget.el: New files for xwidgets
Co-authored-by: Grégoire Jadi <daimrod@gmail.com>
Various improvements to the Xwidget feature.
* xwidgets.c:
* emacsgtkfixed.c:
* xwidget.el:
2016-01-19 19:27:12 +00:00
|
|
|
|
OPTION_DEFAULT_OFF([xwidgets],
|
2020-08-12 10:12:34 +00:00
|
|
|
|
[enable use of xwidgets in Emacs buffers (requires gtk3 or macOS Cocoa)])
|
Support for the new Xwidget feature.
* configure.ac:
(HAVE_XWIDGETS, WIDGET_OBJ, EMACS_CONFIG_FEATURES):
* xterm.c (x_draw_glyph_string, x_draw_bar_cursor):
* xdisp.c:
(handle_display_spec, handle_single_display_spec, push_it)
(pop_it, set_iterator_to_next, dump_glyph)
(calc_pixel_width_or_height, fill_xwidget_glyph_string)
(BUILD_XWIDGET_GLYPH_STRING, BUILD_GLYPH_STRINGS)
(produce_xwidget_glyph, x_produce_glyphs)
(get_window_cursor_type):
* window.c (Fdelete_window_internal):
* termhooks.h (e):
* print.c (print_object):
* lisp.h (ptrdiff_t):
* keyboard.c (kbd_buffer_get_event, make_lispy_event)
(syms_of_keyboard):
* emacs.c (main):
* dispnew.c (update_window, scrolling_window):
* dispextern.h (g, i):
* Makefile.in (XWIDGETS_OBJ, WEBKIT_CFLAGS, WEBKIT_LIBS)
(GIR_LIBS, ALL_CFLAGS, base_obj, LIBES):
* keyboard.c (kbd_buffer_get_event):
* emacsgtkfixed.c (emacs_fixed_gtk_widget_size_allocate)
(emacs_fixed_class_init): Add case for an xwidget view.
* xwidget.c, xwidget.h, xwidget.el: New files for xwidgets
Co-authored-by: Grégoire Jadi <daimrod@gmail.com>
Various improvements to the Xwidget feature.
* xwidgets.c:
* emacsgtkfixed.c:
* xwidget.el:
2016-01-19 19:27:12 +00:00
|
|
|
|
|
2008-05-03 20:16:15 +00:00
|
|
|
|
## For the times when you want to build Emacs but don't have
|
|
|
|
|
## a suitable makeinfo, and can live without the manuals.
|
2017-11-26 06:45:41 +00:00
|
|
|
|
dnl https://lists.gnu.org/r/emacs-devel/2008-04/msg01844.html
|
2008-05-03 20:16:15 +00:00
|
|
|
|
OPTION_DEFAULT_ON([makeinfo],[don't require makeinfo for building manuals])
|
|
|
|
|
|
2011-12-03 20:19:03 +00:00
|
|
|
|
## Makefile.in needs the cache file name.
|
|
|
|
|
AC_SUBST(cache_file)
|
|
|
|
|
|
2010-06-11 03:35:40 +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-10 21:52:26 +00:00
|
|
|
|
OPTION_DEFAULT_ON([compress-install],
|
|
|
|
|
[don't compress some files (.el, .info, etc.) when installing. Equivalent to:
|
|
|
|
|
make GZIP_PROG= install])
|
2008-02-06 07:57:33 +00:00
|
|
|
|
|
2010-12-29 11:11:25 +00:00
|
|
|
|
AC_ARG_WITH(gameuser,dnl
|
2015-01-16 08:25:25 +00:00
|
|
|
|
[AS_HELP_STRING([--with-gameuser=USER_OR_GROUP],
|
|
|
|
|
[user for shared game score files.
|
|
|
|
|
An argument prefixed by ':' specifies a group instead.])])
|
|
|
|
|
gameuser=
|
|
|
|
|
gamegroup=
|
|
|
|
|
case ${with_gameuser} in
|
2017-03-12 19:04:10 +00:00
|
|
|
|
'' | no) ;;
|
|
|
|
|
yes) gamegroup=games ;;
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
|
:*) gamegroup=${with_gameuser#:} ;;
|
2015-01-16 08:25:25 +00:00
|
|
|
|
*) gameuser=${with_gameuser} ;;
|
|
|
|
|
esac
|
2010-12-29 11:11:25 +00:00
|
|
|
|
|
2008-10-24 07:22:43 +00:00
|
|
|
|
AC_ARG_WITH([gnustep-conf],dnl
|
2012-12-09 02:22:39 +00:00
|
|
|
|
[AS_HELP_STRING([--with-gnustep-conf=FILENAME],
|
2015-01-25 02:05:33 +00:00
|
|
|
|
[name of GNUstep configuration file to use on systems where the command
|
|
|
|
|
'gnustep-config' does not work; default $GNUSTEP_CONFIG_FILE, or
|
|
|
|
|
/etc/GNUstep/GNUstep.conf])])
|
2008-10-24 07:22:43 +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
|
|
|
|
|
|
2008-07-17 17:44:41 +00:00
|
|
|
|
AC_ARG_ENABLE(ns-self-contained,
|
2008-08-07 08:54:11 +00:00
|
|
|
|
[AS_HELP_STRING([--disable-ns-self-contained],
|
|
|
|
|
[disable self contained build under NeXTstep])],
|
|
|
|
|
EN_NS_SELF_CONTAINED=$enableval,
|
2008-07-17 17:44:41 +00:00
|
|
|
|
EN_NS_SELF_CONTAINED=yes)
|
|
|
|
|
|
2015-02-13 16:44:26 +00:00
|
|
|
|
locallisppathset=no
|
2005-05-19 08:28:29 +00:00
|
|
|
|
AC_ARG_ENABLE(locallisppath,
|
2007-09-02 18:24:57 +00:00
|
|
|
|
[AS_HELP_STRING([--enable-locallisppath=PATH],
|
|
|
|
|
[directories Emacs should search for lisp files specific
|
|
|
|
|
to this site])],
|
2005-05-19 08:28:29 +00:00
|
|
|
|
if test "${enableval}" = "no"; then
|
|
|
|
|
locallisppath=
|
|
|
|
|
elif test "${enableval}" != "yes"; then
|
2015-02-13 16:44:26 +00:00
|
|
|
|
locallisppath=${enableval} locallisppathset=yes
|
2005-05-19 08:28:29 +00:00
|
|
|
|
fi)
|
|
|
|
|
|
2009-06-26 23:41:43 +00:00
|
|
|
|
AC_ARG_ENABLE(checking,
|
2009-07-04 08:12:10 +00:00
|
|
|
|
[AS_HELP_STRING([--enable-checking@<:@=LIST@:>@],
|
2019-04-11 02:42:37 +00:00
|
|
|
|
[enable expensive checks. With LIST,
|
2009-07-04 08:12:10 +00:00
|
|
|
|
enable only specific categories of checks.
|
|
|
|
|
Categories are: all,yes,no.
|
|
|
|
|
Flags are: stringbytes, stringoverrun, stringfreelist,
|
2019-04-22 04:47:10 +00:00
|
|
|
|
structs, glyphs])],
|
2009-06-26 23:41:43 +00:00
|
|
|
|
[ac_checking_flags="${enableval}"],[])
|
|
|
|
|
IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="$IFS,"
|
2019-04-11 02:42:37 +00:00
|
|
|
|
CHECK_STRUCTS=false
|
2009-06-26 23:41:43 +00:00
|
|
|
|
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= ;
|
2019-04-11 02:42:37 +00:00
|
|
|
|
CHECK_STRUCTS=false
|
2009-06-26 23:41:43 +00:00
|
|
|
|
ac_gc_check_stringbytes= ;
|
|
|
|
|
ac_gc_check_string_overrun= ;
|
|
|
|
|
ac_gc_check_string_free_list= ;
|
2012-06-28 16:34:05 +00:00
|
|
|
|
ac_glyphs_debug= ;;
|
2009-06-26 23:41:43 +00:00
|
|
|
|
all) ac_enable_checking=1 ;
|
2019-04-11 02:42:37 +00:00
|
|
|
|
CHECK_STRUCTS=true
|
2009-06-26 23:41:43 +00:00
|
|
|
|
ac_gc_check_stringbytes=1 ;
|
|
|
|
|
ac_gc_check_string_overrun=1 ;
|
|
|
|
|
ac_gc_check_string_free_list=1 ;
|
2012-06-28 16:34:05 +00:00
|
|
|
|
ac_glyphs_debug=1 ;;
|
2009-06-26 23:41:43 +00:00
|
|
|
|
# these enable particular checks
|
2015-04-19 21:40:51 +00:00
|
|
|
|
stringbytes) ac_gc_check_stringbytes=1 ;;
|
|
|
|
|
stringoverrun) ac_gc_check_string_overrun=1 ;;
|
2009-06-26 23:41:43 +00:00
|
|
|
|
stringfreelist) ac_gc_check_string_free_list=1 ;;
|
2019-04-11 02:42:37 +00:00
|
|
|
|
structs) CHECK_STRUCTS=true ;;
|
2012-06-28 16:34:05 +00:00
|
|
|
|
glyphs) ac_glyphs_debug=1 ;;
|
2009-06-26 23:41:43 +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.])
|
2009-06-26 23:41:43 +00:00
|
|
|
|
fi
|
2019-04-11 02:42:37 +00:00
|
|
|
|
if $CHECK_STRUCTS; then
|
|
|
|
|
AC_DEFINE([CHECK_STRUCTS], 1,
|
|
|
|
|
[Define this to check whether someone updated the portable dumper
|
|
|
|
|
code after changing the layout of a structure that it uses.
|
|
|
|
|
If you change one of these structures, check that the pdumper.c
|
|
|
|
|
code is still valid, and update the pertinent hash in pdumper.c
|
|
|
|
|
by manually copying the hash from the newly-generated dmpstruct.h.])
|
|
|
|
|
fi
|
|
|
|
|
AC_SUBST([CHECK_STRUCTS])
|
2009-06-26 23:41:43 +00:00
|
|
|
|
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
|
2009-06-26 23:41:43 +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
|
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
|
2009-06-26 23:41:43 +00:00
|
|
|
|
|
2012-11-21 01:22:09 +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.
|
2017-11-26 06:45:41 +00:00
|
|
|
|
dnl https://lists.gnu.org/r/emacs-devel/2012-11/msg00393.html
|
2009-07-03 13:04:57 +00:00
|
|
|
|
AC_ARG_ENABLE(profiling,
|
2009-07-04 08:12:10 +00:00
|
|
|
|
[AS_HELP_STRING([--enable-profiling],
|
2012-11-21 01:22:09 +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.])],
|
2009-07-03 13:04:57 +00:00
|
|
|
|
[ac_enable_profiling="${enableval}"],[])
|
|
|
|
|
if test x$ac_enable_profiling != x ; then
|
|
|
|
|
PROFILING_CFLAGS="-DPROFILING=1 -pg"
|
|
|
|
|
else
|
|
|
|
|
PROFILING_CFLAGS=
|
|
|
|
|
fi
|
Properly handle C_WARNINGS_SWITCH, PROFILING_CFLAGS, PROFILING_LDFLAGS
* configure.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS)
(PROFILING_LDFLAGS): Substitute, don't add them to CFLAGS/LDFLAGS.
(C_OPTIMIZE_SWITCH): Remove.
(TEMACS_LDFLAGS2): Add ${PROFILING_LDFLAGS}.
* lib-src/Makefile.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS)
(PROFILING_LDFLAGS): Set from substitution.
(BASE_CFLAGS): Add ${C_WARNINGS_SWITCH}.
(ALL_CFLAGS, CPP_CFLAGS): Add ${PROFILING_CFLAGS}.
(LINK_CFLAGS): Add ${PROFILING_LDFLAGS}.
* lwlib/Makefile.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS): Set from
substitution.
(ALL_CFLAGS): Add ${C_WARNINGS_SWITCH} and ${PROFILING_CFLAGS}.
* oldXMenu/Makefile.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS): Set from
substitution.
(ALL_CFLAGS): Add ${C_WARNINGS_SWITCH} and ${PROFILING_CFLAGS}.
* src/Makefile.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS)
(PROFILING_LDFLAGS): Set from substitution.
(ALL_CFLAGS): Add C_WARNINGS_SWITCH and PROFILING_CFLAGS, put
CFLAGS last.
2010-07-12 14:16:38 +00:00
|
|
|
|
AC_SUBST(PROFILING_CFLAGS)
|
2009-07-03 13:04:57 +00:00
|
|
|
|
|
2009-11-14 15:17:38 +00:00
|
|
|
|
AC_ARG_ENABLE(autodepend,
|
|
|
|
|
[AS_HELP_STRING([--enable-autodepend],
|
|
|
|
|
[automatically generate dependencies to .h-files.
|
2015-04-19 21:40:51 +00:00
|
|
|
|
Requires gcc, enabled if found.])],
|
2009-11-14 15:17:38 +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}"],[])
|
|
|
|
|
|
2016-03-02 18:21:45 +00:00
|
|
|
|
BUILD_DETAILS=
|
|
|
|
|
AC_ARG_ENABLE([build-details],
|
|
|
|
|
[AS_HELP_STRING([--disable-build-details],
|
|
|
|
|
[Make the build more deterministic by omitting host
|
|
|
|
|
names, time stamps, etc. from the output.])],
|
|
|
|
|
[test "$enableval" = no && BUILD_DETAILS=--no-build-details])
|
|
|
|
|
AC_SUBST([BUILD_DETAILS])
|
2016-03-02 18:21:45 +00:00
|
|
|
|
|
2015-04-19 21:40:51 +00:00
|
|
|
|
dnl This used to use changequote, but, apart from 'changequote is evil'
|
2002-11-18 16:24:41 +00:00
|
|
|
|
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.
|
2003-07-20 23:38:20 +00:00
|
|
|
|
dnl
|
|
|
|
|
dnl Since Emacs can't find matching pairs of quotes, boundaries are
|
|
|
|
|
dnl indicated by comments.
|
|
|
|
|
dnl quotation begins
|
2002-11-18 16:24:41 +00:00
|
|
|
|
[
|
1994-08-26 14:57:46 +00:00
|
|
|
|
|
|
|
|
|
### 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.
|
|
|
|
|
|
1994-08-26 14:57:46 +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
|
1994-08-26 14:57:46 +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
|
|
|
|
|
;;
|
|
|
|
|
|
2001-11-29 12:06:35 +00:00
|
|
|
|
## FreeBSD ports
|
2008-07-16 07:01:36 +00:00
|
|
|
|
*-*-freebsd* )
|
2001-11-29 12:06:35 +00:00
|
|
|
|
opsys=freebsd
|
|
|
|
|
;;
|
|
|
|
|
|
2013-04-18 17:12:21 +00:00
|
|
|
|
## DragonFly ports
|
|
|
|
|
*-*-dragonfly* )
|
|
|
|
|
opsys=dragonfly
|
|
|
|
|
;;
|
|
|
|
|
|
2007-11-28 08:23:51 +00:00
|
|
|
|
## FreeBSD kernel + glibc based userland
|
|
|
|
|
*-*-kfreebsd*gnu* )
|
|
|
|
|
opsys=gnu-kfreebsd
|
|
|
|
|
;;
|
|
|
|
|
|
1994-08-26 14:57:46 +00:00
|
|
|
|
## NetBSD ports
|
|
|
|
|
*-*-netbsd* )
|
|
|
|
|
opsys=netbsd
|
|
|
|
|
;;
|
|
|
|
|
|
1997-09-06 19:42:31 +00:00
|
|
|
|
## OpenBSD ports
|
2014-04-29 14:49:11 +00:00
|
|
|
|
*-*-openbsd* | *-*-mirbsd* )
|
1997-09-06 19:42:31 +00:00
|
|
|
|
opsys=openbsd
|
|
|
|
|
;;
|
|
|
|
|
|
2016-11-06 07:33:43 +00:00
|
|
|
|
## Apple Darwin / macOS
|
2007-01-03 23:47:04 +00:00
|
|
|
|
*-apple-darwin* )
|
|
|
|
|
case "${canonical}" in
|
2014-10-15 17:42:05 +00:00
|
|
|
|
*-apple-darwin[0-9].*) unported=yes ;;
|
2020-09-14 10:34:56 +00:00
|
|
|
|
i[3456]86-* | x86_64-* | arm-* | aarch64-* ) ;;
|
2007-01-03 23:47:04 +00:00
|
|
|
|
* ) unported=yes ;;
|
|
|
|
|
esac
|
|
|
|
|
opsys=darwin
|
2016-03-07 16:22:37 +00:00
|
|
|
|
## FIXME: Find a way to use Fink if available (Bug#11507).
|
2007-01-03 23:47:04 +00:00
|
|
|
|
;;
|
|
|
|
|
|
2015-03-31 18:26:48 +00:00
|
|
|
|
## Chromium Native Client
|
|
|
|
|
*-nacl )
|
|
|
|
|
opsys=nacl
|
|
|
|
|
;;
|
|
|
|
|
|
2013-04-12 13:00:57 +00:00
|
|
|
|
## Cygwin ports
|
|
|
|
|
*-*-cygwin )
|
|
|
|
|
opsys=cygwin
|
|
|
|
|
;;
|
|
|
|
|
|
2007-03-23 02:56:27 +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
|
2007-03-23 02:56:27 +00:00
|
|
|
|
;;
|
|
|
|
|
hppa*-hp-hpux1[1-9]* )
|
2010-12-04 19:50:39 +00:00
|
|
|
|
opsys=hpux11
|
2007-03-23 02:56:27 +00:00
|
|
|
|
CFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CFLAGS"
|
|
|
|
|
;;
|
|
|
|
|
|
1994-08-26 14:57:46 +00:00
|
|
|
|
## IBM machines
|
2010-05-28 03:34:15 +00:00
|
|
|
|
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
|
1996-12-09 02:29:24 +00:00
|
|
|
|
;;
|
2010-05-28 03:34:15 +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
|
2007-03-22 14:32:22 +00:00
|
|
|
|
;;
|
2010-05-28 03:34:15 +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
|
2002-03-15 12:17:35 +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
|
2008-02-25 08:17:18 +00:00
|
|
|
|
;;
|
1994-08-26 14:57:46 +00:00
|
|
|
|
|
2020-08-06 00:36:50 +00:00
|
|
|
|
## Solaris
|
|
|
|
|
*-*-solaris* | *-*-sunos*)
|
1994-08-26 14:57:46 +00:00
|
|
|
|
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* ) ;;
|
1994-08-26 14:57:46 +00:00
|
|
|
|
* ) unported=yes ;;
|
|
|
|
|
esac
|
2020-08-06 00:36:50 +00:00
|
|
|
|
opsys=solaris
|
1996-01-16 22:54:10 +00:00
|
|
|
|
## Watch out for a compiler that we know will not work.
|
2020-08-06 00:36:50 +00:00
|
|
|
|
if [ "$CC" = /usr/ucb/cc ]; then
|
|
|
|
|
## /usr/ucb/cc doesn't work;
|
|
|
|
|
## we should find some other compiler that does work.
|
|
|
|
|
unset CC
|
|
|
|
|
fi
|
1994-08-26 14:57:46 +00:00
|
|
|
|
;;
|
|
|
|
|
|
2017-10-24 19:54:28 +00:00
|
|
|
|
## QNX Neutrino
|
|
|
|
|
*-nto-qnx* )
|
|
|
|
|
opsys=qnxnto
|
2017-11-30 23:22:46 +00:00
|
|
|
|
test -z "$CC" && CC=qcc
|
2020-09-10 22:01:06 +00:00
|
|
|
|
LDFLAGS="-N2M $LDFLAGS"
|
2017-10-24 19:54:28 +00:00
|
|
|
|
;;
|
|
|
|
|
|
2010-05-28 04:25:06 +00:00
|
|
|
|
## Intel 386 machines where we don't care about the manufacturer.
|
1996-06-22 03:44:21 +00:00
|
|
|
|
i[3456]86-*-* )
|
1994-08-26 14:57:46 +00:00
|
|
|
|
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
|
|
|
|
;;
|
2015-04-19 21:40:51 +00:00
|
|
|
|
*-sysv4.2uw* ) opsys=unixware ;;
|
|
|
|
|
*-sysv5uw* ) opsys=unixware ;;
|
|
|
|
|
*-sysv5OpenUNIX* ) opsys=unixware ;;
|
1994-08-26 14:57:46 +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
|
|
|
|
|
;;
|
|
|
|
|
|
1994-08-26 14:57:46 +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
|
|
|
|
|
|
2002-11-18 16:24:41 +00:00
|
|
|
|
]
|
2003-07-20 23:38:20 +00:00
|
|
|
|
dnl quotation ends
|
1994-08-26 14:57:46 +00:00
|
|
|
|
|
|
|
|
|
if test $unported = yes; then
|
2015-04-19 21:40:51 +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}.
|
2015-04-19 21:40:51 +00:00
|
|
|
|
Check 'etc/MACHINES' for recognized configuration names.])
|
1994-08-26 14:57:46 +00:00
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
#### Choose a compiler.
|
1995-08-05 23:01:11 +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])
|
|
|
|
|
|
2008-02-06 07:57:33 +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
|
|
|
|
|
|
Switch from Automake to GNU Make
Emacs assumes GNU Make, and GNU Make has much of the functionality of
Automake built-in. The Emacs build process uses Automake primarily
because Emacs uses some Gnulib code and Gnulib formerly required
Automake. Now that Gnulib no longer requires Automake, Emacs can
stop using Automake and this should simplify Emacs maintenance
in the future (Bug#26100). Although this patch may look long, most of
it is generated automatically: the changes to build-aux/config.guess,
build-aux/config.sub, build-aux/install-sh, and lib/gnulib.mk.in are
all done by admin/merge-gnulib.
* .gitignore: Remove build-aux/ar-lib, build-aux/compile,
build-aux/config.guess, build-aux/config.sub, build-aux/depcomp,
build-aux/install-sh, build-aux/missing, and lib/Makefile.in,
as they are no longer built by autogen.sh.
Add lib/gnulib.mk, as it is now built by 'configure'.
Remove nt/gnulib.mk, as it is no longer built by 'make'.
* INSTALL.REPO, README, admin/make-tarball.txt:
Remove mention of Automake.
* Makefile.in (AUTOCONF, AUTOMAKE, AUTOHEADER, ACLOCAL, lib)
(AUTOCONF_INPUTS, ACLOCAL_PATH, ACLOCAL_INPUTS)
($(srcdir)/aclocal.m4, AUTOMAKE_INPUTS)
($(srcdir)/lib/Makefile.in, $(srcdir)/nt/gnulib.mk, am--refresh):
Remove.
($(MAKEFILE_NAME)): Depend on lib/gnulib.mk.in.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in)
($(srcdir)/src/config.in):
Use autogen.sh instead of doing it by hand.
* admin/merge-gnulib (AVOIDED_MODULES, avoided_flags)):
New vars, to simplify processing of avoided modules.
(GNULIB_TOOL_FLAGS): Move --avoid flags into AVOIDED_MODULES.
Add --gnu-make, and change makefile name to gnulib.mk.in.
Copy config.guess, config.sub, and install-sh too, since
Automake no longer does that for us.
* admin/notes/copyright:
* admin/update_autogen (genfiles):
Update list of files.
Remove hack for nt/gnulib.mk, a file that is no longer needed.
* autogen.sh (progs): Remove Automake.
(automake_min): Remove.
Build aclocal.m4 so that autoreconf need not use aclocal.
* build-aux/config.guess, build-aux/config.sub:
* build-aux/install-sh:
New files, copied from Gnulib. These are now updated by
admin/merge-gnulib instead by autogen.sh.
* configure.ac (AC_PROG_MAKE_SET, ACLOCAL_PATH, AM_CONDITIONAL):
Remove.
(AM_INIT_AUTOMAKE, AM_SILENT_RULES): Remove call.
(AC_PROG_CC_C_O): Call this instead of AM_PROG_CC_C_O.
(BUILDING_FOR_WINDOWSNT, HYBRID_MALLOC_LIB): Remove; no longer needed.
(--disable-silent-rules): New option, since Automake no longer
does this for us.
(AM_V, AM_DEFAULT_V): Set unconditionally, and do not bother
with AM_SUBST_NOTMAKE.
(AC_PROG_INSTALL): Add call.
(MAKEINFO): Do not bother with the 'missing' program.
(MAKEINFO, SYSTEM_TYPE): AC_SUBST.
(AC_CONFIG_FILES): Add Makefile, lib/gnulib.mk.
(SUBDIR_MAKEFILES): Remove duplication.
* lib/Makefile.am: Remove, replacing with:
* lib/Makefile.in: New file, with the old Makefile.am contents
and with the following changes:
(AUTOMAKE_OPTIONS, BUILT_SOURCES, CLEANFILES, EXTRA_DIST)
(MOSTLYCLEANDIRS, MOSTLYCLEANFILES, noinst_LIBRARIES, SUFFIXES)
(AM_CFLAGS, DEFAULT_INCLUDES, libegnu_a_SOURCES, libegnu_a_LIBADD)
(EXTRA_libegnu_a_SOURCES, libegnu_a_SHORTNAME, libegnu_a_CPPFLAGS):
Remove.
(VPATH, abs_top_builddir, top_builddir, top_srcdir, all, AM_V_AR)
(AM_V_CC, AM_V_GEN, AM_V_at, DEPDIR, DEPFLAGS, MKDEPDIR, SYSTEM_TYPE)
(libgnu.a, libegnu.a, ETAGS, $(ETAGS), tags, TAGS, clean)
(mostlyclean, distclean, bootstrap-clean, maintainer-clean):
New macros and rules, since Automake no longer does them.
Include ../nt/gnulib-cfg.mk if SYSTEM_TYPE is windows-nt,
instead of including ../nt/gnulib.mk if BUILDING_FOR_WINDOWS_NT.
Include dependency files if AUTO_DEPEND.
(ALL_CFLAGS, AUTOCONF_INPUTS, libgnu_a_OBJECTS, libegnu_a_OBJECTS):
New macros.
(bootstrap-clean): Depend on distclean, not maintainer-clean,
and remove gnulib.mk.
(AUTOCONF_INPUTS, $(top_srcdir)/configure, ../config.status, Makefile):
New macros and rules, copied from ../Makefile.in.
($(libegnu_a_OBJECTS), $(libgnu_a_OBJECTS)): Depend on BUILT_SOURCES.
(.c.o, e-%.o): New generic rules.
* lib/gnulib.mk: Remove.
* lib/gnulib.mk.in: New file, which is built by autogen.sh
and contains much of what used to be in lib/gnulib.mk.
* m4/gnulib-common.m4: Copy from gnulib.
* make-dist: Do not distribute build-aux/compile, build-aux/depcomp,
build-aux/missing, build-aux/ar-lib, lib/Makefile.am, nt/gnulib.mk,
nt/gnulib-modules-to-delete.cfg. Distribute lib/Makefile.in,
lib/gnulib.mk.in, and nt/gnulib-cfg.mk instead.
* nt/Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0)
(am__v_GEN_1, ${srcdir}/gnulib.mk): Remove.
* nt/gnulib-cfg.mk: New file, which supersedes ...
* nt/gnulib-modules-to-delete.cfg: ... this file, which is removed.
* src/Makefile.in (ACLOCAL_INPUTS): Remove.
(AUTOCONF_INPUTS): Merge ACLOCAL_INPUTS into it.
($(top_srcdir)/configure, ../config.status, config.in Makefile):
Defer to parent Makefile.
2017-03-17 18:33:47 +00:00
|
|
|
|
AC_PROG_CC_C_O
|
2011-01-08 21:02:38 +00:00
|
|
|
|
|
2010-08-04 21:48:36 +00:00
|
|
|
|
if test x$GCC = xyes; then
|
|
|
|
|
test "x$GCC_TEST_OPTIONS" != x && CC="$CC $GCC_TEST_OPTIONS"
|
1996-01-05 23:12:03 +00:00
|
|
|
|
fi
|
1994-08-26 14:57:46 +00:00
|
|
|
|
|
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])
|
2015-03-19 21:14:07 +00:00
|
|
|
|
# Avoid gnulib's test for pthread_sigmask.
|
|
|
|
|
funcs=
|
|
|
|
|
for func in $ac_func_list; do
|
|
|
|
|
test $func = pthread_sigmask || AS_VAR_APPEND([funcs], [" $func"])
|
|
|
|
|
done
|
|
|
|
|
ac_func_list=$funcs
|
2017-01-01 10:33:29 +00:00
|
|
|
|
# Emacs does not use the wchar or wctype-h modules.
|
|
|
|
|
AC_DEFUN([gt_TYPE_WINT_T],
|
|
|
|
|
[GNULIB_OVERRIDES_WINT_T=0
|
|
|
|
|
AC_SUBST([GNULIB_OVERRIDES_WINT_T])])
|
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
|
2009-11-20 06:05:10 +00:00
|
|
|
|
|
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
|
|
|
|
|
|
2016-04-05 14:51:28 +00:00
|
|
|
|
# gl_GCC_VERSION_IFELSE([major], [minor], [run-if-found], [run-if-not-found])
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
# If $CPP is gcc-MAJOR.MINOR or newer, then run RUN-IF-FOUND.
|
|
|
|
|
# Otherwise, run RUN-IF-NOT-FOUND.
|
|
|
|
|
AC_DEFUN([gl_GCC_VERSION_IFELSE],
|
|
|
|
|
[AC_PREPROC_IFELSE(
|
|
|
|
|
[AC_LANG_PROGRAM(
|
|
|
|
|
[[
|
|
|
|
|
#if ($1) < __GNUC__ || (($1) == __GNUC__ && ($2) <= __GNUC_MINOR__)
|
|
|
|
|
/* ok */
|
|
|
|
|
#else
|
|
|
|
|
# error "your version of gcc is older than $1.$2"
|
|
|
|
|
#endif
|
|
|
|
|
]]),
|
|
|
|
|
], [$3], [$4])
|
|
|
|
|
]
|
|
|
|
|
)
|
|
|
|
|
|
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],
|
2016-04-05 14:51:28 +00:00
|
|
|
|
[AS_HELP_STRING([--enable-gcc-warnings@<:@=TYPE@:>@],
|
|
|
|
|
[control generation of GCC warnings. The TYPE 'yes'
|
|
|
|
|
means to fail if any warnings are issued; 'warn-only'
|
|
|
|
|
means issue warnings without failing (default for
|
|
|
|
|
developer builds); 'no' means disable warnings
|
|
|
|
|
(default for non-developer builds).])],
|
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
|
2016-04-05 14:51:28 +00:00
|
|
|
|
yes|no|warn-only) ;;
|
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_MSG_ERROR([bad value $enableval for gcc-warnings option]) ;;
|
|
|
|
|
esac
|
|
|
|
|
gl_gcc_warnings=$enableval],
|
2016-04-05 14:51:28 +00:00
|
|
|
|
[# By default, use 'warn-only' if it looks like the invoker of 'configure'
|
|
|
|
|
# is a developer as opposed to a builder. This is most likely true
|
2016-04-13 18:12:15 +00:00
|
|
|
|
# if GCC is recent enough and there is a .git directory or file;
|
2016-04-05 14:51:28 +00:00
|
|
|
|
# however, if there is also a .tarball-version file it is probably
|
2016-04-05 15:16:01 +00:00
|
|
|
|
# just a release imported into Git for patch management.
|
2016-04-05 14:51:28 +00:00
|
|
|
|
gl_gcc_warnings=no
|
2016-04-20 00:22:22 +00:00
|
|
|
|
if test -e "$srcdir"/.git && test ! -f "$srcdir"/.tarball-version; then
|
2017-05-02 21:52:21 +00:00
|
|
|
|
gl_GCC_VERSION_IFELSE([5], [3], [gl_gcc_warnings=warn-only])
|
|
|
|
|
fi])
|
|
|
|
|
|
|
|
|
|
AC_ARG_ENABLE([check-lisp-object-type],
|
|
|
|
|
[AS_HELP_STRING([--enable-check-lisp-object-type],
|
2017-12-18 02:43:14 +00:00
|
|
|
|
[Enable compile time checks for the Lisp_Object data type,
|
|
|
|
|
which can catch some bugs during development.])])
|
|
|
|
|
if test "$enable_check_lisp_object_type" = yes; then
|
2017-05-02 21:52:21 +00:00
|
|
|
|
AC_DEFINE([CHECK_LISP_OBJECT_TYPE], 1,
|
|
|
|
|
[Define to enable compile-time checks for the Lisp_Object data type.])
|
|
|
|
|
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
|
|
|
|
|
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
|
|
|
|
|
2017-06-15 20:29:04 +00:00
|
|
|
|
WERROR_CFLAGS=
|
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.
|
2016-04-05 14:51:28 +00:00
|
|
|
|
AS_IF([test $gl_gcc_warnings = no],
|
2016-03-15 20:47:47 +00:00
|
|
|
|
[
|
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
|
|
|
|
isystem='-I'
|
2016-03-15 20:47:47 +00:00
|
|
|
|
AS_IF([test "$emacs_cv_clang" = yes],
|
|
|
|
|
[
|
2013-09-23 07:12:01 +00:00
|
|
|
|
# Turn off some warnings if supported.
|
|
|
|
|
gl_WARN_ADD([-Wno-switch])
|
|
|
|
|
gl_WARN_ADD([-Wno-pointer-sign])
|
2014-10-06 06:21:13 +00:00
|
|
|
|
gl_WARN_ADD([-Wno-string-plus-int])
|
2015-04-03 20:05:23 +00:00
|
|
|
|
gl_WARN_ADD([-Wno-unknown-attributes])
|
2016-03-15 20:47:47 +00:00
|
|
|
|
])
|
|
|
|
|
],[
|
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
|
|
|
|
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"
|
|
|
|
|
;;
|
|
|
|
|
esac
|
2016-04-05 14:51:28 +00:00
|
|
|
|
AS_IF([test $gl_gcc_warnings = yes],
|
2020-07-09 23:35:48 +00:00
|
|
|
|
[WERROR_CFLAGS=-Werror],
|
|
|
|
|
[# Use -fanalyzer and related options only if --enable-gcc-warnings,
|
|
|
|
|
# as they slow GCC considerably.
|
|
|
|
|
nw="$nw -fanalyzer -Wno-analyzer-double-free -Wno-analyzer-malloc-leak"
|
2020-08-17 16:43:29 +00:00
|
|
|
|
nw="$nw -Wno-analyzer-null-dereference -Wno-analyzer-use-after-free"
|
|
|
|
|
# Use -Wsuggest-attribute=malloc only if --enable-gcc-warnings,
|
|
|
|
|
# as it doesn't flag code that is wrong in any way.
|
|
|
|
|
nw="$nw -Wsuggest-attribute=malloc"])
|
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
|
|
|
|
|
2020-07-09 23:35:48 +00:00
|
|
|
|
nw="$nw -Wcast-align=strict" # Emacs is tricky with pointers.
|
Merge with gnulib, pacifying GCC 7
This incorporates:
2017-05-16 manywarnings: update for GCC 7
2017-05-15 sys_select: Avoid "was expanded before it was required"
* configure.ac (nw): Suppress GCC 7’s new -Wduplicated-branches and
-Wformat-overflow=2 options, due to too many false alarms.
* doc/misc/texinfo.tex, lib/strftime.c, m4/manywarnings.m4:
Copy from gnulib.
* m4/gnulib-comp.m4: Regenerate.
* src/coding.c (decode_coding_iso_2022):
Fix bug uncovered by -Wimplicit-fallthrough.
* src/conf_post.h (FALLTHROUGH): New macro.
Use it to mark all switch cases that fall through.
* src/editfns.c (styled_format): Use !, not ~, on bool.
* src/gtkutil.c (xg_check_special_colors):
When using sprintf, don’t trust Gtk to output colors in [0, 1] range.
(xg_update_scrollbar_pos): Avoid use of possibly-uninitialized bool;
this bug was actually caught by Clang.
* src/search.c (boyer_moore):
Tell GCC that CHAR_BASE, if nonzero, must be a non-ASCII character.
* src/xterm.c (x_draw_glyphless_glyph_string_foreground):
Tell GCC that glyph->u.glyphless.ch must be a character.
2017-05-16 17:24:19 +00:00
|
|
|
|
nw="$nw -Wduplicated-branches" # Too many false alarms
|
|
|
|
|
nw="$nw -Wformat-overflow=2" # False alarms due to GCC bug 80776
|
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 -Wsystem-headers" # Don't let system headers trigger warnings
|
|
|
|
|
nw="$nw -Woverlength-strings" # Not a problem these days
|
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>.
|
Port --enable-gcc-warnings to GCC 6.1
* configure.ac (WERROR_CFLAGS): Omit -Wunused-const-variable=2.
* lib-src/etags.c (LOOKING_AT, LOOKING_AT_NOCASE):
Omit test whether pointer plus a constant equals a null pointer.
* src/alloc.c (compact_small_strings):
Avoid pointer arithmetic on null pointers.
* src/alloc.c (mark_face_cache):
* src/fontset.c (free_realized_fontsets, Fset_fontset_font):
* src/fringe.c (draw_fringe_bitmap_1)
(Fset_fringe_bitmap_face):
* src/macfont.m (macfont_draw):
* src/msdos.c (IT_set_face, IT_clear_screen):
* src/nsfont.m (nsfont_draw):
* src/nsterm.h (FRAME_DEFAULT_FACE):
* src/nsterm.m (ns_draw_window_cursor)
(ns_draw_vertical_window_border, ns_draw_window_divider)
(ns_dumpglyphs_box_or_relief)
(ns_maybe_dumpglyphs_background, ns_dumpglyphs_image)
(ns_dumpglyphs_stretch):
* src/w32term.c (w32_draw_vertical_window_border)
(w32_draw_window_divider, x_set_mouse_face_gc):
* src/xdisp.c (estimate_mode_line_height, init_iterator)
(handle_face_prop, handle_single_display_spec, pop_it)
(CHAR_COMPOSED_P, get_next_display_element)
(next_element_from_display_vector, extend_face_to_end_of_line)
(fill_gstring_glyph_string,BUILD_COMPOSITE_GLYPH_STRING):
* src/xfaces.c (Finternal_merge_in_global_face, Fface_font)
(lookup_named_face):
* src/xterm.c (x_draw_vertical_window_border)
(x_draw_window_divider, x_set_mouse_face_gc):
Prefer FACE_OPT_FROM_ID to FACE_FROM_ID when the result might be null.
* src/xterm.c (try_window_id):
Redo loop to convince GCC 6.1 that it is null pointer safe.
(x_color_cells):
Use eassume as necessary to pacify GCC 6.1.
* src/dispextern.h (FACE_FROM_ID, IMAGE_FROM_ID): Now returns non-null.
(FACE_OPT_FROM_ID, IMAGE_OPT_FROM_ID): New macro, with the old
behavior of the non-_OPT macro, to be used when the result
might be a null pointer.
* src/dispnew.c (buffer_posn_from_coords, marginal_area_string)
[HAVE_WINDOW_SYSTEM]:
* src/intervals.h (INTERVAL_WRITABLE_P):
* src/term.c (turn_off_face):
* src/xdisp.c (get_glyph_face_and_encoding, fill_image_glyph_string)
(produce_image_glyph, produce_xwidget_glyph):
* src/xfaces.c (lookup_named_face):
Remove unnecessary test for null pointer.
* src/keyboard.c (read_char): Suppress bogus -Wclobbered warning.
* src/process.c (would_block): New function.
(server_accept_connection, wait_reading_process_output, send_process):
Use it.
* src/xdisp.c (get_window_cursor_type, note_mouse_highlight):
Prefer IMAGE_OPT_FROM_ID to IMAGE_FROM_ID when the result
might be null.
2016-05-18 07:06:12 +00:00
|
|
|
|
nw="$nw -Wunused-const-variable=2" # lisp.h declares const objects.
|
2012-07-07 19:23:41 +00:00
|
|
|
|
nw="$nw -Winline" # OK to ignore 'inline'
|
2012-11-20 08:29:04 +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
|
2017-11-26 06:45:41 +00:00
|
|
|
|
# <https://lists.gnu.org/r/emacs-diffs/2011-11/msg00265.html>.
|
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 -Wshadow"
|
|
|
|
|
|
2012-12-26 05:41:42 +00:00
|
|
|
|
# Emacs's use of alloca inhibits protecting the stack.
|
|
|
|
|
nw="$nw -Wstack-protector"
|
|
|
|
|
|
Mark _Noreturn error functions as cold
On my platform this made ‘make compile-always’ 1.3% faster.
Suggested by Alex Gramiak in:
https://lists.gnu.org/r/emacs-devel/2019-04/msg00684.html
* configure.ac (nw): Don’t use -Wsuggest-attribute=cold.
* lib-src/make-docfile.c (write_globals):
Mark noreturn functions as cold.
* src/callproc.c (exec_failed):
* src/data.c (wrong_length_argument, wrong_type_argument):
* src/emacs-module.c (module_abort):
* src/emacs.c (terminate_due_to_signal):
* src/eval.c (unwind_to_catch):
* src/image.c (my_png_error, my_error_exit):
* src/json.c (json_out_of_memory, json_parse_error):
* src/keyboard.c (quit_throw_to_read_char, user_error):
* src/lisp.h (die, wrong_type_argument, wrong_choice)
(args_out_of_range, args_out_of_range_3, circular_list)
(buffer_overflow, memory_full, buffer_memory_full)
(string_overflow, xsignal, xsignal0, xsignal1, xsignal2)
(xsignal3, signal_error, overflow_error, error, verror)
(nsberror, report_file_errno, report_file_error)
(report_file_notify_error, terminate_due_to_signal)
(emacs_abort, fatal):
* src/lread.c (load_error_old_style_backquotes)
(end_of_file_error, invalid_syntax):
* src/pdumper.c (error_unsupported_dump_object):
* src/puresize.h (pure_write_error):
* src/search.c (matcher_overflow):
* src/sound.c (sound_perror, alsa_sound_perror):
* src/sysdep.c (handle_arith_signal):
* src/systime.h (time_overflow):
* src/term.c (maybe_fatal, vfatal):
* src/textprop.c (text_read_only):
* src/timefns.c (invalid_time_zone_specification)
(time_error, invalid_hz):
* src/xterm.c (x_connection_closed):
Use AVOID instead of _Noreturn void, so that it’s marked cold.
* src/conf_post.h (__has_attribute_cold) [!__has_attribute]:
New macro.
(ATTRIBUTE_COLD): New macro.
* src/frame.h (WINDOW_SYSTEM_RETURN): Add ATTRIBUTE_COLD.
* src/lisp.h (AVOID): New macro.
* src/xterm.c: Omit unnecessary static decls, so that we needn’t
worry about which functions should be marked cold.
(x_io_error_quitter): Mark as cold.
2019-04-18 07:30:24 +00:00
|
|
|
|
# Emacs's use of __attribute__ ((cold)) causes false alarms with this option.
|
|
|
|
|
nw="$nw -Wsuggest-attribute=cold"
|
|
|
|
|
|
2015-01-16 04:37:05 +00:00
|
|
|
|
# Emacs's use of partly-const functions such as Fgnutls_available_p
|
|
|
|
|
# make this option problematic.
|
|
|
|
|
nw="$nw -Wsuggest-attribute=const"
|
|
|
|
|
|
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"
|
|
|
|
|
|
2017-06-15 20:29:04 +00:00
|
|
|
|
if test "$emacs_cv_clang" = yes; then
|
2017-05-19 03:27:11 +00:00
|
|
|
|
nw="$nw -Wdouble-promotion"
|
2013-05-18 05:32:17 +00:00
|
|
|
|
fi
|
|
|
|
|
|
2020-07-09 23:35:48 +00:00
|
|
|
|
# This causes too much noise in the MinGW build.
|
Fix compiler warnings in the MinGW build
* configure.ac [mingw32]: Don't add -Wpointer-sign, and add
-Wno-pointer-sign, to keep the noise level down.
* nt/mingw-cfg.site (gl_cv_warn_c__Wredundant_decls): Disable
-Wredundant-decls, as that produces a lot of noise due to
redeclaration of time-related functions by gnulib.
* nt/runemacs.c (set_user_model_id): Fix argument type of
'SetCurrentProcessExplicitAppUserModelID'.
* src/image.c (x_create_bitmap_from_file) [HAVE_NTGUI]: Don't
declare 'dpyinfo', as it is unused.
(xpm_load): Fix warnings about pointer signedness.
* src/w32proc.c (IsValidLocale, init_winsock): Remove redundant
prototypes.
(sys_spawnve): Avoid warnings about discarding 'const' qualifier.
(sys_select): Provide prototype.
(g_b_init_compare_string_w): Move declaration to file scope.
* src/w32heap.c (dumped_data_commit): Now static.
(FREEABLE_P): Avoid warnings about pointer comparison with integer.
(mmap_realloc): Cast to 'char *' for arithmetics on void pointers.
* src/w32console.c (ctrl_c_handler, sys_tputs, sys_tgetstr)
(evalcost, cmputc, cmcheckmagic, cmcostinit, cmgoto, Wcm_clear):
Provide prototypes.
* src/w32.c (globals_of_w32, conv_sockaddr_to_lisp): Remove
redundant prototypes.
(w32_get_internal_run_time, map_w32_filename): Provide prototype.
(init_environment, sys_ctime): Avoid warnings about discarding
'const' qualifier.
Include utimens.h.
(sys_ctime, sys_chdir, sys_creat, sys_fopen, sys_mkdir)
(sys_open, sys_rename, sys_rmdir, is_slow_fs, term_winsock)
(sys_close, sys_dup2, sys_read, sys_write, sys_localtime): Provide
prototypes.
(sys_rename_replace): Use %d to avoid compiler warnings.
(_wsa_errlist): Make the message text 'const char *', to avoid
compilation warnings.
(dynlib_reset_last_error): Move prototype to file scope.
(w32_get_resource): First argument is now 'const char *'.
* src/w32uniscribe.c (syms_of_w32uniscribe): Provide prototype.
(otf_features): Second argument is no 'const char *'.
* src/w32term.c (free_frame_menubar, x_wm_set_size_hint)
(x_set_window_size): Remove redundant prototypes.
(XChangeGC, XGetGCValues, w32_draw_underwave)
(w32_draw_rectangle, w32_shift_glyphs_for_insert, x_mouse_leave)
(x_calc_absolute_position, x_destroy_window): Now static.
(menubar_selection_callback): Move prototype to file scope.
* src/w32font.c (g_b_init_get_glyph_outline_w): Remove redundant
declaration.
(w32_to_x_charset): Fix warnings about discarding 'const' qualifier.
(w32font_full_name): Fix warnings about implicit conversion of
'float' to 'double'.
* src/w32reg.c (w32_get_rdb_resource): Fix warnings about
discarding 'const' qualifier.
* src/w32menu.c (syms_of_w32menu, globals_of_w32menu)
(set_frame_menubar): Remove redundant prototypes.
(menubar_selection_callback, w32_menu_display_help): Provide
prototypes.
(simple_dialog_show): Avoid warnings about discarding 'const'
qualifier.
* src/w32fns.c (syms_of_w32fns, globals_of_w32fns)
(free_frame_menubar, w32_strerror, x_set_menu_bar_lines)
(x_set_tool_bar_lines, x_set_internal_border_width): Remove
redundant prototypes.
(current_popup_menu): Remove redundant declaration.
(colormap_t): Member 'name' is now 'const char *'.
(add_system_logical_colors_to_map): Fix signed/unsigned warnings.
(x_decode_color, x_set_border_pixel)
(x_clear_under_internal_border, x_set_name, hook_w32_key)
(reset_w32_kbdhook_state, deliver_wm_chars, w32_backtrace): Now
static.
(w32_load_cursor, w32_key_to_modifier, map_keypad_keys)
(w32_msg_worker, w32_last_error): Provide prototypes.
(funhook, lookup_vk_code): Avoid warnings about missing
parentheses.
(x_default_font_parameter, Fw32_notification_notify): Avoid
warnings about discarding 'const' qualifier.
(Fx_create_frame): Avoid warnings about empty body of 'else'.
(x_screen_planes): Ifdef away unused function.
(Fx_show_tip): Remove unused variables.
(Fw32_battery_status): Avoid warnings about implicit promotion
from float to double.
(Fw32_notification_notify): Initialize 'timeout'.
* src/profiler.c (profiler_cpu_running) [HAVE_ITIMERSPEC]: Only
define the TIMER_SETTIME_RUNNING value if it will be used.
* src/w32notify.c (send_notifications): Ifdef away an empty if
clause. Remove unused variable.
(watch_end, watch_completion): Provide prototypes.
* src/sound.c (sound_warning) [WINDOWSNT]: Don't define: unused.
* src/callproc.c (child_setup, getenv_internal_1) [WINDOWSNT]: Fix
warning with pointer signedness.
* src/gnutls.c (gnutls_x509_crt_get_signature)
(gnutls_alert_send_appropriate) [WINDOWSNT]: Don't define, and
don't load them from the GnuTLS library, as they are no longer
used.
* src/process.c (DATAGRAM_CHAN_P) [!DATAGRAM_SOCKETS]: Don't
define, as it's unused.
* src/unexw32.c (open_input_file, open_output_file)
(close_file_data): Remove redundant prototypes.
(_start): provide prototype.
(mainCRTStartup): Move prototype to file level.
(find_section): Use type-cast to shut up compiler warnings.
(offset_to_section, relocate_offset): Now static.
(find_section): First argument is now a 'const char *'.
(offset_to_section): Ifdef away, as it's unused.
* src/w32heap.h (find_section): Adjust prototype.
* src/dynlib.c (dynlib_reset_last_error): Provide prototype.
* src/dired.c (directory_files_internal_w32_unwind): Avoid
warnings about missing prototypes.
(is_slow_fs) [WINDOWSNT]: Provide prototype at file level.
(directory_files_internal) [WINDOWSNT]: Fix warnings about pointer
signedness.
* src/fileio.c (Ffile_writable_p, Ffile_regular_p) [WINDOWSNT]:
Fix warnings about pointer signedness.
* src/filelock.c (WTMP_FILE) [WINDOWSNT]: Don't define, it's
unused.
* src/sysdep.c (_getpid): Remove redundant prototype.
(sys_subshell) [DOS_NT]: Don't define 'status', it's unused.
[!MSDOS]: Don't define 'st', it's unused.
(init_sys_modes) [DOS_NT]: Don't define 'terminal', it's unused.
(str_collate) [WINDOWSNT]: Avoid warnings about pointer signedness.
* src/keyboard.c (tty_read_avail_input) [WINDOWSNT]: Don't define
n_to_read, as it is not used.
(MAX_ENCODED_BYTES) [WINDOWSNT]: Don't define, as it's unused.
* src/w32font.h (syms_of_w32font): Remove redundant prototype.
* src/xfaces.c (x_display_info) [HAVE_NTGUI]: Remove unused macro.
* src/term.c (init_tty) [DOS_NT]: Ifdef away variables that are
not used by DOS_NT builds, to avoid compiler warnings.
* src/menu.c (current_popup_menu) [HAVE_NTGUI]: Remove redundant
declaration.
* src/dispnew.c (init_display) [WINDOWSNT]: Use type-cast to shut
up compiler warnings.
* src/w32term.h (x_set_window_size, x_get_focus_frame)
(x_make_frame_visible, x_make_frame_invisible, x_iconify_frame)
(x_set_frame_alpha, x_activate_menubar, x_bitmap_icon)
(x_free_frame_resources, x_real_positions)
(display_x_get_resource): Remove redundant prototypes.
* lib-src/ntlib.c (sys_ctime, sys_fopen, sys_chdir, mkostemp)
(sys_rename, gettimeofday): Provide prototypes.
* lib-src/ntlib.h (getuid, geteuid, mkostemp): Remove redundant
declarations.
* lib-src/emacsclient.c (w32_getenv): Argument is now 'const char *'.
(xstrdup, w32_get_resource, w32_window_app, w32_execvp, ttyname)
(close_winsock, initialize_sockets, w32_set_user_model_id)
(w32_find_emacs_process, w32_give_focus) [WINDOWSNT]: Add
prototypes.
(w32_get_resource) [WINDOWSNT]: Fix a warning about signedness
difference.
(w32_set_user_model_id): Update prototype of
SetCurrentProcessExplicitAppUserModelID to avoid compiler
warnings.
(start_daemon_and_retry_set_socket) [WINDOWSNT]: Use type-cast to
shut up compiler warnings.
* lib-src/etags.c (MAXPATHLEN) [WINDOWSNT]: Remove unused macro.
2016-05-21 17:06:33 +00:00
|
|
|
|
if test $opsys = mingw32; then
|
2017-09-08 08:00:34 +00:00
|
|
|
|
nw="$nw -Wsuggest-attribute=format"
|
Fix compiler warnings in the MinGW build
* configure.ac [mingw32]: Don't add -Wpointer-sign, and add
-Wno-pointer-sign, to keep the noise level down.
* nt/mingw-cfg.site (gl_cv_warn_c__Wredundant_decls): Disable
-Wredundant-decls, as that produces a lot of noise due to
redeclaration of time-related functions by gnulib.
* nt/runemacs.c (set_user_model_id): Fix argument type of
'SetCurrentProcessExplicitAppUserModelID'.
* src/image.c (x_create_bitmap_from_file) [HAVE_NTGUI]: Don't
declare 'dpyinfo', as it is unused.
(xpm_load): Fix warnings about pointer signedness.
* src/w32proc.c (IsValidLocale, init_winsock): Remove redundant
prototypes.
(sys_spawnve): Avoid warnings about discarding 'const' qualifier.
(sys_select): Provide prototype.
(g_b_init_compare_string_w): Move declaration to file scope.
* src/w32heap.c (dumped_data_commit): Now static.
(FREEABLE_P): Avoid warnings about pointer comparison with integer.
(mmap_realloc): Cast to 'char *' for arithmetics on void pointers.
* src/w32console.c (ctrl_c_handler, sys_tputs, sys_tgetstr)
(evalcost, cmputc, cmcheckmagic, cmcostinit, cmgoto, Wcm_clear):
Provide prototypes.
* src/w32.c (globals_of_w32, conv_sockaddr_to_lisp): Remove
redundant prototypes.
(w32_get_internal_run_time, map_w32_filename): Provide prototype.
(init_environment, sys_ctime): Avoid warnings about discarding
'const' qualifier.
Include utimens.h.
(sys_ctime, sys_chdir, sys_creat, sys_fopen, sys_mkdir)
(sys_open, sys_rename, sys_rmdir, is_slow_fs, term_winsock)
(sys_close, sys_dup2, sys_read, sys_write, sys_localtime): Provide
prototypes.
(sys_rename_replace): Use %d to avoid compiler warnings.
(_wsa_errlist): Make the message text 'const char *', to avoid
compilation warnings.
(dynlib_reset_last_error): Move prototype to file scope.
(w32_get_resource): First argument is now 'const char *'.
* src/w32uniscribe.c (syms_of_w32uniscribe): Provide prototype.
(otf_features): Second argument is no 'const char *'.
* src/w32term.c (free_frame_menubar, x_wm_set_size_hint)
(x_set_window_size): Remove redundant prototypes.
(XChangeGC, XGetGCValues, w32_draw_underwave)
(w32_draw_rectangle, w32_shift_glyphs_for_insert, x_mouse_leave)
(x_calc_absolute_position, x_destroy_window): Now static.
(menubar_selection_callback): Move prototype to file scope.
* src/w32font.c (g_b_init_get_glyph_outline_w): Remove redundant
declaration.
(w32_to_x_charset): Fix warnings about discarding 'const' qualifier.
(w32font_full_name): Fix warnings about implicit conversion of
'float' to 'double'.
* src/w32reg.c (w32_get_rdb_resource): Fix warnings about
discarding 'const' qualifier.
* src/w32menu.c (syms_of_w32menu, globals_of_w32menu)
(set_frame_menubar): Remove redundant prototypes.
(menubar_selection_callback, w32_menu_display_help): Provide
prototypes.
(simple_dialog_show): Avoid warnings about discarding 'const'
qualifier.
* src/w32fns.c (syms_of_w32fns, globals_of_w32fns)
(free_frame_menubar, w32_strerror, x_set_menu_bar_lines)
(x_set_tool_bar_lines, x_set_internal_border_width): Remove
redundant prototypes.
(current_popup_menu): Remove redundant declaration.
(colormap_t): Member 'name' is now 'const char *'.
(add_system_logical_colors_to_map): Fix signed/unsigned warnings.
(x_decode_color, x_set_border_pixel)
(x_clear_under_internal_border, x_set_name, hook_w32_key)
(reset_w32_kbdhook_state, deliver_wm_chars, w32_backtrace): Now
static.
(w32_load_cursor, w32_key_to_modifier, map_keypad_keys)
(w32_msg_worker, w32_last_error): Provide prototypes.
(funhook, lookup_vk_code): Avoid warnings about missing
parentheses.
(x_default_font_parameter, Fw32_notification_notify): Avoid
warnings about discarding 'const' qualifier.
(Fx_create_frame): Avoid warnings about empty body of 'else'.
(x_screen_planes): Ifdef away unused function.
(Fx_show_tip): Remove unused variables.
(Fw32_battery_status): Avoid warnings about implicit promotion
from float to double.
(Fw32_notification_notify): Initialize 'timeout'.
* src/profiler.c (profiler_cpu_running) [HAVE_ITIMERSPEC]: Only
define the TIMER_SETTIME_RUNNING value if it will be used.
* src/w32notify.c (send_notifications): Ifdef away an empty if
clause. Remove unused variable.
(watch_end, watch_completion): Provide prototypes.
* src/sound.c (sound_warning) [WINDOWSNT]: Don't define: unused.
* src/callproc.c (child_setup, getenv_internal_1) [WINDOWSNT]: Fix
warning with pointer signedness.
* src/gnutls.c (gnutls_x509_crt_get_signature)
(gnutls_alert_send_appropriate) [WINDOWSNT]: Don't define, and
don't load them from the GnuTLS library, as they are no longer
used.
* src/process.c (DATAGRAM_CHAN_P) [!DATAGRAM_SOCKETS]: Don't
define, as it's unused.
* src/unexw32.c (open_input_file, open_output_file)
(close_file_data): Remove redundant prototypes.
(_start): provide prototype.
(mainCRTStartup): Move prototype to file level.
(find_section): Use type-cast to shut up compiler warnings.
(offset_to_section, relocate_offset): Now static.
(find_section): First argument is now a 'const char *'.
(offset_to_section): Ifdef away, as it's unused.
* src/w32heap.h (find_section): Adjust prototype.
* src/dynlib.c (dynlib_reset_last_error): Provide prototype.
* src/dired.c (directory_files_internal_w32_unwind): Avoid
warnings about missing prototypes.
(is_slow_fs) [WINDOWSNT]: Provide prototype at file level.
(directory_files_internal) [WINDOWSNT]: Fix warnings about pointer
signedness.
* src/fileio.c (Ffile_writable_p, Ffile_regular_p) [WINDOWSNT]:
Fix warnings about pointer signedness.
* src/filelock.c (WTMP_FILE) [WINDOWSNT]: Don't define, it's
unused.
* src/sysdep.c (_getpid): Remove redundant prototype.
(sys_subshell) [DOS_NT]: Don't define 'status', it's unused.
[!MSDOS]: Don't define 'st', it's unused.
(init_sys_modes) [DOS_NT]: Don't define 'terminal', it's unused.
(str_collate) [WINDOWSNT]: Avoid warnings about pointer signedness.
* src/keyboard.c (tty_read_avail_input) [WINDOWSNT]: Don't define
n_to_read, as it is not used.
(MAX_ENCODED_BYTES) [WINDOWSNT]: Don't define, as it's unused.
* src/w32font.h (syms_of_w32font): Remove redundant prototype.
* src/xfaces.c (x_display_info) [HAVE_NTGUI]: Remove unused macro.
* src/term.c (init_tty) [DOS_NT]: Ifdef away variables that are
not used by DOS_NT builds, to avoid compiler warnings.
* src/menu.c (current_popup_menu) [HAVE_NTGUI]: Remove redundant
declaration.
* src/dispnew.c (init_display) [WINDOWSNT]: Use type-cast to shut
up compiler warnings.
* src/w32term.h (x_set_window_size, x_get_focus_frame)
(x_make_frame_visible, x_make_frame_invisible, x_iconify_frame)
(x_set_frame_alpha, x_activate_menubar, x_bitmap_icon)
(x_free_frame_resources, x_real_positions)
(display_x_get_resource): Remove redundant prototypes.
* lib-src/ntlib.c (sys_ctime, sys_fopen, sys_chdir, mkostemp)
(sys_rename, gettimeofday): Provide prototypes.
* lib-src/ntlib.h (getuid, geteuid, mkostemp): Remove redundant
declarations.
* lib-src/emacsclient.c (w32_getenv): Argument is now 'const char *'.
(xstrdup, w32_get_resource, w32_window_app, w32_execvp, ttyname)
(close_winsock, initialize_sockets, w32_set_user_model_id)
(w32_find_emacs_process, w32_give_focus) [WINDOWSNT]: Add
prototypes.
(w32_get_resource) [WINDOWSNT]: Fix a warning about signedness
difference.
(w32_set_user_model_id): Update prototype of
SetCurrentProcessExplicitAppUserModelID to avoid compiler
warnings.
(start_daemon_and_retry_set_socket) [WINDOWSNT]: Use type-cast to
shut up compiler warnings.
* lib-src/etags.c (MAXPATHLEN) [WINDOWSNT]: Remove unused macro.
2016-05-21 17:06:33 +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
|
|
|
|
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
|
2017-07-06 00:14:50 +00:00
|
|
|
|
gl_WARN_ADD([-Wno-override-init]) # More trouble than it is worth
|
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-sign-compare]) # Too many warnings for now
|
|
|
|
|
gl_WARN_ADD([-Wno-type-limits]) # Too many warnings for now
|
|
|
|
|
gl_WARN_ADD([-Wno-unused-parameter]) # Too many warnings for now
|
|
|
|
|
gl_WARN_ADD([-Wno-format-nonliteral])
|
2010-08-06 11:28:59 +00:00
|
|
|
|
|
2018-10-09 18:16:00 +00:00
|
|
|
|
# clang is unduly picky about some things.
|
2017-06-15 20:29:04 +00:00
|
|
|
|
if test "$emacs_cv_clang" = yes; then
|
2017-05-23 19:18:35 +00:00
|
|
|
|
gl_WARN_ADD([-Wno-missing-braces])
|
2018-10-09 18:16:00 +00:00
|
|
|
|
gl_WARN_ADD([-Wno-null-pointer-arithmetic])
|
2013-05-18 05:32:17 +00:00
|
|
|
|
fi
|
|
|
|
|
|
Fix compiler warnings in the MinGW build
* configure.ac [mingw32]: Don't add -Wpointer-sign, and add
-Wno-pointer-sign, to keep the noise level down.
* nt/mingw-cfg.site (gl_cv_warn_c__Wredundant_decls): Disable
-Wredundant-decls, as that produces a lot of noise due to
redeclaration of time-related functions by gnulib.
* nt/runemacs.c (set_user_model_id): Fix argument type of
'SetCurrentProcessExplicitAppUserModelID'.
* src/image.c (x_create_bitmap_from_file) [HAVE_NTGUI]: Don't
declare 'dpyinfo', as it is unused.
(xpm_load): Fix warnings about pointer signedness.
* src/w32proc.c (IsValidLocale, init_winsock): Remove redundant
prototypes.
(sys_spawnve): Avoid warnings about discarding 'const' qualifier.
(sys_select): Provide prototype.
(g_b_init_compare_string_w): Move declaration to file scope.
* src/w32heap.c (dumped_data_commit): Now static.
(FREEABLE_P): Avoid warnings about pointer comparison with integer.
(mmap_realloc): Cast to 'char *' for arithmetics on void pointers.
* src/w32console.c (ctrl_c_handler, sys_tputs, sys_tgetstr)
(evalcost, cmputc, cmcheckmagic, cmcostinit, cmgoto, Wcm_clear):
Provide prototypes.
* src/w32.c (globals_of_w32, conv_sockaddr_to_lisp): Remove
redundant prototypes.
(w32_get_internal_run_time, map_w32_filename): Provide prototype.
(init_environment, sys_ctime): Avoid warnings about discarding
'const' qualifier.
Include utimens.h.
(sys_ctime, sys_chdir, sys_creat, sys_fopen, sys_mkdir)
(sys_open, sys_rename, sys_rmdir, is_slow_fs, term_winsock)
(sys_close, sys_dup2, sys_read, sys_write, sys_localtime): Provide
prototypes.
(sys_rename_replace): Use %d to avoid compiler warnings.
(_wsa_errlist): Make the message text 'const char *', to avoid
compilation warnings.
(dynlib_reset_last_error): Move prototype to file scope.
(w32_get_resource): First argument is now 'const char *'.
* src/w32uniscribe.c (syms_of_w32uniscribe): Provide prototype.
(otf_features): Second argument is no 'const char *'.
* src/w32term.c (free_frame_menubar, x_wm_set_size_hint)
(x_set_window_size): Remove redundant prototypes.
(XChangeGC, XGetGCValues, w32_draw_underwave)
(w32_draw_rectangle, w32_shift_glyphs_for_insert, x_mouse_leave)
(x_calc_absolute_position, x_destroy_window): Now static.
(menubar_selection_callback): Move prototype to file scope.
* src/w32font.c (g_b_init_get_glyph_outline_w): Remove redundant
declaration.
(w32_to_x_charset): Fix warnings about discarding 'const' qualifier.
(w32font_full_name): Fix warnings about implicit conversion of
'float' to 'double'.
* src/w32reg.c (w32_get_rdb_resource): Fix warnings about
discarding 'const' qualifier.
* src/w32menu.c (syms_of_w32menu, globals_of_w32menu)
(set_frame_menubar): Remove redundant prototypes.
(menubar_selection_callback, w32_menu_display_help): Provide
prototypes.
(simple_dialog_show): Avoid warnings about discarding 'const'
qualifier.
* src/w32fns.c (syms_of_w32fns, globals_of_w32fns)
(free_frame_menubar, w32_strerror, x_set_menu_bar_lines)
(x_set_tool_bar_lines, x_set_internal_border_width): Remove
redundant prototypes.
(current_popup_menu): Remove redundant declaration.
(colormap_t): Member 'name' is now 'const char *'.
(add_system_logical_colors_to_map): Fix signed/unsigned warnings.
(x_decode_color, x_set_border_pixel)
(x_clear_under_internal_border, x_set_name, hook_w32_key)
(reset_w32_kbdhook_state, deliver_wm_chars, w32_backtrace): Now
static.
(w32_load_cursor, w32_key_to_modifier, map_keypad_keys)
(w32_msg_worker, w32_last_error): Provide prototypes.
(funhook, lookup_vk_code): Avoid warnings about missing
parentheses.
(x_default_font_parameter, Fw32_notification_notify): Avoid
warnings about discarding 'const' qualifier.
(Fx_create_frame): Avoid warnings about empty body of 'else'.
(x_screen_planes): Ifdef away unused function.
(Fx_show_tip): Remove unused variables.
(Fw32_battery_status): Avoid warnings about implicit promotion
from float to double.
(Fw32_notification_notify): Initialize 'timeout'.
* src/profiler.c (profiler_cpu_running) [HAVE_ITIMERSPEC]: Only
define the TIMER_SETTIME_RUNNING value if it will be used.
* src/w32notify.c (send_notifications): Ifdef away an empty if
clause. Remove unused variable.
(watch_end, watch_completion): Provide prototypes.
* src/sound.c (sound_warning) [WINDOWSNT]: Don't define: unused.
* src/callproc.c (child_setup, getenv_internal_1) [WINDOWSNT]: Fix
warning with pointer signedness.
* src/gnutls.c (gnutls_x509_crt_get_signature)
(gnutls_alert_send_appropriate) [WINDOWSNT]: Don't define, and
don't load them from the GnuTLS library, as they are no longer
used.
* src/process.c (DATAGRAM_CHAN_P) [!DATAGRAM_SOCKETS]: Don't
define, as it's unused.
* src/unexw32.c (open_input_file, open_output_file)
(close_file_data): Remove redundant prototypes.
(_start): provide prototype.
(mainCRTStartup): Move prototype to file level.
(find_section): Use type-cast to shut up compiler warnings.
(offset_to_section, relocate_offset): Now static.
(find_section): First argument is now a 'const char *'.
(offset_to_section): Ifdef away, as it's unused.
* src/w32heap.h (find_section): Adjust prototype.
* src/dynlib.c (dynlib_reset_last_error): Provide prototype.
* src/dired.c (directory_files_internal_w32_unwind): Avoid
warnings about missing prototypes.
(is_slow_fs) [WINDOWSNT]: Provide prototype at file level.
(directory_files_internal) [WINDOWSNT]: Fix warnings about pointer
signedness.
* src/fileio.c (Ffile_writable_p, Ffile_regular_p) [WINDOWSNT]:
Fix warnings about pointer signedness.
* src/filelock.c (WTMP_FILE) [WINDOWSNT]: Don't define, it's
unused.
* src/sysdep.c (_getpid): Remove redundant prototype.
(sys_subshell) [DOS_NT]: Don't define 'status', it's unused.
[!MSDOS]: Don't define 'st', it's unused.
(init_sys_modes) [DOS_NT]: Don't define 'terminal', it's unused.
(str_collate) [WINDOWSNT]: Avoid warnings about pointer signedness.
* src/keyboard.c (tty_read_avail_input) [WINDOWSNT]: Don't define
n_to_read, as it is not used.
(MAX_ENCODED_BYTES) [WINDOWSNT]: Don't define, as it's unused.
* src/w32font.h (syms_of_w32font): Remove redundant prototype.
* src/xfaces.c (x_display_info) [HAVE_NTGUI]: Remove unused macro.
* src/term.c (init_tty) [DOS_NT]: Ifdef away variables that are
not used by DOS_NT builds, to avoid compiler warnings.
* src/menu.c (current_popup_menu) [HAVE_NTGUI]: Remove redundant
declaration.
* src/dispnew.c (init_display) [WINDOWSNT]: Use type-cast to shut
up compiler warnings.
* src/w32term.h (x_set_window_size, x_get_focus_frame)
(x_make_frame_visible, x_make_frame_invisible, x_iconify_frame)
(x_set_frame_alpha, x_activate_menubar, x_bitmap_icon)
(x_free_frame_resources, x_real_positions)
(display_x_get_resource): Remove redundant prototypes.
* lib-src/ntlib.c (sys_ctime, sys_fopen, sys_chdir, mkostemp)
(sys_rename, gettimeofday): Provide prototypes.
* lib-src/ntlib.h (getuid, geteuid, mkostemp): Remove redundant
declarations.
* lib-src/emacsclient.c (w32_getenv): Argument is now 'const char *'.
(xstrdup, w32_get_resource, w32_window_app, w32_execvp, ttyname)
(close_winsock, initialize_sockets, w32_set_user_model_id)
(w32_find_emacs_process, w32_give_focus) [WINDOWSNT]: Add
prototypes.
(w32_get_resource) [WINDOWSNT]: Fix a warning about signedness
difference.
(w32_set_user_model_id): Update prototype of
SetCurrentProcessExplicitAppUserModelID to avoid compiler
warnings.
(start_daemon_and_retry_set_socket) [WINDOWSNT]: Use type-cast to
shut up compiler warnings.
* lib-src/etags.c (MAXPATHLEN) [WINDOWSNT]: Remove unused macro.
2016-05-21 17:06:33 +00:00
|
|
|
|
# This causes too much noise in the MinGW build
|
|
|
|
|
if test $opsys = mingw32; then
|
|
|
|
|
gl_WARN_ADD([-Wno-pointer-sign])
|
|
|
|
|
fi
|
|
|
|
|
|
2016-05-30 23:09:25 +00:00
|
|
|
|
AC_DEFINE([GCC_LINT], [1], [Define to 1 if --enable-gcc-warnings.])
|
2019-10-22 00:28:02 +00:00
|
|
|
|
AS_IF([test $gl_gcc_warnings = yes],
|
|
|
|
|
[AC_DEFINE([GNULIB_PORTCHECK], [1], [enable some gnulib portability checks])
|
|
|
|
|
AH_VERBATIM([GNULIB_PORTCHECK_FORTIFY_SOURCE],
|
|
|
|
|
[/* Enable compile-time and run-time bounds-checking, and some warnings,
|
|
|
|
|
without upsetting glibc 2.15+. */
|
|
|
|
|
#if (defined GNULIB_PORTCHECK && !defined _FORTIFY_SOURCE \
|
|
|
|
|
&& defined __OPTIMIZE__ && __OPTIMIZE__)
|
|
|
|
|
# define _FORTIFY_SOURCE 2
|
|
|
|
|
#endif
|
|
|
|
|
])])
|
2017-06-15 20:29:04 +00:00
|
|
|
|
])
|
2010-07-08 23:34:47 +00:00
|
|
|
|
|
2017-07-06 00:14:50 +00:00
|
|
|
|
# clang is picky about these regardless of whether
|
2017-06-15 20:29:04 +00:00
|
|
|
|
# --enable-gcc-warnings is specified.
|
|
|
|
|
if test "$emacs_cv_clang" = yes; then
|
2017-07-06 00:14:50 +00:00
|
|
|
|
gl_WARN_ADD([-Wno-initializer-overrides])
|
2017-06-15 20:29:04 +00:00
|
|
|
|
gl_WARN_ADD([-Wno-tautological-compare])
|
|
|
|
|
gl_WARN_ADD([-Wno-tautological-constant-out-of-range-compare])
|
|
|
|
|
fi
|
1994-08-26 14:57:46 +00:00
|
|
|
|
|
2017-06-15 20:29:04 +00:00
|
|
|
|
# Use a slightly smaller set of warning options for lib/.
|
|
|
|
|
nw=
|
|
|
|
|
nw="$nw -Wunused-macros"
|
|
|
|
|
gl_MANYWARN_COMPLEMENT([GNULIB_WARN_CFLAGS], [$WARN_CFLAGS], [$nw])
|
|
|
|
|
|
|
|
|
|
AC_SUBST([WERROR_CFLAGS])
|
|
|
|
|
AC_SUBST([GNULIB_WARN_CFLAGS])
|
2010-04-28 06:43:38 +00:00
|
|
|
|
|
2014-05-03 08:12:06 +00:00
|
|
|
|
edit_cflags="
|
|
|
|
|
s,///*,/,g
|
|
|
|
|
s/^/ /
|
|
|
|
|
s/ -I/ $isystem/g
|
|
|
|
|
s/^ //
|
|
|
|
|
"
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
2014-05-13 11:12:05 +00:00
|
|
|
|
AC_ARG_ENABLE(link-time-optimization,
|
|
|
|
|
[AS_HELP_STRING([--enable-link-time-optimization],
|
2017-08-29 21:52:57 +00:00
|
|
|
|
[build with link-time optimization
|
2017-08-30 01:56:36 +00:00
|
|
|
|
(experimental; see INSTALL)])],
|
2014-05-13 11:12:05 +00:00
|
|
|
|
if test "${enableval}" != "no"; then
|
|
|
|
|
ac_lto_supported=no
|
2017-06-15 20:29:04 +00:00
|
|
|
|
if test "$emacs_cv_clang" = yes; then
|
2014-05-13 11:12:05 +00:00
|
|
|
|
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"
|
2017-06-15 20:29:04 +00:00
|
|
|
|
if test "$emacs_cv_clang" = yes; then
|
2014-05-13 11:12:05 +00:00
|
|
|
|
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
|
|
|
|
|
Switch from Automake to GNU Make
Emacs assumes GNU Make, and GNU Make has much of the functionality of
Automake built-in. The Emacs build process uses Automake primarily
because Emacs uses some Gnulib code and Gnulib formerly required
Automake. Now that Gnulib no longer requires Automake, Emacs can
stop using Automake and this should simplify Emacs maintenance
in the future (Bug#26100). Although this patch may look long, most of
it is generated automatically: the changes to build-aux/config.guess,
build-aux/config.sub, build-aux/install-sh, and lib/gnulib.mk.in are
all done by admin/merge-gnulib.
* .gitignore: Remove build-aux/ar-lib, build-aux/compile,
build-aux/config.guess, build-aux/config.sub, build-aux/depcomp,
build-aux/install-sh, build-aux/missing, and lib/Makefile.in,
as they are no longer built by autogen.sh.
Add lib/gnulib.mk, as it is now built by 'configure'.
Remove nt/gnulib.mk, as it is no longer built by 'make'.
* INSTALL.REPO, README, admin/make-tarball.txt:
Remove mention of Automake.
* Makefile.in (AUTOCONF, AUTOMAKE, AUTOHEADER, ACLOCAL, lib)
(AUTOCONF_INPUTS, ACLOCAL_PATH, ACLOCAL_INPUTS)
($(srcdir)/aclocal.m4, AUTOMAKE_INPUTS)
($(srcdir)/lib/Makefile.in, $(srcdir)/nt/gnulib.mk, am--refresh):
Remove.
($(MAKEFILE_NAME)): Depend on lib/gnulib.mk.in.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in)
($(srcdir)/src/config.in):
Use autogen.sh instead of doing it by hand.
* admin/merge-gnulib (AVOIDED_MODULES, avoided_flags)):
New vars, to simplify processing of avoided modules.
(GNULIB_TOOL_FLAGS): Move --avoid flags into AVOIDED_MODULES.
Add --gnu-make, and change makefile name to gnulib.mk.in.
Copy config.guess, config.sub, and install-sh too, since
Automake no longer does that for us.
* admin/notes/copyright:
* admin/update_autogen (genfiles):
Update list of files.
Remove hack for nt/gnulib.mk, a file that is no longer needed.
* autogen.sh (progs): Remove Automake.
(automake_min): Remove.
Build aclocal.m4 so that autoreconf need not use aclocal.
* build-aux/config.guess, build-aux/config.sub:
* build-aux/install-sh:
New files, copied from Gnulib. These are now updated by
admin/merge-gnulib instead by autogen.sh.
* configure.ac (AC_PROG_MAKE_SET, ACLOCAL_PATH, AM_CONDITIONAL):
Remove.
(AM_INIT_AUTOMAKE, AM_SILENT_RULES): Remove call.
(AC_PROG_CC_C_O): Call this instead of AM_PROG_CC_C_O.
(BUILDING_FOR_WINDOWSNT, HYBRID_MALLOC_LIB): Remove; no longer needed.
(--disable-silent-rules): New option, since Automake no longer
does this for us.
(AM_V, AM_DEFAULT_V): Set unconditionally, and do not bother
with AM_SUBST_NOTMAKE.
(AC_PROG_INSTALL): Add call.
(MAKEINFO): Do not bother with the 'missing' program.
(MAKEINFO, SYSTEM_TYPE): AC_SUBST.
(AC_CONFIG_FILES): Add Makefile, lib/gnulib.mk.
(SUBDIR_MAKEFILES): Remove duplication.
* lib/Makefile.am: Remove, replacing with:
* lib/Makefile.in: New file, with the old Makefile.am contents
and with the following changes:
(AUTOMAKE_OPTIONS, BUILT_SOURCES, CLEANFILES, EXTRA_DIST)
(MOSTLYCLEANDIRS, MOSTLYCLEANFILES, noinst_LIBRARIES, SUFFIXES)
(AM_CFLAGS, DEFAULT_INCLUDES, libegnu_a_SOURCES, libegnu_a_LIBADD)
(EXTRA_libegnu_a_SOURCES, libegnu_a_SHORTNAME, libegnu_a_CPPFLAGS):
Remove.
(VPATH, abs_top_builddir, top_builddir, top_srcdir, all, AM_V_AR)
(AM_V_CC, AM_V_GEN, AM_V_at, DEPDIR, DEPFLAGS, MKDEPDIR, SYSTEM_TYPE)
(libgnu.a, libegnu.a, ETAGS, $(ETAGS), tags, TAGS, clean)
(mostlyclean, distclean, bootstrap-clean, maintainer-clean):
New macros and rules, since Automake no longer does them.
Include ../nt/gnulib-cfg.mk if SYSTEM_TYPE is windows-nt,
instead of including ../nt/gnulib.mk if BUILDING_FOR_WINDOWS_NT.
Include dependency files if AUTO_DEPEND.
(ALL_CFLAGS, AUTOCONF_INPUTS, libgnu_a_OBJECTS, libegnu_a_OBJECTS):
New macros.
(bootstrap-clean): Depend on distclean, not maintainer-clean,
and remove gnulib.mk.
(AUTOCONF_INPUTS, $(top_srcdir)/configure, ../config.status, Makefile):
New macros and rules, copied from ../Makefile.in.
($(libegnu_a_OBJECTS), $(libgnu_a_OBJECTS)): Depend on BUILT_SOURCES.
(.c.o, e-%.o): New generic rules.
* lib/gnulib.mk: Remove.
* lib/gnulib.mk.in: New file, which is built by autogen.sh
and contains much of what used to be in lib/gnulib.mk.
* m4/gnulib-common.m4: Copy from gnulib.
* make-dist: Do not distribute build-aux/compile, build-aux/depcomp,
build-aux/missing, build-aux/ar-lib, lib/Makefile.am, nt/gnulib.mk,
nt/gnulib-modules-to-delete.cfg. Distribute lib/Makefile.in,
lib/gnulib.mk.in, and nt/gnulib-cfg.mk instead.
* nt/Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0)
(am__v_GEN_1, ${srcdir}/gnulib.mk): Remove.
* nt/gnulib-cfg.mk: New file, which supersedes ...
* nt/gnulib-modules-to-delete.cfg: ... this file, which is removed.
* src/Makefile.in (ACLOCAL_INPUTS): Remove.
(AUTOCONF_INPUTS): Merge ACLOCAL_INPUTS into it.
($(top_srcdir)/configure, ../config.status, config.in Makefile):
Defer to parent Makefile.
2017-03-17 18:33:47 +00:00
|
|
|
|
|
|
|
|
|
dnl Automake replacements.
|
|
|
|
|
AC_DEFUN([AM_CONDITIONAL],
|
|
|
|
|
[$2 && $1=1 || $1=
|
|
|
|
|
AC_SUBST([$1])])
|
|
|
|
|
|
2015-01-11 09:18:15 +00:00
|
|
|
|
dnl Prefer silent make output. For verbose output, use
|
|
|
|
|
dnl 'configure --disable-silent-rules' or 'make V=1' .
|
Switch from Automake to GNU Make
Emacs assumes GNU Make, and GNU Make has much of the functionality of
Automake built-in. The Emacs build process uses Automake primarily
because Emacs uses some Gnulib code and Gnulib formerly required
Automake. Now that Gnulib no longer requires Automake, Emacs can
stop using Automake and this should simplify Emacs maintenance
in the future (Bug#26100). Although this patch may look long, most of
it is generated automatically: the changes to build-aux/config.guess,
build-aux/config.sub, build-aux/install-sh, and lib/gnulib.mk.in are
all done by admin/merge-gnulib.
* .gitignore: Remove build-aux/ar-lib, build-aux/compile,
build-aux/config.guess, build-aux/config.sub, build-aux/depcomp,
build-aux/install-sh, build-aux/missing, and lib/Makefile.in,
as they are no longer built by autogen.sh.
Add lib/gnulib.mk, as it is now built by 'configure'.
Remove nt/gnulib.mk, as it is no longer built by 'make'.
* INSTALL.REPO, README, admin/make-tarball.txt:
Remove mention of Automake.
* Makefile.in (AUTOCONF, AUTOMAKE, AUTOHEADER, ACLOCAL, lib)
(AUTOCONF_INPUTS, ACLOCAL_PATH, ACLOCAL_INPUTS)
($(srcdir)/aclocal.m4, AUTOMAKE_INPUTS)
($(srcdir)/lib/Makefile.in, $(srcdir)/nt/gnulib.mk, am--refresh):
Remove.
($(MAKEFILE_NAME)): Depend on lib/gnulib.mk.in.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in)
($(srcdir)/src/config.in):
Use autogen.sh instead of doing it by hand.
* admin/merge-gnulib (AVOIDED_MODULES, avoided_flags)):
New vars, to simplify processing of avoided modules.
(GNULIB_TOOL_FLAGS): Move --avoid flags into AVOIDED_MODULES.
Add --gnu-make, and change makefile name to gnulib.mk.in.
Copy config.guess, config.sub, and install-sh too, since
Automake no longer does that for us.
* admin/notes/copyright:
* admin/update_autogen (genfiles):
Update list of files.
Remove hack for nt/gnulib.mk, a file that is no longer needed.
* autogen.sh (progs): Remove Automake.
(automake_min): Remove.
Build aclocal.m4 so that autoreconf need not use aclocal.
* build-aux/config.guess, build-aux/config.sub:
* build-aux/install-sh:
New files, copied from Gnulib. These are now updated by
admin/merge-gnulib instead by autogen.sh.
* configure.ac (AC_PROG_MAKE_SET, ACLOCAL_PATH, AM_CONDITIONAL):
Remove.
(AM_INIT_AUTOMAKE, AM_SILENT_RULES): Remove call.
(AC_PROG_CC_C_O): Call this instead of AM_PROG_CC_C_O.
(BUILDING_FOR_WINDOWSNT, HYBRID_MALLOC_LIB): Remove; no longer needed.
(--disable-silent-rules): New option, since Automake no longer
does this for us.
(AM_V, AM_DEFAULT_V): Set unconditionally, and do not bother
with AM_SUBST_NOTMAKE.
(AC_PROG_INSTALL): Add call.
(MAKEINFO): Do not bother with the 'missing' program.
(MAKEINFO, SYSTEM_TYPE): AC_SUBST.
(AC_CONFIG_FILES): Add Makefile, lib/gnulib.mk.
(SUBDIR_MAKEFILES): Remove duplication.
* lib/Makefile.am: Remove, replacing with:
* lib/Makefile.in: New file, with the old Makefile.am contents
and with the following changes:
(AUTOMAKE_OPTIONS, BUILT_SOURCES, CLEANFILES, EXTRA_DIST)
(MOSTLYCLEANDIRS, MOSTLYCLEANFILES, noinst_LIBRARIES, SUFFIXES)
(AM_CFLAGS, DEFAULT_INCLUDES, libegnu_a_SOURCES, libegnu_a_LIBADD)
(EXTRA_libegnu_a_SOURCES, libegnu_a_SHORTNAME, libegnu_a_CPPFLAGS):
Remove.
(VPATH, abs_top_builddir, top_builddir, top_srcdir, all, AM_V_AR)
(AM_V_CC, AM_V_GEN, AM_V_at, DEPDIR, DEPFLAGS, MKDEPDIR, SYSTEM_TYPE)
(libgnu.a, libegnu.a, ETAGS, $(ETAGS), tags, TAGS, clean)
(mostlyclean, distclean, bootstrap-clean, maintainer-clean):
New macros and rules, since Automake no longer does them.
Include ../nt/gnulib-cfg.mk if SYSTEM_TYPE is windows-nt,
instead of including ../nt/gnulib.mk if BUILDING_FOR_WINDOWS_NT.
Include dependency files if AUTO_DEPEND.
(ALL_CFLAGS, AUTOCONF_INPUTS, libgnu_a_OBJECTS, libegnu_a_OBJECTS):
New macros.
(bootstrap-clean): Depend on distclean, not maintainer-clean,
and remove gnulib.mk.
(AUTOCONF_INPUTS, $(top_srcdir)/configure, ../config.status, Makefile):
New macros and rules, copied from ../Makefile.in.
($(libegnu_a_OBJECTS), $(libgnu_a_OBJECTS)): Depend on BUILT_SOURCES.
(.c.o, e-%.o): New generic rules.
* lib/gnulib.mk: Remove.
* lib/gnulib.mk.in: New file, which is built by autogen.sh
and contains much of what used to be in lib/gnulib.mk.
* m4/gnulib-common.m4: Copy from gnulib.
* make-dist: Do not distribute build-aux/compile, build-aux/depcomp,
build-aux/missing, build-aux/ar-lib, lib/Makefile.am, nt/gnulib.mk,
nt/gnulib-modules-to-delete.cfg. Distribute lib/Makefile.in,
lib/gnulib.mk.in, and nt/gnulib-cfg.mk instead.
* nt/Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0)
(am__v_GEN_1, ${srcdir}/gnulib.mk): Remove.
* nt/gnulib-cfg.mk: New file, which supersedes ...
* nt/gnulib-modules-to-delete.cfg: ... this file, which is removed.
* src/Makefile.in (ACLOCAL_INPUTS): Remove.
(AUTOCONF_INPUTS): Merge ACLOCAL_INPUTS into it.
($(top_srcdir)/configure, ../config.status, config.in Makefile):
Defer to parent Makefile.
2017-03-17 18:33:47 +00:00
|
|
|
|
dnl This code is adapted from Automake.
|
|
|
|
|
dnl Although it can be simplified now that GNU Make is assumed,
|
|
|
|
|
dnl the simplification hasn't been done yet.
|
|
|
|
|
AC_ARG_ENABLE([silent-rules],
|
|
|
|
|
[AS_HELP_STRING(
|
|
|
|
|
[--disable-silent-rules],
|
|
|
|
|
[verbose build output (undo: "make V=0")])])
|
|
|
|
|
if test "$enable_silent_rules" = no; then
|
|
|
|
|
AM_DEFAULT_VERBOSITY=1
|
|
|
|
|
else
|
|
|
|
|
AM_DEFAULT_VERBOSITY=0
|
|
|
|
|
fi
|
|
|
|
|
AM_V='$(V)'
|
|
|
|
|
AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
|
2014-09-07 08:46:42 +00:00
|
|
|
|
AC_SUBST([AM_V])
|
|
|
|
|
AC_SUBST([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.
|
Switch from Automake to GNU Make
Emacs assumes GNU Make, and GNU Make has much of the functionality of
Automake built-in. The Emacs build process uses Automake primarily
because Emacs uses some Gnulib code and Gnulib formerly required
Automake. Now that Gnulib no longer requires Automake, Emacs can
stop using Automake and this should simplify Emacs maintenance
in the future (Bug#26100). Although this patch may look long, most of
it is generated automatically: the changes to build-aux/config.guess,
build-aux/config.sub, build-aux/install-sh, and lib/gnulib.mk.in are
all done by admin/merge-gnulib.
* .gitignore: Remove build-aux/ar-lib, build-aux/compile,
build-aux/config.guess, build-aux/config.sub, build-aux/depcomp,
build-aux/install-sh, build-aux/missing, and lib/Makefile.in,
as they are no longer built by autogen.sh.
Add lib/gnulib.mk, as it is now built by 'configure'.
Remove nt/gnulib.mk, as it is no longer built by 'make'.
* INSTALL.REPO, README, admin/make-tarball.txt:
Remove mention of Automake.
* Makefile.in (AUTOCONF, AUTOMAKE, AUTOHEADER, ACLOCAL, lib)
(AUTOCONF_INPUTS, ACLOCAL_PATH, ACLOCAL_INPUTS)
($(srcdir)/aclocal.m4, AUTOMAKE_INPUTS)
($(srcdir)/lib/Makefile.in, $(srcdir)/nt/gnulib.mk, am--refresh):
Remove.
($(MAKEFILE_NAME)): Depend on lib/gnulib.mk.in.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in)
($(srcdir)/src/config.in):
Use autogen.sh instead of doing it by hand.
* admin/merge-gnulib (AVOIDED_MODULES, avoided_flags)):
New vars, to simplify processing of avoided modules.
(GNULIB_TOOL_FLAGS): Move --avoid flags into AVOIDED_MODULES.
Add --gnu-make, and change makefile name to gnulib.mk.in.
Copy config.guess, config.sub, and install-sh too, since
Automake no longer does that for us.
* admin/notes/copyright:
* admin/update_autogen (genfiles):
Update list of files.
Remove hack for nt/gnulib.mk, a file that is no longer needed.
* autogen.sh (progs): Remove Automake.
(automake_min): Remove.
Build aclocal.m4 so that autoreconf need not use aclocal.
* build-aux/config.guess, build-aux/config.sub:
* build-aux/install-sh:
New files, copied from Gnulib. These are now updated by
admin/merge-gnulib instead by autogen.sh.
* configure.ac (AC_PROG_MAKE_SET, ACLOCAL_PATH, AM_CONDITIONAL):
Remove.
(AM_INIT_AUTOMAKE, AM_SILENT_RULES): Remove call.
(AC_PROG_CC_C_O): Call this instead of AM_PROG_CC_C_O.
(BUILDING_FOR_WINDOWSNT, HYBRID_MALLOC_LIB): Remove; no longer needed.
(--disable-silent-rules): New option, since Automake no longer
does this for us.
(AM_V, AM_DEFAULT_V): Set unconditionally, and do not bother
with AM_SUBST_NOTMAKE.
(AC_PROG_INSTALL): Add call.
(MAKEINFO): Do not bother with the 'missing' program.
(MAKEINFO, SYSTEM_TYPE): AC_SUBST.
(AC_CONFIG_FILES): Add Makefile, lib/gnulib.mk.
(SUBDIR_MAKEFILES): Remove duplication.
* lib/Makefile.am: Remove, replacing with:
* lib/Makefile.in: New file, with the old Makefile.am contents
and with the following changes:
(AUTOMAKE_OPTIONS, BUILT_SOURCES, CLEANFILES, EXTRA_DIST)
(MOSTLYCLEANDIRS, MOSTLYCLEANFILES, noinst_LIBRARIES, SUFFIXES)
(AM_CFLAGS, DEFAULT_INCLUDES, libegnu_a_SOURCES, libegnu_a_LIBADD)
(EXTRA_libegnu_a_SOURCES, libegnu_a_SHORTNAME, libegnu_a_CPPFLAGS):
Remove.
(VPATH, abs_top_builddir, top_builddir, top_srcdir, all, AM_V_AR)
(AM_V_CC, AM_V_GEN, AM_V_at, DEPDIR, DEPFLAGS, MKDEPDIR, SYSTEM_TYPE)
(libgnu.a, libegnu.a, ETAGS, $(ETAGS), tags, TAGS, clean)
(mostlyclean, distclean, bootstrap-clean, maintainer-clean):
New macros and rules, since Automake no longer does them.
Include ../nt/gnulib-cfg.mk if SYSTEM_TYPE is windows-nt,
instead of including ../nt/gnulib.mk if BUILDING_FOR_WINDOWS_NT.
Include dependency files if AUTO_DEPEND.
(ALL_CFLAGS, AUTOCONF_INPUTS, libgnu_a_OBJECTS, libegnu_a_OBJECTS):
New macros.
(bootstrap-clean): Depend on distclean, not maintainer-clean,
and remove gnulib.mk.
(AUTOCONF_INPUTS, $(top_srcdir)/configure, ../config.status, Makefile):
New macros and rules, copied from ../Makefile.in.
($(libegnu_a_OBJECTS), $(libgnu_a_OBJECTS)): Depend on BUILT_SOURCES.
(.c.o, e-%.o): New generic rules.
* lib/gnulib.mk: Remove.
* lib/gnulib.mk.in: New file, which is built by autogen.sh
and contains much of what used to be in lib/gnulib.mk.
* m4/gnulib-common.m4: Copy from gnulib.
* make-dist: Do not distribute build-aux/compile, build-aux/depcomp,
build-aux/missing, build-aux/ar-lib, lib/Makefile.am, nt/gnulib.mk,
nt/gnulib-modules-to-delete.cfg. Distribute lib/Makefile.in,
lib/gnulib.mk.in, and nt/gnulib-cfg.mk instead.
* nt/Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0)
(am__v_GEN_1, ${srcdir}/gnulib.mk): Remove.
* nt/gnulib-cfg.mk: New file, which supersedes ...
* nt/gnulib-modules-to-delete.cfg: ... this file, which is removed.
* src/Makefile.in (ACLOCAL_INPUTS): Remove.
(AUTOCONF_INPUTS): Merge ACLOCAL_INPUTS into it.
($(top_srcdir)/configure, ../config.status, config.in Makefile):
Defer to parent Makefile.
2017-03-17 18:33:47 +00:00
|
|
|
|
AC_PROG_INSTALL
|
* 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 These are commented out, since gl_EARLY and/or Autoconf already does them.
|
|
|
|
|
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
|
|
|
|
|
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
AC_CACHE_CHECK([command to symlink files in the same directory], [emacs_cv_ln_s_fileonly],
|
|
|
|
|
[rm -f conf$$ conf$$.file
|
2013-04-18 05:03:53 +00:00
|
|
|
|
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
emacs_cv_ln_s_fileonly='cp -p'
|
2013-04-18 05:03:53 +00:00
|
|
|
|
|
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
|
2020-03-29 13:43:56 +00:00
|
|
|
|
if test "$opsys" = "mingw32"; then
|
|
|
|
|
emacs_cv_ln_s_fileonly=/bin/ln
|
|
|
|
|
elif ln -s conf$$.file conf$$ 2>/dev/null; then
|
|
|
|
|
emacs_cv_ln_s_fileonly='ln -s'
|
2013-04-18 05:03:53 +00:00
|
|
|
|
elif ln conf$$.file conf$$ 2>/dev/null; then
|
2020-03-29 13:43:56 +00:00
|
|
|
|
emacs_cv_ln_s_fileonly=ln
|
2013-04-18 05:03:53 +00:00
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
rm -f conf$$ conf$$.file])
|
|
|
|
|
LN_S_FILEONLY=$emacs_cv_ln_s_fileonly
|
2013-04-18 05:03:53 +00:00
|
|
|
|
|
|
|
|
|
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.
|
2017-11-26 06:45:41 +00:00
|
|
|
|
dnl See https://lists.gnu.org/r/emacs-devel/2013-04/msg00475.html
|
2013-04-17 17:51:31 +00:00
|
|
|
|
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)
|
2005-11-03 16:59:33 +00:00
|
|
|
|
dnl Don't use GZIP, which is used by gzip for additional parameters.
|
|
|
|
|
AC_PATH_PROG(GZIP_PROG, gzip)
|
1994-08-26 14:57:46 +00:00
|
|
|
|
|
2013-09-10 21:52:26 +00:00
|
|
|
|
test $with_compress_install != yes && test -n "$GZIP_PROG" && \
|
|
|
|
|
GZIP_PROG=" # $GZIP_PROG # (disabled by configure --without-compress-install)"
|
|
|
|
|
|
Add portable dumper
Add a new portable dumper as an alternative to unexec. Use it by default.
* src/dmpstruct.awk: New file.
* src/doc.c (get_doc_string): use will_dump_p().
* src/editfns.c (styled_format): silence compiler warning
with UNINIT.
* src/emacs-module.c (syms_of_module): staticpro ltv_mark.
* src/emacs.c (gflags): new variable.
(init_cmdargs): unwrap
(string_starts_with_p, find_argument, dump_error_to_string)
(load_pdump): new functions.
(main): detect pdumper and --temacs invocation; actually load
portable dump when detected; set gflags as appropriate; changes to
init functions throughout to avoid passing explicit
'initialized' argument.
* src/eval.c (inhibit_lisp_code): remove unused variable.
(init_eval_once_for_pdumper): new function.
(init_eval_once): call it.
* src/filelock.c: CANNOT_DUMP -> will_dump_p()
* src/fingerprint-dummy.c: new file
* src/fingerprint.h: new file
* src/fns.c: CANNOT_DUMP -> will_dump_p(), etc.
(weak_hash_tables): remove
(hashfn_equal, hashfn_eql): un-staticify
(make_hash_table): set new 'next_weak' hash table field; drop
global weak_hash_tables logic.
(copy_hash_table): drop global weak_hash_tables logic.
(hash_table_rehash): new function.
(hash_lookup, hash_put, hash_remove_from_table, hash_clear):
rehash if needed.
(sweep_weak_table): un-staticify; explain logic; bool-ify.
(sweep_weak_hash_tables): remove function.
* src/font.c (syms_of_font): remember pdumper stuff.
* src/fontset.c (syms_of_fontset): remember pdumper stuff.
* src/frame.c (make_initial_frame): don't reset Vframe_list.
(init_frame_once_for_pdumper, init_frame_once): new functions.
(syms_of_frame): remove redundant staticpro.
* src/fringe.c (init_fringe_once_for_pdumper): new functin.
(init_fringe_once): call it.
* src/ftcrfont.c (syms_of_ftcrfont_for_pdumper): new function.
(syms_of_ftcrfont): call it.
* src/ftfont.c (syms_of_ftfont_for_pdumper): new function.
(syms_of_ftfont): call it.
* src/ftxont.c (syms_of_ftxfont_for_pdumper): new function.
(syms_of_ftxfont): call it.
* src/gmalloc.c: adjust for pdumper througout
(DUMPED): remove weird custom dumped indicator.
* src/gnutls.c (syms_of_gnutls): pdumper note for
gnutls_global_initialized.
* src/image.c (syms_of_image): add pdumper comment,
initializer note.
* src/insdel.c (prepare_to_modify_buffer_1): account
for buffer contents possibly being in dump image.
* src/keyboard.c (syms_of_keyboard_for_pdumper): new function.
(syms_of_keyboard): staticpro more; call pdumper syms function.
* src/lisp.h: add comments throughout
(gflags): declare.
(will_dump_p, will_bootstrap_p, will_dump_with_pdumper_p)
(dumped_with_pdumper_p, will_dump_with_unexec_p)
(dumped_with_unexec_p, definitely_will_not_unexec_p): new
functions.
(POWER_OF_2, ROUNDUP): move macros.
(PSEUDOVECTOR_TYPE, PSEUDOVECTOR_TYPEP): take vectorlike header
pointer instead of vector; constify.
(Lisp_Hash_Table): add comment about need to rehash on access; add
comment for next_weak.
(HASH_KEY, HASH_VALUE, HASH_HASH, HASH_TABLE_SIZE): const-ify.
(hash_table_rehash): declare.
(hash_rehash_needed_p, hash_rehash_if_needed): new functions.
(finalizers, doomed_finalizers): declare extern.
(SUBR_SECTION_ATTRIBUTE): new macro.
(staticvec, staticidx): un-static-ify.
(sweep_weak_hash_tables): remove declaration.
(sweep_weak_table): declare.
(hashfn_eql, hashfn_equal): declare.
(number_finalizers_run): new variable.
(Vdead): externify when ENABLE_CHECKING.
(gc_root_type): new enumeration.
(gc_root_visitor): new struct.
(visit_static_gc_roots): declare.
(vectorlike_nbytes): declare.
(vector_nbytes): define as trivial inline function wrapper for
vectorlike_nbytes.
(init_obarray_once): change signature.
(primary_thread): extern-ify.
(init_buffer): change signature.
(init_frame_once): declare.
* src/lread.c (readevalloop): adjust for new dumped predicates.
(init_obarray_once): new function.
(ndefsubr): new variable.
(defsubr): increment it.
(load_path_check): adjust for pdumper.
(load_path_default): use pdumper functions; adjust for
dump search.
* src/macfont.m (macfont_init_font_change_handler): avoid
shadowing global.
(syms_of_macfont_for_pdumper): new function.
(syms_of_macfont): call it.
* src/menu.c (syms_of_menu): staticpro more stuff.
* src/minibuf.c (Ftry_completion): rehash if needed.
(init_minibuf_once_for_pdumper): new function.
(init_minibuf_once): call it.
* src/nsfont.m (syms_of_nsfns): staticpro more.
* src/nsfont.m (syms_of_nsfont_for_pdumper): new function.
(syms_of_nsfont): call it.
* src/nsterm.m (syms_of_nsfont): remember pdumper stuff.
* src/pdumper.c: new file.
* src/pdumper.h: new file.
* src/process.c (init_process_emacs): use new pdumper functions
instead of CANNOT_DUMP.
* src/profiler.c (syms_of_profiler_for_pdumper): new function.
(syms_of_profiler_for_pdumper): call it.
* src/search.c (syms_of_search_for_pdumper): new function.
(syms_of_search_for_pdumper): call it.
* src/sheap.c (bss_sbrk_did_unexec): remove.
* src/sheap.h (bss_sbrk_did_unexec): remove.
* src/syntax.c (syms_of_syntax): don't redundantly staticpro
re_match_object.
* src/sysdep.c: use will_dump_with_unexec_p() instead of bss
hack thing.
* src/syssignals.h (init_sigsegv): declare.
* src/systime.h (init_timefns): remove bool from signature.
* src/textprop.c (syms_of_textprop): move staticpro.
* src/thread.c (main_thread_p): constify.
* src/thread.h (main_thread_p): constify.
* src/timefns.c (init_timefns): remove bool from signature.
(syms_of_timefns_for_pdumper): new function.
(syms_of_timefns): call it.
* src/w32.c: rearrange code.
* src/w32.h (w32_relocate): declare.
* src/w32fns.c (syms_of_w32fns): add pdumper note.
* src/w32font.c (syms_of_w32font_for_pdumper): new function.
(syms_of_w32font): call it.
* src/w32heap.c (using_dynamic_heap): new variable.
(init_heap): use it.
* src/w32menu.c (syms_of_w32menu): add pdumper note.
* src/w32proc.c
(ctrl_c_handler, mainCRTStartup, _start, open_input_file)
(rva_to_section, close_file_data): move here.
* src/w32uniscribe.c (syms_of_w32uniscribe_for_pdumper):
new function.
(syms_of_w32uniscribe): call it.
* src/window.c (init_window_once_for_pdumper): new function.
(init_window_once): call it; staticpro more stuff.
* src/xfont.c (syms_of_xfont_for_pdumper): new function.
(syms_of_xfont): call it.
* src/xftfont.c (syms_of_xftfont_for_pdumper): new function.
(syms_of_xftfont): call it.
* src/xmenu.c (syms_of_xmenu_for_pdumper): new function.
(syms_of_xmenu): call it.
* src/xselect.c (syms_of_xselect_for_pdumper): new function.
(syms_of_xselect): call it.
* src/xsettings.c (syms_of_xsettings): add more pdumper notes.
* src/term.c (syms_of_xterm): add pdumper note.
* src/dispnew.c (init_faces_initial): new function.
(init_display_interactive): rename from init_display; use
will_dump_p instead of !initialized. Initialize faces early for
pdumper if needed.
(init_display): new function.
(syms_of_display_for_pdumper): new function.
(syms_of_display): call it.
* src/dbusbind.c (syms_of_dbusbind): Add TODO for bus reset
on pdumper load.
* src/data.c (Fdefalias): Use will_dump_p
instead of Vpurify_flag.
(Fmake_variable_buffer_local): silence compiler warning with -Og
by making valcontents UNINIT.
(arith_driver): silence compiler warning with UNINIT.
* src/conf_post.h (ATTRIBUTE_SECTION): new macro.
* src/composite.c (composition_gstring_put_cache): rehash hash
table if needed.
* src/coding.c (init_coding_once, syms_of_coding): remember
pdumper stuff.
* src/charset.h (charset_table_size, charset_table_user): declare.
* src/charset.c (charset_table_used, charset_table_size): un-static.
(init_charset_oncem, syms_of_charset): remember pdumper stuff.
* src/category.c (category_table_version): remove obsolete
variable.
* src/callint.c (syms_of_callint): staticpro 'preserved_fns'
(init_callproc): use will_dump_p instead of !CANNOT_DUMP.
* src/bytecode.c (exec_byte_code): rehash table tables if needed
* src/buffer.c (alloc_buffer_text, free_buffer_text): account for
pdumper
(init_buffer_once): add TODO; remember stuff for pdumper.
(init_buffer): don't take initialized argument; adjust
for pdumper.
* src/atimer.c (init_atimer): initialize subr only if
!initialized.
* src/alloc.c: (vector_marked_p, set_vector_marked)
(vectorlike_marked_p, set_vectorlike_marked, cons_marked_p)
(set_cons_marked, string_marked_p, set_string_marked)
(symbol_marked_p, set_symbol_marked, interval_marked_p)
(set_interval_marked): new accessor routines. Use them
instead of raw GC access throughout.
(Vdead): make non-static when ENABLE_CHECKING.
(vectorlike_nbytes): rename of 'vector_nbytes'; take a vectorlike
header as input instead of a vector.
(number_finalizers_run): new internal C variable.
(mark_maybe_object): check for pdumper objects.
(valid_pointer_p): don't be gratuitously inefficient under rr(1).
(make_pure_c_string): add support for size_byte = -2 mode
indicating that string data points into Emacs image rodata.
(visit_vectorlike_root): visits GC roots embedded in
vectorlike objects.
(visit_buffer_root): visits GC roots embedded in
our totally-not-a-buffer buffer global objects.
(visit_static_gc_roots): visit GC roots in the Emacs data section.
(mark_object_root_visitor): root callback used for conventional GC
marking
(weak_hash_tables): new internal variable for tracking found weak
hash tables during GC.
(mark_and_sweep_weak_table_contents): new weak hash table marking.
(garbage_collect_1): use new GC root visitor machinery.
(mark_vectorlike): accept a vectorlike_header instead of a
Lisp_Vector.
(mark_frame, mark_window, mark_hash_table): new functions.
(mark_object): initialize 'm'; check for pdumper objects and use
new mark-bit accessors throughout. Remove some object-specific
marking code and move to helper functions above.
(survives_gc_p): check for pdumper objects.
(gc-sweep): clear pdumper mark bits.
(init_alloc_once_for_pdumper): new helper function for early init
called both during normal init and pdumper load.
(init_alloc_once): pdumper integration.
* src/Makefile.in: Rewrite dumping for pdumper; add pdumper.o;
invoke temacs with --temacs command line option; build dmpstruct.h
from dmpstruct.awk; stop relying on CANNOT_DUMP; clean up pdumper
intermediate files during build.
* nextstep/Makefile.in: build emacs.pdmp into NS packages
* lisp/startup.el: account for new '--temacs' and '--dump-file'
command line option.
* lisp/loadup.el: rewrite early init to account for pdumper; use
injected 'dump-mode' variable (set via the new '--temacs' option)
instead of parsing command line.
* lisp/cus-start.el: Check 'dump-mode' instead of 'purify-flag',
since the new 'dump-mode'
* lib-src/make-fingerprint.c: new program
* lib-src/Makefile.in: built make-fingerprint utility program
* configure.ac: Add --with-pdumper toggle to control pdumper
support; add --with-unexec toggle to control unexec support.
Add --with-dumping option to control which dumping strategy we use
by default. Adjust for pdumper throughout. Check for
posix_madvise.
* Makefile.in: Add @DUMPING@ substitution; add pdumper mode.
* .gitignore: Add make-fingerprint, temacs.in, fingerprint.c,
dmpstruct.h, and pdumper dump files.
2019-01-15 22:36:54 +00:00
|
|
|
|
if test "$with_dumping" = "unexec" && test "$opsys" = "nacl"; then
|
|
|
|
|
AC_MSG_ERROR([nacl is not compatible with --with-dumping=unexec])
|
|
|
|
|
fi
|
|
|
|
|
|
2017-03-31 02:26:58 +00:00
|
|
|
|
AC_CACHE_CHECK([for 'find' args to delete a file],
|
|
|
|
|
[emacs_cv_find_delete],
|
|
|
|
|
[if touch conftest.tmp && find conftest.tmp -delete 2>/dev/null &&
|
|
|
|
|
test ! -f conftest.tmp
|
|
|
|
|
then emacs_cv_find_delete="-delete"
|
|
|
|
|
else emacs_cv_find_delete="-exec rm -f {} ';'"
|
|
|
|
|
fi])
|
|
|
|
|
FIND_DELETE=$emacs_cv_find_delete
|
|
|
|
|
AC_SUBST([FIND_DELETE])
|
|
|
|
|
|
2016-04-27 22:52:53 +00:00
|
|
|
|
PAXCTL_dumped=
|
|
|
|
|
PAXCTL_notdumped=
|
2019-02-01 21:03:18 +00:00
|
|
|
|
if test $with_unexec = yes && test $opsys = gnu-linux; then
|
Add portable dumper
Add a new portable dumper as an alternative to unexec. Use it by default.
* src/dmpstruct.awk: New file.
* src/doc.c (get_doc_string): use will_dump_p().
* src/editfns.c (styled_format): silence compiler warning
with UNINIT.
* src/emacs-module.c (syms_of_module): staticpro ltv_mark.
* src/emacs.c (gflags): new variable.
(init_cmdargs): unwrap
(string_starts_with_p, find_argument, dump_error_to_string)
(load_pdump): new functions.
(main): detect pdumper and --temacs invocation; actually load
portable dump when detected; set gflags as appropriate; changes to
init functions throughout to avoid passing explicit
'initialized' argument.
* src/eval.c (inhibit_lisp_code): remove unused variable.
(init_eval_once_for_pdumper): new function.
(init_eval_once): call it.
* src/filelock.c: CANNOT_DUMP -> will_dump_p()
* src/fingerprint-dummy.c: new file
* src/fingerprint.h: new file
* src/fns.c: CANNOT_DUMP -> will_dump_p(), etc.
(weak_hash_tables): remove
(hashfn_equal, hashfn_eql): un-staticify
(make_hash_table): set new 'next_weak' hash table field; drop
global weak_hash_tables logic.
(copy_hash_table): drop global weak_hash_tables logic.
(hash_table_rehash): new function.
(hash_lookup, hash_put, hash_remove_from_table, hash_clear):
rehash if needed.
(sweep_weak_table): un-staticify; explain logic; bool-ify.
(sweep_weak_hash_tables): remove function.
* src/font.c (syms_of_font): remember pdumper stuff.
* src/fontset.c (syms_of_fontset): remember pdumper stuff.
* src/frame.c (make_initial_frame): don't reset Vframe_list.
(init_frame_once_for_pdumper, init_frame_once): new functions.
(syms_of_frame): remove redundant staticpro.
* src/fringe.c (init_fringe_once_for_pdumper): new functin.
(init_fringe_once): call it.
* src/ftcrfont.c (syms_of_ftcrfont_for_pdumper): new function.
(syms_of_ftcrfont): call it.
* src/ftfont.c (syms_of_ftfont_for_pdumper): new function.
(syms_of_ftfont): call it.
* src/ftxont.c (syms_of_ftxfont_for_pdumper): new function.
(syms_of_ftxfont): call it.
* src/gmalloc.c: adjust for pdumper througout
(DUMPED): remove weird custom dumped indicator.
* src/gnutls.c (syms_of_gnutls): pdumper note for
gnutls_global_initialized.
* src/image.c (syms_of_image): add pdumper comment,
initializer note.
* src/insdel.c (prepare_to_modify_buffer_1): account
for buffer contents possibly being in dump image.
* src/keyboard.c (syms_of_keyboard_for_pdumper): new function.
(syms_of_keyboard): staticpro more; call pdumper syms function.
* src/lisp.h: add comments throughout
(gflags): declare.
(will_dump_p, will_bootstrap_p, will_dump_with_pdumper_p)
(dumped_with_pdumper_p, will_dump_with_unexec_p)
(dumped_with_unexec_p, definitely_will_not_unexec_p): new
functions.
(POWER_OF_2, ROUNDUP): move macros.
(PSEUDOVECTOR_TYPE, PSEUDOVECTOR_TYPEP): take vectorlike header
pointer instead of vector; constify.
(Lisp_Hash_Table): add comment about need to rehash on access; add
comment for next_weak.
(HASH_KEY, HASH_VALUE, HASH_HASH, HASH_TABLE_SIZE): const-ify.
(hash_table_rehash): declare.
(hash_rehash_needed_p, hash_rehash_if_needed): new functions.
(finalizers, doomed_finalizers): declare extern.
(SUBR_SECTION_ATTRIBUTE): new macro.
(staticvec, staticidx): un-static-ify.
(sweep_weak_hash_tables): remove declaration.
(sweep_weak_table): declare.
(hashfn_eql, hashfn_equal): declare.
(number_finalizers_run): new variable.
(Vdead): externify when ENABLE_CHECKING.
(gc_root_type): new enumeration.
(gc_root_visitor): new struct.
(visit_static_gc_roots): declare.
(vectorlike_nbytes): declare.
(vector_nbytes): define as trivial inline function wrapper for
vectorlike_nbytes.
(init_obarray_once): change signature.
(primary_thread): extern-ify.
(init_buffer): change signature.
(init_frame_once): declare.
* src/lread.c (readevalloop): adjust for new dumped predicates.
(init_obarray_once): new function.
(ndefsubr): new variable.
(defsubr): increment it.
(load_path_check): adjust for pdumper.
(load_path_default): use pdumper functions; adjust for
dump search.
* src/macfont.m (macfont_init_font_change_handler): avoid
shadowing global.
(syms_of_macfont_for_pdumper): new function.
(syms_of_macfont): call it.
* src/menu.c (syms_of_menu): staticpro more stuff.
* src/minibuf.c (Ftry_completion): rehash if needed.
(init_minibuf_once_for_pdumper): new function.
(init_minibuf_once): call it.
* src/nsfont.m (syms_of_nsfns): staticpro more.
* src/nsfont.m (syms_of_nsfont_for_pdumper): new function.
(syms_of_nsfont): call it.
* src/nsterm.m (syms_of_nsfont): remember pdumper stuff.
* src/pdumper.c: new file.
* src/pdumper.h: new file.
* src/process.c (init_process_emacs): use new pdumper functions
instead of CANNOT_DUMP.
* src/profiler.c (syms_of_profiler_for_pdumper): new function.
(syms_of_profiler_for_pdumper): call it.
* src/search.c (syms_of_search_for_pdumper): new function.
(syms_of_search_for_pdumper): call it.
* src/sheap.c (bss_sbrk_did_unexec): remove.
* src/sheap.h (bss_sbrk_did_unexec): remove.
* src/syntax.c (syms_of_syntax): don't redundantly staticpro
re_match_object.
* src/sysdep.c: use will_dump_with_unexec_p() instead of bss
hack thing.
* src/syssignals.h (init_sigsegv): declare.
* src/systime.h (init_timefns): remove bool from signature.
* src/textprop.c (syms_of_textprop): move staticpro.
* src/thread.c (main_thread_p): constify.
* src/thread.h (main_thread_p): constify.
* src/timefns.c (init_timefns): remove bool from signature.
(syms_of_timefns_for_pdumper): new function.
(syms_of_timefns): call it.
* src/w32.c: rearrange code.
* src/w32.h (w32_relocate): declare.
* src/w32fns.c (syms_of_w32fns): add pdumper note.
* src/w32font.c (syms_of_w32font_for_pdumper): new function.
(syms_of_w32font): call it.
* src/w32heap.c (using_dynamic_heap): new variable.
(init_heap): use it.
* src/w32menu.c (syms_of_w32menu): add pdumper note.
* src/w32proc.c
(ctrl_c_handler, mainCRTStartup, _start, open_input_file)
(rva_to_section, close_file_data): move here.
* src/w32uniscribe.c (syms_of_w32uniscribe_for_pdumper):
new function.
(syms_of_w32uniscribe): call it.
* src/window.c (init_window_once_for_pdumper): new function.
(init_window_once): call it; staticpro more stuff.
* src/xfont.c (syms_of_xfont_for_pdumper): new function.
(syms_of_xfont): call it.
* src/xftfont.c (syms_of_xftfont_for_pdumper): new function.
(syms_of_xftfont): call it.
* src/xmenu.c (syms_of_xmenu_for_pdumper): new function.
(syms_of_xmenu): call it.
* src/xselect.c (syms_of_xselect_for_pdumper): new function.
(syms_of_xselect): call it.
* src/xsettings.c (syms_of_xsettings): add more pdumper notes.
* src/term.c (syms_of_xterm): add pdumper note.
* src/dispnew.c (init_faces_initial): new function.
(init_display_interactive): rename from init_display; use
will_dump_p instead of !initialized. Initialize faces early for
pdumper if needed.
(init_display): new function.
(syms_of_display_for_pdumper): new function.
(syms_of_display): call it.
* src/dbusbind.c (syms_of_dbusbind): Add TODO for bus reset
on pdumper load.
* src/data.c (Fdefalias): Use will_dump_p
instead of Vpurify_flag.
(Fmake_variable_buffer_local): silence compiler warning with -Og
by making valcontents UNINIT.
(arith_driver): silence compiler warning with UNINIT.
* src/conf_post.h (ATTRIBUTE_SECTION): new macro.
* src/composite.c (composition_gstring_put_cache): rehash hash
table if needed.
* src/coding.c (init_coding_once, syms_of_coding): remember
pdumper stuff.
* src/charset.h (charset_table_size, charset_table_user): declare.
* src/charset.c (charset_table_used, charset_table_size): un-static.
(init_charset_oncem, syms_of_charset): remember pdumper stuff.
* src/category.c (category_table_version): remove obsolete
variable.
* src/callint.c (syms_of_callint): staticpro 'preserved_fns'
(init_callproc): use will_dump_p instead of !CANNOT_DUMP.
* src/bytecode.c (exec_byte_code): rehash table tables if needed
* src/buffer.c (alloc_buffer_text, free_buffer_text): account for
pdumper
(init_buffer_once): add TODO; remember stuff for pdumper.
(init_buffer): don't take initialized argument; adjust
for pdumper.
* src/atimer.c (init_atimer): initialize subr only if
!initialized.
* src/alloc.c: (vector_marked_p, set_vector_marked)
(vectorlike_marked_p, set_vectorlike_marked, cons_marked_p)
(set_cons_marked, string_marked_p, set_string_marked)
(symbol_marked_p, set_symbol_marked, interval_marked_p)
(set_interval_marked): new accessor routines. Use them
instead of raw GC access throughout.
(Vdead): make non-static when ENABLE_CHECKING.
(vectorlike_nbytes): rename of 'vector_nbytes'; take a vectorlike
header as input instead of a vector.
(number_finalizers_run): new internal C variable.
(mark_maybe_object): check for pdumper objects.
(valid_pointer_p): don't be gratuitously inefficient under rr(1).
(make_pure_c_string): add support for size_byte = -2 mode
indicating that string data points into Emacs image rodata.
(visit_vectorlike_root): visits GC roots embedded in
vectorlike objects.
(visit_buffer_root): visits GC roots embedded in
our totally-not-a-buffer buffer global objects.
(visit_static_gc_roots): visit GC roots in the Emacs data section.
(mark_object_root_visitor): root callback used for conventional GC
marking
(weak_hash_tables): new internal variable for tracking found weak
hash tables during GC.
(mark_and_sweep_weak_table_contents): new weak hash table marking.
(garbage_collect_1): use new GC root visitor machinery.
(mark_vectorlike): accept a vectorlike_header instead of a
Lisp_Vector.
(mark_frame, mark_window, mark_hash_table): new functions.
(mark_object): initialize 'm'; check for pdumper objects and use
new mark-bit accessors throughout. Remove some object-specific
marking code and move to helper functions above.
(survives_gc_p): check for pdumper objects.
(gc-sweep): clear pdumper mark bits.
(init_alloc_once_for_pdumper): new helper function for early init
called both during normal init and pdumper load.
(init_alloc_once): pdumper integration.
* src/Makefile.in: Rewrite dumping for pdumper; add pdumper.o;
invoke temacs with --temacs command line option; build dmpstruct.h
from dmpstruct.awk; stop relying on CANNOT_DUMP; clean up pdumper
intermediate files during build.
* nextstep/Makefile.in: build emacs.pdmp into NS packages
* lisp/startup.el: account for new '--temacs' and '--dump-file'
command line option.
* lisp/loadup.el: rewrite early init to account for pdumper; use
injected 'dump-mode' variable (set via the new '--temacs' option)
instead of parsing command line.
* lisp/cus-start.el: Check 'dump-mode' instead of 'purify-flag',
since the new 'dump-mode'
* lib-src/make-fingerprint.c: new program
* lib-src/Makefile.in: built make-fingerprint utility program
* configure.ac: Add --with-pdumper toggle to control pdumper
support; add --with-unexec toggle to control unexec support.
Add --with-dumping option to control which dumping strategy we use
by default. Adjust for pdumper throughout. Check for
posix_madvise.
* Makefile.in: Add @DUMPING@ substitution; add pdumper mode.
* .gitignore: Add make-fingerprint, temacs.in, fingerprint.c,
dmpstruct.h, and pdumper dump files.
2019-01-15 22:36:54 +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
|
|
|
|
|
PAXCTL_notdumped='$(SETFATTR) -n user.pax.flags -v er'
|
|
|
|
|
SETFATTR=setfattr
|
|
|
|
|
else
|
|
|
|
|
SETFATTR=
|
2014-01-05 00:55:29 +00:00
|
|
|
|
fi
|
|
|
|
|
fi
|
2018-06-15 22:51:39 +00:00
|
|
|
|
case $opsys,$PAXCTL_notdumped,$emacs_uname_r in
|
|
|
|
|
gnu-linux,,* | netbsd,,[0-7].*)
|
|
|
|
|
AC_PATH_PROG([PAXCTL], [paxctl], [],
|
|
|
|
|
[$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/sbin])
|
|
|
|
|
if test -n "$PAXCTL"; then
|
|
|
|
|
if test "$opsys" = netbsd; then
|
|
|
|
|
PAXCTL_dumped='$(PAXCTL) +a'
|
|
|
|
|
PAXCTL_notdumped=$PAXCTL_dumped
|
|
|
|
|
else
|
|
|
|
|
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])
|
|
|
|
|
if test -n "$PAXCTL"; then
|
|
|
|
|
PAXCTL_dumped='$(PAXCTL) -zex'
|
|
|
|
|
PAXCTL_notdumped='$(PAXCTL) -r'
|
|
|
|
|
fi
|
2016-04-27 22:52:53 +00:00
|
|
|
|
fi
|
2018-06-15 22:51:39 +00:00
|
|
|
|
fi;;
|
|
|
|
|
esac
|
|
|
|
|
fi
|
2016-04-27 22:52:53 +00:00
|
|
|
|
AC_SUBST([PAXCTL_dumped])
|
|
|
|
|
AC_SUBST([PAXCTL_notdumped])
|
2019-02-02 01:07:13 +00:00
|
|
|
|
AC_SUBST([SETFATTR])
|
2007-08-24 03:03:09 +00:00
|
|
|
|
|
2018-01-01 15:44:24 +00:00
|
|
|
|
# Makeinfo on macOS is ancient, check whether there is a more recent
|
|
|
|
|
# version installed by Homebrew.
|
2018-01-09 23:47:56 +00:00
|
|
|
|
AC_CHECK_PROGS(BREW, [brew])
|
|
|
|
|
if test -n "$BREW"; then
|
2018-01-01 15:44:24 +00:00
|
|
|
|
AC_PATH_PROG([MAKEINFO], [makeinfo], [],
|
2018-01-09 23:47:56 +00:00
|
|
|
|
[`$BREW --prefix texinfo 2>/dev/null`/bin$PATH_SEPARATOR$PATH])
|
2018-01-01 15:44:24 +00:00
|
|
|
|
fi
|
|
|
|
|
|
2016-12-11 02:23:51 +00:00
|
|
|
|
## Require makeinfo >= 4.13 (last of the 4.x series) to build the manuals.
|
Switch from Automake to GNU Make
Emacs assumes GNU Make, and GNU Make has much of the functionality of
Automake built-in. The Emacs build process uses Automake primarily
because Emacs uses some Gnulib code and Gnulib formerly required
Automake. Now that Gnulib no longer requires Automake, Emacs can
stop using Automake and this should simplify Emacs maintenance
in the future (Bug#26100). Although this patch may look long, most of
it is generated automatically: the changes to build-aux/config.guess,
build-aux/config.sub, build-aux/install-sh, and lib/gnulib.mk.in are
all done by admin/merge-gnulib.
* .gitignore: Remove build-aux/ar-lib, build-aux/compile,
build-aux/config.guess, build-aux/config.sub, build-aux/depcomp,
build-aux/install-sh, build-aux/missing, and lib/Makefile.in,
as they are no longer built by autogen.sh.
Add lib/gnulib.mk, as it is now built by 'configure'.
Remove nt/gnulib.mk, as it is no longer built by 'make'.
* INSTALL.REPO, README, admin/make-tarball.txt:
Remove mention of Automake.
* Makefile.in (AUTOCONF, AUTOMAKE, AUTOHEADER, ACLOCAL, lib)
(AUTOCONF_INPUTS, ACLOCAL_PATH, ACLOCAL_INPUTS)
($(srcdir)/aclocal.m4, AUTOMAKE_INPUTS)
($(srcdir)/lib/Makefile.in, $(srcdir)/nt/gnulib.mk, am--refresh):
Remove.
($(MAKEFILE_NAME)): Depend on lib/gnulib.mk.in.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in)
($(srcdir)/src/config.in):
Use autogen.sh instead of doing it by hand.
* admin/merge-gnulib (AVOIDED_MODULES, avoided_flags)):
New vars, to simplify processing of avoided modules.
(GNULIB_TOOL_FLAGS): Move --avoid flags into AVOIDED_MODULES.
Add --gnu-make, and change makefile name to gnulib.mk.in.
Copy config.guess, config.sub, and install-sh too, since
Automake no longer does that for us.
* admin/notes/copyright:
* admin/update_autogen (genfiles):
Update list of files.
Remove hack for nt/gnulib.mk, a file that is no longer needed.
* autogen.sh (progs): Remove Automake.
(automake_min): Remove.
Build aclocal.m4 so that autoreconf need not use aclocal.
* build-aux/config.guess, build-aux/config.sub:
* build-aux/install-sh:
New files, copied from Gnulib. These are now updated by
admin/merge-gnulib instead by autogen.sh.
* configure.ac (AC_PROG_MAKE_SET, ACLOCAL_PATH, AM_CONDITIONAL):
Remove.
(AM_INIT_AUTOMAKE, AM_SILENT_RULES): Remove call.
(AC_PROG_CC_C_O): Call this instead of AM_PROG_CC_C_O.
(BUILDING_FOR_WINDOWSNT, HYBRID_MALLOC_LIB): Remove; no longer needed.
(--disable-silent-rules): New option, since Automake no longer
does this for us.
(AM_V, AM_DEFAULT_V): Set unconditionally, and do not bother
with AM_SUBST_NOTMAKE.
(AC_PROG_INSTALL): Add call.
(MAKEINFO): Do not bother with the 'missing' program.
(MAKEINFO, SYSTEM_TYPE): AC_SUBST.
(AC_CONFIG_FILES): Add Makefile, lib/gnulib.mk.
(SUBDIR_MAKEFILES): Remove duplication.
* lib/Makefile.am: Remove, replacing with:
* lib/Makefile.in: New file, with the old Makefile.am contents
and with the following changes:
(AUTOMAKE_OPTIONS, BUILT_SOURCES, CLEANFILES, EXTRA_DIST)
(MOSTLYCLEANDIRS, MOSTLYCLEANFILES, noinst_LIBRARIES, SUFFIXES)
(AM_CFLAGS, DEFAULT_INCLUDES, libegnu_a_SOURCES, libegnu_a_LIBADD)
(EXTRA_libegnu_a_SOURCES, libegnu_a_SHORTNAME, libegnu_a_CPPFLAGS):
Remove.
(VPATH, abs_top_builddir, top_builddir, top_srcdir, all, AM_V_AR)
(AM_V_CC, AM_V_GEN, AM_V_at, DEPDIR, DEPFLAGS, MKDEPDIR, SYSTEM_TYPE)
(libgnu.a, libegnu.a, ETAGS, $(ETAGS), tags, TAGS, clean)
(mostlyclean, distclean, bootstrap-clean, maintainer-clean):
New macros and rules, since Automake no longer does them.
Include ../nt/gnulib-cfg.mk if SYSTEM_TYPE is windows-nt,
instead of including ../nt/gnulib.mk if BUILDING_FOR_WINDOWS_NT.
Include dependency files if AUTO_DEPEND.
(ALL_CFLAGS, AUTOCONF_INPUTS, libgnu_a_OBJECTS, libegnu_a_OBJECTS):
New macros.
(bootstrap-clean): Depend on distclean, not maintainer-clean,
and remove gnulib.mk.
(AUTOCONF_INPUTS, $(top_srcdir)/configure, ../config.status, Makefile):
New macros and rules, copied from ../Makefile.in.
($(libegnu_a_OBJECTS), $(libgnu_a_OBJECTS)): Depend on BUILT_SOURCES.
(.c.o, e-%.o): New generic rules.
* lib/gnulib.mk: Remove.
* lib/gnulib.mk.in: New file, which is built by autogen.sh
and contains much of what used to be in lib/gnulib.mk.
* m4/gnulib-common.m4: Copy from gnulib.
* make-dist: Do not distribute build-aux/compile, build-aux/depcomp,
build-aux/missing, build-aux/ar-lib, lib/Makefile.am, nt/gnulib.mk,
nt/gnulib-modules-to-delete.cfg. Distribute lib/Makefile.in,
lib/gnulib.mk.in, and nt/gnulib-cfg.mk instead.
* nt/Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0)
(am__v_GEN_1, ${srcdir}/gnulib.mk): Remove.
* nt/gnulib-cfg.mk: New file, which supersedes ...
* nt/gnulib-modules-to-delete.cfg: ... this file, which is removed.
* src/Makefile.in (ACLOCAL_INPUTS): Remove.
(AUTOCONF_INPUTS): Merge ACLOCAL_INPUTS into it.
($(top_srcdir)/configure, ../config.status, config.in Makefile):
Defer to parent Makefile.
2017-03-17 18:33:47 +00:00
|
|
|
|
if test "${MAKEINFO:=makeinfo}" != "no"; then
|
2014-09-04 02:02:46 +00:00
|
|
|
|
case `($MAKEINFO --version) 2>/dev/null` in
|
2016-12-11 02:23:51 +00:00
|
|
|
|
*' (GNU texinfo) '4.1[[3-9]]* | \
|
2014-09-25 02:59:45 +00:00
|
|
|
|
*' (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
|
2007-08-24 03:03:09 +00:00
|
|
|
|
fi
|
|
|
|
|
|
2008-05-09 04:27:56 +00:00
|
|
|
|
## 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
|
2008-05-09 04:27:56 +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
|
|
|
|
|
|
2008-05-09 04:27:56 +00:00
|
|
|
|
if test "$MAKEINFO" = "no"; then
|
2011-01-05 07:10:47 +00:00
|
|
|
|
MAKEINFO=makeinfo
|
2008-05-09 04:27:56 +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
|
2016-12-11 02:23:51 +00:00
|
|
|
|
AC_MSG_ERROR( [You do not seem to have makeinfo >= 4.13, and your
|
2015-04-19 21:40:51 +00:00
|
|
|
|
source tree does not seem to have pre-built manuals in the 'info' directory.
|
2008-05-03 20:16:15 +00:00
|
|
|
|
Either install a suitable version of makeinfo, or re-run configure
|
2015-04-19 21:40:51 +00:00
|
|
|
|
with the '--without-makeinfo' option to build without the manuals.] )
|
2008-05-09 04:27:56 +00:00
|
|
|
|
fi
|
2008-05-03 20:16:15 +00:00
|
|
|
|
fi
|
Switch from Automake to GNU Make
Emacs assumes GNU Make, and GNU Make has much of the functionality of
Automake built-in. The Emacs build process uses Automake primarily
because Emacs uses some Gnulib code and Gnulib formerly required
Automake. Now that Gnulib no longer requires Automake, Emacs can
stop using Automake and this should simplify Emacs maintenance
in the future (Bug#26100). Although this patch may look long, most of
it is generated automatically: the changes to build-aux/config.guess,
build-aux/config.sub, build-aux/install-sh, and lib/gnulib.mk.in are
all done by admin/merge-gnulib.
* .gitignore: Remove build-aux/ar-lib, build-aux/compile,
build-aux/config.guess, build-aux/config.sub, build-aux/depcomp,
build-aux/install-sh, build-aux/missing, and lib/Makefile.in,
as they are no longer built by autogen.sh.
Add lib/gnulib.mk, as it is now built by 'configure'.
Remove nt/gnulib.mk, as it is no longer built by 'make'.
* INSTALL.REPO, README, admin/make-tarball.txt:
Remove mention of Automake.
* Makefile.in (AUTOCONF, AUTOMAKE, AUTOHEADER, ACLOCAL, lib)
(AUTOCONF_INPUTS, ACLOCAL_PATH, ACLOCAL_INPUTS)
($(srcdir)/aclocal.m4, AUTOMAKE_INPUTS)
($(srcdir)/lib/Makefile.in, $(srcdir)/nt/gnulib.mk, am--refresh):
Remove.
($(MAKEFILE_NAME)): Depend on lib/gnulib.mk.in.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in)
($(srcdir)/src/config.in):
Use autogen.sh instead of doing it by hand.
* admin/merge-gnulib (AVOIDED_MODULES, avoided_flags)):
New vars, to simplify processing of avoided modules.
(GNULIB_TOOL_FLAGS): Move --avoid flags into AVOIDED_MODULES.
Add --gnu-make, and change makefile name to gnulib.mk.in.
Copy config.guess, config.sub, and install-sh too, since
Automake no longer does that for us.
* admin/notes/copyright:
* admin/update_autogen (genfiles):
Update list of files.
Remove hack for nt/gnulib.mk, a file that is no longer needed.
* autogen.sh (progs): Remove Automake.
(automake_min): Remove.
Build aclocal.m4 so that autoreconf need not use aclocal.
* build-aux/config.guess, build-aux/config.sub:
* build-aux/install-sh:
New files, copied from Gnulib. These are now updated by
admin/merge-gnulib instead by autogen.sh.
* configure.ac (AC_PROG_MAKE_SET, ACLOCAL_PATH, AM_CONDITIONAL):
Remove.
(AM_INIT_AUTOMAKE, AM_SILENT_RULES): Remove call.
(AC_PROG_CC_C_O): Call this instead of AM_PROG_CC_C_O.
(BUILDING_FOR_WINDOWSNT, HYBRID_MALLOC_LIB): Remove; no longer needed.
(--disable-silent-rules): New option, since Automake no longer
does this for us.
(AM_V, AM_DEFAULT_V): Set unconditionally, and do not bother
with AM_SUBST_NOTMAKE.
(AC_PROG_INSTALL): Add call.
(MAKEINFO): Do not bother with the 'missing' program.
(MAKEINFO, SYSTEM_TYPE): AC_SUBST.
(AC_CONFIG_FILES): Add Makefile, lib/gnulib.mk.
(SUBDIR_MAKEFILES): Remove duplication.
* lib/Makefile.am: Remove, replacing with:
* lib/Makefile.in: New file, with the old Makefile.am contents
and with the following changes:
(AUTOMAKE_OPTIONS, BUILT_SOURCES, CLEANFILES, EXTRA_DIST)
(MOSTLYCLEANDIRS, MOSTLYCLEANFILES, noinst_LIBRARIES, SUFFIXES)
(AM_CFLAGS, DEFAULT_INCLUDES, libegnu_a_SOURCES, libegnu_a_LIBADD)
(EXTRA_libegnu_a_SOURCES, libegnu_a_SHORTNAME, libegnu_a_CPPFLAGS):
Remove.
(VPATH, abs_top_builddir, top_builddir, top_srcdir, all, AM_V_AR)
(AM_V_CC, AM_V_GEN, AM_V_at, DEPDIR, DEPFLAGS, MKDEPDIR, SYSTEM_TYPE)
(libgnu.a, libegnu.a, ETAGS, $(ETAGS), tags, TAGS, clean)
(mostlyclean, distclean, bootstrap-clean, maintainer-clean):
New macros and rules, since Automake no longer does them.
Include ../nt/gnulib-cfg.mk if SYSTEM_TYPE is windows-nt,
instead of including ../nt/gnulib.mk if BUILDING_FOR_WINDOWS_NT.
Include dependency files if AUTO_DEPEND.
(ALL_CFLAGS, AUTOCONF_INPUTS, libgnu_a_OBJECTS, libegnu_a_OBJECTS):
New macros.
(bootstrap-clean): Depend on distclean, not maintainer-clean,
and remove gnulib.mk.
(AUTOCONF_INPUTS, $(top_srcdir)/configure, ../config.status, Makefile):
New macros and rules, copied from ../Makefile.in.
($(libegnu_a_OBJECTS), $(libgnu_a_OBJECTS)): Depend on BUILT_SOURCES.
(.c.o, e-%.o): New generic rules.
* lib/gnulib.mk: Remove.
* lib/gnulib.mk.in: New file, which is built by autogen.sh
and contains much of what used to be in lib/gnulib.mk.
* m4/gnulib-common.m4: Copy from gnulib.
* make-dist: Do not distribute build-aux/compile, build-aux/depcomp,
build-aux/missing, build-aux/ar-lib, lib/Makefile.am, nt/gnulib.mk,
nt/gnulib-modules-to-delete.cfg. Distribute lib/Makefile.in,
lib/gnulib.mk.in, and nt/gnulib-cfg.mk instead.
* nt/Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0)
(am__v_GEN_1, ${srcdir}/gnulib.mk): Remove.
* nt/gnulib-cfg.mk: New file, which supersedes ...
* nt/gnulib-modules-to-delete.cfg: ... this file, which is removed.
* src/Makefile.in (ACLOCAL_INPUTS): Remove.
(AUTOCONF_INPUTS): Merge ACLOCAL_INPUTS into it.
($(top_srcdir)/configure, ../config.status, config.in Makefile):
Defer to parent Makefile.
2017-03-17 18:33:47 +00:00
|
|
|
|
AC_SUBST([MAKEINFO])
|
2011-01-05 07:10:47 +00:00
|
|
|
|
AC_SUBST(HAVE_MAKEINFO)
|
2007-08-24 03:03: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-09-10 21:52:26 +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-09-10 21:52:26 +00:00
|
|
|
|
DOCMISC_W32=
|
|
|
|
|
fi
|
|
|
|
|
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
|
|
|
|
|
2002-09-05 22:58:05 +00:00
|
|
|
|
dnl Add our options to ac_link now, after it is set up.
|
|
|
|
|
|
2010-10-09 02:16:38 +00:00
|
|
|
|
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"
|
2002-09-05 22:58:05 +00:00
|
|
|
|
fi
|
|
|
|
|
|
2018-10-18 00:55:43 +00:00
|
|
|
|
dnl On some platforms using GNU ld, linking temacs needs -znocombreloc.
|
|
|
|
|
dnl Although this has something to do with dumping, the details are unknown.
|
|
|
|
|
dnl If the flag is used but not needed,
|
|
|
|
|
dnl Emacs should still work (albeit a bit more slowly),
|
|
|
|
|
dnl so use the flag everywhere that it is supported.
|
|
|
|
|
dnl When testing whether the flag works, treat GCC specially
|
|
|
|
|
dnl since it just gives a non-fatal 'unrecognized option'
|
|
|
|
|
dnl if not built to support GNU ld.
|
|
|
|
|
if test "$GCC" = yes; then
|
|
|
|
|
LDFLAGS_NOCOMBRELOC="-Wl,-znocombreloc"
|
|
|
|
|
else
|
|
|
|
|
LDFLAGS_NOCOMBRELOC="-znocombreloc"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
AC_CACHE_CHECK([for -znocombreloc], [emacs_cv_znocombreloc],
|
2019-02-01 21:03:18 +00:00
|
|
|
|
[if test $with_unexec = no; then
|
2018-10-18 00:55:43 +00:00
|
|
|
|
emacs_cv_znocombreloc='not needed'
|
|
|
|
|
else
|
|
|
|
|
save_LDFLAGS=$LDFLAGS
|
|
|
|
|
LDFLAGS="$LDFLAGS $LDFLAGS_NOCOMBRELOC"
|
|
|
|
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
|
|
|
|
|
[emacs_cv_znocombreloc=yes], [emacs_cv_znocombreloc=no])
|
|
|
|
|
LDFLAGS=$save_LDFLAGS
|
|
|
|
|
fi])
|
|
|
|
|
|
|
|
|
|
case $emacs_cv_znocombreloc in
|
|
|
|
|
no*)
|
|
|
|
|
LDFLAGS_NOCOMBRELOC= ;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
|
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])])
|
|
|
|
|
|
2019-02-01 21:03:18 +00:00
|
|
|
|
if test $with_unexec = yes; then
|
|
|
|
|
AC_DEFINE([HAVE_UNEXEC], 1, [Define if Emacs supports unexec.])
|
|
|
|
|
if test "$emacs_cv_sanitize_address" = yes; then
|
|
|
|
|
AC_MSG_WARN([[Addresses are sanitized; suggest --without-unexec]])
|
|
|
|
|
fi
|
2013-12-26 08:57:28 +00:00
|
|
|
|
fi
|
2011-01-25 03:55:12 +00:00
|
|
|
|
|
2010-06-30 02:48:54 +00:00
|
|
|
|
|
2019-02-01 21:03:18 +00:00
|
|
|
|
UNEXEC_OBJ=
|
|
|
|
|
test $with_unexec = yes &&
|
2010-06-03 22:16:02 +00:00
|
|
|
|
case "$opsys" in
|
2010-08-05 17:11:32 +00:00
|
|
|
|
# MSDOS uses unexcoff.o
|
2010-06-03 22:16:02 +00:00
|
|
|
|
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
|
|
|
|
|
;;
|
2020-08-06 00:36:50 +00:00
|
|
|
|
solaris)
|
2010-06-03 22:16:02 +00:00
|
|
|
|
# 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).
|
|
|
|
|
UNEXEC_OBJ=unexsol.o
|
|
|
|
|
;;
|
2019-02-01 21:03:18 +00:00
|
|
|
|
*)
|
|
|
|
|
UNEXEC_OBJ=unexelf.o
|
|
|
|
|
;;
|
2010-06-03 22:16:02 +00:00
|
|
|
|
esac
|
2020-01-14 00:07:27 +00:00
|
|
|
|
AC_SUBST(UNEXEC_OBJ)
|
2010-05-21 00:28:47 +00:00
|
|
|
|
|
2010-05-07 02:55:47 +00:00
|
|
|
|
LD_SWITCH_SYSTEM=
|
2019-02-01 20:05:28 +00:00
|
|
|
|
test "$with_unexec" = no || case "$opsys" in
|
2013-04-18 17:12:21 +00:00
|
|
|
|
freebsd|dragonfly)
|
2015-04-19 21:40:51 +00:00
|
|
|
|
## Let 'ld' find image libs and similar things in /usr/local/lib.
|
2010-05-07 02:55:47 +00:00
|
|
|
|
## 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-05-07 02:55:47 +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-05-07 02:55:47 +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-05-07 02:55:47 +00:00
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
openbsd)
|
2013-05-13 06:23:08 +00:00
|
|
|
|
## Han Boetes <han@boetes.org> says this is necessary,
|
2010-05-07 02:55:47 +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-05-25 03:53:12 +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.
|
2010-05-07 02:55:47 +00:00
|
|
|
|
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-05-07 02:55:47 +00:00
|
|
|
|
esac
|
2000-07-18 22:04:26 +00:00
|
|
|
|
|
2010-05-04 02:56:19 +00:00
|
|
|
|
C_SWITCH_MACHINE=
|
Add portable dumper
Add a new portable dumper as an alternative to unexec. Use it by default.
* src/dmpstruct.awk: New file.
* src/doc.c (get_doc_string): use will_dump_p().
* src/editfns.c (styled_format): silence compiler warning
with UNINIT.
* src/emacs-module.c (syms_of_module): staticpro ltv_mark.
* src/emacs.c (gflags): new variable.
(init_cmdargs): unwrap
(string_starts_with_p, find_argument, dump_error_to_string)
(load_pdump): new functions.
(main): detect pdumper and --temacs invocation; actually load
portable dump when detected; set gflags as appropriate; changes to
init functions throughout to avoid passing explicit
'initialized' argument.
* src/eval.c (inhibit_lisp_code): remove unused variable.
(init_eval_once_for_pdumper): new function.
(init_eval_once): call it.
* src/filelock.c: CANNOT_DUMP -> will_dump_p()
* src/fingerprint-dummy.c: new file
* src/fingerprint.h: new file
* src/fns.c: CANNOT_DUMP -> will_dump_p(), etc.
(weak_hash_tables): remove
(hashfn_equal, hashfn_eql): un-staticify
(make_hash_table): set new 'next_weak' hash table field; drop
global weak_hash_tables logic.
(copy_hash_table): drop global weak_hash_tables logic.
(hash_table_rehash): new function.
(hash_lookup, hash_put, hash_remove_from_table, hash_clear):
rehash if needed.
(sweep_weak_table): un-staticify; explain logic; bool-ify.
(sweep_weak_hash_tables): remove function.
* src/font.c (syms_of_font): remember pdumper stuff.
* src/fontset.c (syms_of_fontset): remember pdumper stuff.
* src/frame.c (make_initial_frame): don't reset Vframe_list.
(init_frame_once_for_pdumper, init_frame_once): new functions.
(syms_of_frame): remove redundant staticpro.
* src/fringe.c (init_fringe_once_for_pdumper): new functin.
(init_fringe_once): call it.
* src/ftcrfont.c (syms_of_ftcrfont_for_pdumper): new function.
(syms_of_ftcrfont): call it.
* src/ftfont.c (syms_of_ftfont_for_pdumper): new function.
(syms_of_ftfont): call it.
* src/ftxont.c (syms_of_ftxfont_for_pdumper): new function.
(syms_of_ftxfont): call it.
* src/gmalloc.c: adjust for pdumper througout
(DUMPED): remove weird custom dumped indicator.
* src/gnutls.c (syms_of_gnutls): pdumper note for
gnutls_global_initialized.
* src/image.c (syms_of_image): add pdumper comment,
initializer note.
* src/insdel.c (prepare_to_modify_buffer_1): account
for buffer contents possibly being in dump image.
* src/keyboard.c (syms_of_keyboard_for_pdumper): new function.
(syms_of_keyboard): staticpro more; call pdumper syms function.
* src/lisp.h: add comments throughout
(gflags): declare.
(will_dump_p, will_bootstrap_p, will_dump_with_pdumper_p)
(dumped_with_pdumper_p, will_dump_with_unexec_p)
(dumped_with_unexec_p, definitely_will_not_unexec_p): new
functions.
(POWER_OF_2, ROUNDUP): move macros.
(PSEUDOVECTOR_TYPE, PSEUDOVECTOR_TYPEP): take vectorlike header
pointer instead of vector; constify.
(Lisp_Hash_Table): add comment about need to rehash on access; add
comment for next_weak.
(HASH_KEY, HASH_VALUE, HASH_HASH, HASH_TABLE_SIZE): const-ify.
(hash_table_rehash): declare.
(hash_rehash_needed_p, hash_rehash_if_needed): new functions.
(finalizers, doomed_finalizers): declare extern.
(SUBR_SECTION_ATTRIBUTE): new macro.
(staticvec, staticidx): un-static-ify.
(sweep_weak_hash_tables): remove declaration.
(sweep_weak_table): declare.
(hashfn_eql, hashfn_equal): declare.
(number_finalizers_run): new variable.
(Vdead): externify when ENABLE_CHECKING.
(gc_root_type): new enumeration.
(gc_root_visitor): new struct.
(visit_static_gc_roots): declare.
(vectorlike_nbytes): declare.
(vector_nbytes): define as trivial inline function wrapper for
vectorlike_nbytes.
(init_obarray_once): change signature.
(primary_thread): extern-ify.
(init_buffer): change signature.
(init_frame_once): declare.
* src/lread.c (readevalloop): adjust for new dumped predicates.
(init_obarray_once): new function.
(ndefsubr): new variable.
(defsubr): increment it.
(load_path_check): adjust for pdumper.
(load_path_default): use pdumper functions; adjust for
dump search.
* src/macfont.m (macfont_init_font_change_handler): avoid
shadowing global.
(syms_of_macfont_for_pdumper): new function.
(syms_of_macfont): call it.
* src/menu.c (syms_of_menu): staticpro more stuff.
* src/minibuf.c (Ftry_completion): rehash if needed.
(init_minibuf_once_for_pdumper): new function.
(init_minibuf_once): call it.
* src/nsfont.m (syms_of_nsfns): staticpro more.
* src/nsfont.m (syms_of_nsfont_for_pdumper): new function.
(syms_of_nsfont): call it.
* src/nsterm.m (syms_of_nsfont): remember pdumper stuff.
* src/pdumper.c: new file.
* src/pdumper.h: new file.
* src/process.c (init_process_emacs): use new pdumper functions
instead of CANNOT_DUMP.
* src/profiler.c (syms_of_profiler_for_pdumper): new function.
(syms_of_profiler_for_pdumper): call it.
* src/search.c (syms_of_search_for_pdumper): new function.
(syms_of_search_for_pdumper): call it.
* src/sheap.c (bss_sbrk_did_unexec): remove.
* src/sheap.h (bss_sbrk_did_unexec): remove.
* src/syntax.c (syms_of_syntax): don't redundantly staticpro
re_match_object.
* src/sysdep.c: use will_dump_with_unexec_p() instead of bss
hack thing.
* src/syssignals.h (init_sigsegv): declare.
* src/systime.h (init_timefns): remove bool from signature.
* src/textprop.c (syms_of_textprop): move staticpro.
* src/thread.c (main_thread_p): constify.
* src/thread.h (main_thread_p): constify.
* src/timefns.c (init_timefns): remove bool from signature.
(syms_of_timefns_for_pdumper): new function.
(syms_of_timefns): call it.
* src/w32.c: rearrange code.
* src/w32.h (w32_relocate): declare.
* src/w32fns.c (syms_of_w32fns): add pdumper note.
* src/w32font.c (syms_of_w32font_for_pdumper): new function.
(syms_of_w32font): call it.
* src/w32heap.c (using_dynamic_heap): new variable.
(init_heap): use it.
* src/w32menu.c (syms_of_w32menu): add pdumper note.
* src/w32proc.c
(ctrl_c_handler, mainCRTStartup, _start, open_input_file)
(rva_to_section, close_file_data): move here.
* src/w32uniscribe.c (syms_of_w32uniscribe_for_pdumper):
new function.
(syms_of_w32uniscribe): call it.
* src/window.c (init_window_once_for_pdumper): new function.
(init_window_once): call it; staticpro more stuff.
* src/xfont.c (syms_of_xfont_for_pdumper): new function.
(syms_of_xfont): call it.
* src/xftfont.c (syms_of_xftfont_for_pdumper): new function.
(syms_of_xftfont): call it.
* src/xmenu.c (syms_of_xmenu_for_pdumper): new function.
(syms_of_xmenu): call it.
* src/xselect.c (syms_of_xselect_for_pdumper): new function.
(syms_of_xselect): call it.
* src/xsettings.c (syms_of_xsettings): add more pdumper notes.
* src/term.c (syms_of_xterm): add pdumper note.
* src/dispnew.c (init_faces_initial): new function.
(init_display_interactive): rename from init_display; use
will_dump_p instead of !initialized. Initialize faces early for
pdumper if needed.
(init_display): new function.
(syms_of_display_for_pdumper): new function.
(syms_of_display): call it.
* src/dbusbind.c (syms_of_dbusbind): Add TODO for bus reset
on pdumper load.
* src/data.c (Fdefalias): Use will_dump_p
instead of Vpurify_flag.
(Fmake_variable_buffer_local): silence compiler warning with -Og
by making valcontents UNINIT.
(arith_driver): silence compiler warning with UNINIT.
* src/conf_post.h (ATTRIBUTE_SECTION): new macro.
* src/composite.c (composition_gstring_put_cache): rehash hash
table if needed.
* src/coding.c (init_coding_once, syms_of_coding): remember
pdumper stuff.
* src/charset.h (charset_table_size, charset_table_user): declare.
* src/charset.c (charset_table_used, charset_table_size): un-static.
(init_charset_oncem, syms_of_charset): remember pdumper stuff.
* src/category.c (category_table_version): remove obsolete
variable.
* src/callint.c (syms_of_callint): staticpro 'preserved_fns'
(init_callproc): use will_dump_p instead of !CANNOT_DUMP.
* src/bytecode.c (exec_byte_code): rehash table tables if needed
* src/buffer.c (alloc_buffer_text, free_buffer_text): account for
pdumper
(init_buffer_once): add TODO; remember stuff for pdumper.
(init_buffer): don't take initialized argument; adjust
for pdumper.
* src/atimer.c (init_atimer): initialize subr only if
!initialized.
* src/alloc.c: (vector_marked_p, set_vector_marked)
(vectorlike_marked_p, set_vectorlike_marked, cons_marked_p)
(set_cons_marked, string_marked_p, set_string_marked)
(symbol_marked_p, set_symbol_marked, interval_marked_p)
(set_interval_marked): new accessor routines. Use them
instead of raw GC access throughout.
(Vdead): make non-static when ENABLE_CHECKING.
(vectorlike_nbytes): rename of 'vector_nbytes'; take a vectorlike
header as input instead of a vector.
(number_finalizers_run): new internal C variable.
(mark_maybe_object): check for pdumper objects.
(valid_pointer_p): don't be gratuitously inefficient under rr(1).
(make_pure_c_string): add support for size_byte = -2 mode
indicating that string data points into Emacs image rodata.
(visit_vectorlike_root): visits GC roots embedded in
vectorlike objects.
(visit_buffer_root): visits GC roots embedded in
our totally-not-a-buffer buffer global objects.
(visit_static_gc_roots): visit GC roots in the Emacs data section.
(mark_object_root_visitor): root callback used for conventional GC
marking
(weak_hash_tables): new internal variable for tracking found weak
hash tables during GC.
(mark_and_sweep_weak_table_contents): new weak hash table marking.
(garbage_collect_1): use new GC root visitor machinery.
(mark_vectorlike): accept a vectorlike_header instead of a
Lisp_Vector.
(mark_frame, mark_window, mark_hash_table): new functions.
(mark_object): initialize 'm'; check for pdumper objects and use
new mark-bit accessors throughout. Remove some object-specific
marking code and move to helper functions above.
(survives_gc_p): check for pdumper objects.
(gc-sweep): clear pdumper mark bits.
(init_alloc_once_for_pdumper): new helper function for early init
called both during normal init and pdumper load.
(init_alloc_once): pdumper integration.
* src/Makefile.in: Rewrite dumping for pdumper; add pdumper.o;
invoke temacs with --temacs command line option; build dmpstruct.h
from dmpstruct.awk; stop relying on CANNOT_DUMP; clean up pdumper
intermediate files during build.
* nextstep/Makefile.in: build emacs.pdmp into NS packages
* lisp/startup.el: account for new '--temacs' and '--dump-file'
command line option.
* lisp/loadup.el: rewrite early init to account for pdumper; use
injected 'dump-mode' variable (set via the new '--temacs' option)
instead of parsing command line.
* lisp/cus-start.el: Check 'dump-mode' instead of 'purify-flag',
since the new 'dump-mode'
* lib-src/make-fingerprint.c: new program
* lib-src/Makefile.in: built make-fingerprint utility program
* configure.ac: Add --with-pdumper toggle to control pdumper
support; add --with-unexec toggle to control unexec support.
Add --with-dumping option to control which dumping strategy we use
by default. Adjust for pdumper throughout. Check for
posix_madvise.
* Makefile.in: Add @DUMPING@ substitution; add pdumper mode.
* .gitignore: Add make-fingerprint, temacs.in, fingerprint.c,
dmpstruct.h, and pdumper dump files.
2019-01-15 22:36:54 +00:00
|
|
|
|
|
2019-02-01 21:03:18 +00:00
|
|
|
|
test $with_unexec = yes &&
|
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-05-04 02:56:19 +00:00
|
|
|
|
## 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-05-04 02:56:19 +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-05-04 02:56:19 +00:00
|
|
|
|
AC_SUBST(C_SWITCH_MACHINE)
|
|
|
|
|
|
|
|
|
|
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-05-04 02:56:19 +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)
|
|
|
|
|
|
|
|
|
|
|
2010-05-10 02:16:09 +00:00
|
|
|
|
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-05-10 02:16:09 +00:00
|
|
|
|
|
|
|
|
|
hpux*) LIBS_SYSTEM="-l:libdld.sl" ;;
|
|
|
|
|
|
2017-10-24 19:54:28 +00:00
|
|
|
|
qnxnto) LIBS_SYSTEM="-lsocket" ;;
|
|
|
|
|
|
2020-08-06 00:36:50 +00:00
|
|
|
|
solaris) LIBS_SYSTEM="-lsocket -lnsl" ;;
|
2010-05-10 02:16: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)
|
2000-07-18 22:04:26 +00:00
|
|
|
|
|
|
|
|
|
### Make sure subsequent tests use flags consistent with the build flags.
|
|
|
|
|
|
|
|
|
|
if test x"${OVERRIDE_CPPFLAGS}" != x; then
|
|
|
|
|
CPPFLAGS="${OVERRIDE_CPPFLAGS}"
|
|
|
|
|
else
|
2010-05-04 02:56:19 +00:00
|
|
|
|
CPPFLAGS="$C_SWITCH_SYSTEM $C_SWITCH_MACHINE $CPPFLAGS"
|
2000-07-18 22:04:26 +00:00
|
|
|
|
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])
|
2002-11-08 12:30:21 +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
|
2006-05-18 16:58:16 +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.):
|
2016-03-07 16:22:37 +00:00
|
|
|
|
dnl gnu, gnu/linux, gnu/kfreebsd, aix, cygwin, darwin, hpux.
|
2012-06-11 23:17:11 +00:00
|
|
|
|
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-05-07 00:30:56 +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-05-07 00:30:56 +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
|
|
|
|
;;
|
2010-05-07 00:30:56 +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
|
|
|
|
|
2020-08-06 00:36:50 +00:00
|
|
|
|
solaris | unixware )
|
2012-06-11 23:17:11 +00:00
|
|
|
|
SYSTEM_TYPE=usg-unix-v
|
2010-05-07 00:30:56 +00:00
|
|
|
|
;;
|
2012-06-11 23:17:11 +00:00
|
|
|
|
|
2006-11-26 22:16:17 +00:00
|
|
|
|
esac
|
|
|
|
|
|
2010-05-07 00:30:56 +00:00
|
|
|
|
AC_SUBST(LIB_MATH)
|
2012-06-11 23:17:11 +00:00
|
|
|
|
AC_DEFINE_UNQUOTED(SYSTEM_TYPE, "$SYSTEM_TYPE",
|
2015-04-19 21:40:51 +00:00
|
|
|
|
[The type of system you are compiling for; sets 'system-type'.])
|
Switch from Automake to GNU Make
Emacs assumes GNU Make, and GNU Make has much of the functionality of
Automake built-in. The Emacs build process uses Automake primarily
because Emacs uses some Gnulib code and Gnulib formerly required
Automake. Now that Gnulib no longer requires Automake, Emacs can
stop using Automake and this should simplify Emacs maintenance
in the future (Bug#26100). Although this patch may look long, most of
it is generated automatically: the changes to build-aux/config.guess,
build-aux/config.sub, build-aux/install-sh, and lib/gnulib.mk.in are
all done by admin/merge-gnulib.
* .gitignore: Remove build-aux/ar-lib, build-aux/compile,
build-aux/config.guess, build-aux/config.sub, build-aux/depcomp,
build-aux/install-sh, build-aux/missing, and lib/Makefile.in,
as they are no longer built by autogen.sh.
Add lib/gnulib.mk, as it is now built by 'configure'.
Remove nt/gnulib.mk, as it is no longer built by 'make'.
* INSTALL.REPO, README, admin/make-tarball.txt:
Remove mention of Automake.
* Makefile.in (AUTOCONF, AUTOMAKE, AUTOHEADER, ACLOCAL, lib)
(AUTOCONF_INPUTS, ACLOCAL_PATH, ACLOCAL_INPUTS)
($(srcdir)/aclocal.m4, AUTOMAKE_INPUTS)
($(srcdir)/lib/Makefile.in, $(srcdir)/nt/gnulib.mk, am--refresh):
Remove.
($(MAKEFILE_NAME)): Depend on lib/gnulib.mk.in.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in)
($(srcdir)/src/config.in):
Use autogen.sh instead of doing it by hand.
* admin/merge-gnulib (AVOIDED_MODULES, avoided_flags)):
New vars, to simplify processing of avoided modules.
(GNULIB_TOOL_FLAGS): Move --avoid flags into AVOIDED_MODULES.
Add --gnu-make, and change makefile name to gnulib.mk.in.
Copy config.guess, config.sub, and install-sh too, since
Automake no longer does that for us.
* admin/notes/copyright:
* admin/update_autogen (genfiles):
Update list of files.
Remove hack for nt/gnulib.mk, a file that is no longer needed.
* autogen.sh (progs): Remove Automake.
(automake_min): Remove.
Build aclocal.m4 so that autoreconf need not use aclocal.
* build-aux/config.guess, build-aux/config.sub:
* build-aux/install-sh:
New files, copied from Gnulib. These are now updated by
admin/merge-gnulib instead by autogen.sh.
* configure.ac (AC_PROG_MAKE_SET, ACLOCAL_PATH, AM_CONDITIONAL):
Remove.
(AM_INIT_AUTOMAKE, AM_SILENT_RULES): Remove call.
(AC_PROG_CC_C_O): Call this instead of AM_PROG_CC_C_O.
(BUILDING_FOR_WINDOWSNT, HYBRID_MALLOC_LIB): Remove; no longer needed.
(--disable-silent-rules): New option, since Automake no longer
does this for us.
(AM_V, AM_DEFAULT_V): Set unconditionally, and do not bother
with AM_SUBST_NOTMAKE.
(AC_PROG_INSTALL): Add call.
(MAKEINFO): Do not bother with the 'missing' program.
(MAKEINFO, SYSTEM_TYPE): AC_SUBST.
(AC_CONFIG_FILES): Add Makefile, lib/gnulib.mk.
(SUBDIR_MAKEFILES): Remove duplication.
* lib/Makefile.am: Remove, replacing with:
* lib/Makefile.in: New file, with the old Makefile.am contents
and with the following changes:
(AUTOMAKE_OPTIONS, BUILT_SOURCES, CLEANFILES, EXTRA_DIST)
(MOSTLYCLEANDIRS, MOSTLYCLEANFILES, noinst_LIBRARIES, SUFFIXES)
(AM_CFLAGS, DEFAULT_INCLUDES, libegnu_a_SOURCES, libegnu_a_LIBADD)
(EXTRA_libegnu_a_SOURCES, libegnu_a_SHORTNAME, libegnu_a_CPPFLAGS):
Remove.
(VPATH, abs_top_builddir, top_builddir, top_srcdir, all, AM_V_AR)
(AM_V_CC, AM_V_GEN, AM_V_at, DEPDIR, DEPFLAGS, MKDEPDIR, SYSTEM_TYPE)
(libgnu.a, libegnu.a, ETAGS, $(ETAGS), tags, TAGS, clean)
(mostlyclean, distclean, bootstrap-clean, maintainer-clean):
New macros and rules, since Automake no longer does them.
Include ../nt/gnulib-cfg.mk if SYSTEM_TYPE is windows-nt,
instead of including ../nt/gnulib.mk if BUILDING_FOR_WINDOWS_NT.
Include dependency files if AUTO_DEPEND.
(ALL_CFLAGS, AUTOCONF_INPUTS, libgnu_a_OBJECTS, libegnu_a_OBJECTS):
New macros.
(bootstrap-clean): Depend on distclean, not maintainer-clean,
and remove gnulib.mk.
(AUTOCONF_INPUTS, $(top_srcdir)/configure, ../config.status, Makefile):
New macros and rules, copied from ../Makefile.in.
($(libegnu_a_OBJECTS), $(libgnu_a_OBJECTS)): Depend on BUILT_SOURCES.
(.c.o, e-%.o): New generic rules.
* lib/gnulib.mk: Remove.
* lib/gnulib.mk.in: New file, which is built by autogen.sh
and contains much of what used to be in lib/gnulib.mk.
* m4/gnulib-common.m4: Copy from gnulib.
* make-dist: Do not distribute build-aux/compile, build-aux/depcomp,
build-aux/missing, build-aux/ar-lib, lib/Makefile.am, nt/gnulib.mk,
nt/gnulib-modules-to-delete.cfg. Distribute lib/Makefile.in,
lib/gnulib.mk.in, and nt/gnulib-cfg.mk instead.
* nt/Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0)
(am__v_GEN_1, ${srcdir}/gnulib.mk): Remove.
* nt/gnulib-cfg.mk: New file, which supersedes ...
* nt/gnulib-modules-to-delete.cfg: ... this file, which is removed.
* src/Makefile.in (ACLOCAL_INPUTS): Remove.
(AUTOCONF_INPUTS): Merge ACLOCAL_INPUTS into it.
($(top_srcdir)/configure, ../config.status, config.in Makefile):
Defer to parent Makefile.
2017-03-17 18:33:47 +00:00
|
|
|
|
AC_SUBST([SYSTEM_TYPE])
|
2006-11-26 22:16:17 +00:00
|
|
|
|
|
2011-06-29 02:50:32 +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])])])
|
2006-05-18 16:58:16 +00:00
|
|
|
|
|
2013-07-27 01:18:21 +00:00
|
|
|
|
HAVE_SOUND=no
|
2002-04-08 06:16:33 +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-09-10 21:52:26 +00:00
|
|
|
|
test "${with_sound}" = "oss" && test "${have_sound_header}" != "yes" && \
|
|
|
|
|
AC_MSG_ERROR([OSS sound support requested but not found.])
|
|
|
|
|
|
|
|
|
|
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-09-10 21:52:26 +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
|
2002-04-08 06:16:33 +00:00
|
|
|
|
AC_SUBST(LIBSOUND)
|
2006-05-18 16:58:16 +00:00
|
|
|
|
|
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
|
|
|
|
|
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-06-30 03:43:30 +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-06-30 03:43:30 +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)
|
2010-06-30 03:43:30 +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
|
2010-06-30 03:43:30 +00:00
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
fi
|
|
|
|
|
|
2006-05-18 16:58:16 +00:00
|
|
|
|
AC_SUBST(CFLAGS_SOUND)
|
2002-04-08 06:16:33 +00:00
|
|
|
|
fi
|
1999-07-21 21:43:52 +00:00
|
|
|
|
|
1994-08-26 14:57:46 +00:00
|
|
|
|
dnl checks for header files
|
2012-05-28 00:46:33 +00:00
|
|
|
|
AC_CHECK_HEADERS_ONCE(
|
2016-09-10 19:51:27 +00:00
|
|
|
|
linux/fs.h
|
Include <malloc.h> when advisable
This should help insulate us better from future glibc changes.
It is good hygiene to include .h files for APIs that Emacs uses.
Fix type clashes between Emacs and GNU <malloc.h> (Bug#22086).
* configure.ac: Check for malloc.h.
* src/alloc.c: Include <malloc.h> depending on HAVE_MALLOC_H,
not on DOUG_LEA_MALLOC.
* src/emacs.c, src/gmalloc.c (malloc_enable_thread):
Remove decl (now in lisp.h).
* src/gmalloc.c: Include stddef.h earlier, for ptrdiff_t.
[emacs]: Include lisp.h.
[HAVE_MALLOC_H]: Include <malloc.h>.
(__MALLOC_HOOK_VOLATILE): New macro, if not already defined.
(__after_morecore_hook, __malloc_initialize_hook, __morecore)
(__default_morecore):
[!HAVE_MALLOC_H]: New decls near non-inclusion of <malloc.h>.
(calloc): Make it clear that the macro should not be used.
Remove unused decl.
(malloc_info): New macro, to avoid clash with glibc <malloc.h>.
(__morecore, __default_morecore, __after_morecore_hook)
(__malloc_extra_blocks, __malloc_initialize_hook, __free_hook)
(__malloc_hook, __realloc_hook, __memalign_hook, memory_warnings):
Remove later decls.
(gmalloc_hook, gfree_hook, grealloc_hook):
Rename from __malloc_hook, __free_hook, __realloc_hook to
avoid type collision with glibc <malloc.h>. All uses changed.
(gmalloc_hook):
(__malloc_extra_blocks) [DOUG_LEA_MALLOC||HYBRID_MALLOC||SYSTEM_MALLOC]:
Now static.
(gmalloc_hook, __malloc_extra_blocks): Define even if [!HYBRID_MALLOC].
(__malloc_initialize_hook, __after_morecore_hook):
Declare with types compatible with glibc.
(__memalign_hook, hybrid_calloc) [HYBRID_MALLOC]:
Remove. All uses removed.
* src/lisp.h (__malloc_extra_blocks, malloc_enable_thread): New decls.
* src/ralloc.c, src/vm-limit.c:
Simplify includes and include <malloc.h> if available.
2016-01-30 22:20:57 +00:00
|
|
|
|
malloc.h
|
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
|
Assume POSIX 1003.1-1988 or later for fcntl.h.
* admin/CPP-DEFINES (O_RDONLY, O_RDWR, HAVE_FCNTL_H): Remove.
* admin/merge-gnulib (GNULIB_MODULES): Add fcntl-h.
* configure.ac: Do not check for fcntl.h.
* lib/gnulib.mk: Regenerate.
* lib-src/movemail.c, lib-src/update-game-score.c: Assume <fcntl.h> exists.
* nt/inc/sys/socket.h (O_NONBLOCK): Rename from O_NDELAY, since the
POSIX name for this flag is O_NONBLOCK. All uses changed.
* nt/inc/unistd.h (O_RDWR, O_NOCTTY): New macros. Like AT_FDCWD etc.
these really should be moved to a replacement <fcntl.h> if and
when that gets implemented. In the meantime, include <fcntl.h>
to make sure we don't override its definitions.
* src/callproc.c (relocate_fd): Assume F_DUPFD.
* src/emacs.c, src/term.c (O_RDWR): Remove.
* src/keyboard.c (tty_read_avail_input): Use O_NONBLOCK rather than
O_NDELAY, since O_NONBLOCK is the standard name for this flag.
* src/nsterm.m: Assume <fcntl.h> exists.
* src/process.c (NON_BLOCKING_CONNECT, allocate_pty, create_process)
(create_pty, Fmake_network_process, server_accept_connection)
(wait_reading_process_output, init_process_emacs):
Assume O_NONBLOCK.
(wait_reading_process_output): Put in a special case for WINDOWSNT
to mimick the older behavior where it had O_NDELAY but not O_NONBLOCK.
It's not clear this is needed, but it's a more-conservative change.
(create_process): Assume FD_CLOEXEC.
(create_process, create_pty): Assume O_NOCTTY.
* src/sysdep.c (init_sys_modes, reset_sys_modes): Assume F_SETFL.
(reset_sys_modes): Use O_NONBLOCK rather than O_NDELAY.
Omit if not DOS_NT, since F_GETFL is not defined there.
(serial_open): Assume O_NONBLOCK and O_NOCTTY.
* src/term.c: Include <fcntl.h>, for flags like O_NOCTTY.
(O_NOCTTY): Remove.
(init_tty): Assume O_IGNORE_CTTY is defined to 0 on platforms that
lack it, since gnulib guarantees this.
* src/w32.c (fcntl): Test for O_NONBLOCK rather than O_NDELAY.
Fixes: debbugs:12881
2012-11-17 22:12:47 +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
|
2020-08-01 12:13:55 +00:00
|
|
|
|
sys/utsname.h pwd.h utmp.h util.h
|
|
|
|
|
sanitizer/lsan_interface.h)
|
2004-10-20 16:16:07 +00:00
|
|
|
|
|
2016-07-15 11:07:09 +00:00
|
|
|
|
AC_CACHE_CHECK([for ADDR_NO_RANDOMIZE],
|
|
|
|
|
[emacs_cv_personality_addr_no_randomize],
|
|
|
|
|
[AC_COMPILE_IFELSE(
|
|
|
|
|
[AC_LANG_PROGRAM([[#include <sys/personality.h>]],
|
|
|
|
|
[[personality (personality (0xffffffff)
|
|
|
|
|
| ADDR_NO_RANDOMIZE)]])],
|
|
|
|
|
[emacs_cv_personality_addr_no_randomize=yes],
|
|
|
|
|
[emacs_cv_personality_addr_no_randomize=no])])
|
|
|
|
|
if test $emacs_cv_personality_addr_no_randomize = yes; then
|
|
|
|
|
AC_DEFINE([HAVE_PERSONALITY_ADDR_NO_RANDOMIZE], [1],
|
|
|
|
|
[Define to 1 if personality flag ADDR_NO_RANDOMIZE exists.])
|
2004-10-20 16:16:07 +00:00
|
|
|
|
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
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
AC_CACHE_CHECK([if Linux sysinfo may be used], [emacs_cv_linux_sysinfo],
|
|
|
|
|
[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)]])],
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
emacs_cv_linux_sysinfo=yes, emacs_cv_linux_sysinfo=no)])
|
|
|
|
|
|
2014-07-10 12:33:35 +00:00
|
|
|
|
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
|
|
|
|
|
2002-11-18 16:24:41 +00:00
|
|
|
|
dnl On Solaris 8 there's a compilation warning for term.h because
|
2015-04-19 21:40:51 +00:00
|
|
|
|
dnl it doesn't define 'bool'.
|
2002-11-18 16:24:41 +00:00
|
|
|
|
AC_CHECK_HEADERS(term.h, , , -)
|
1994-09-13 15:46:47 +00:00
|
|
|
|
AC_HEADER_TIME
|
2000-07-05 16:53:30 +00:00
|
|
|
|
AC_HEADER_SYS_WAIT
|
1994-08-26 14:57:46 +00:00
|
|
|
|
|
2012-05-28 00:46:33 +00:00
|
|
|
|
AC_CHECK_HEADERS_ONCE(sys/socket.h)
|
2003-12-24 16:45:27 +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])
|
2003-12-24 16:45:27 +00:00
|
|
|
|
|
1994-08-26 14:57:46 +00:00
|
|
|
|
dnl checks for structure members
|
2005-04-20 10:54:46 +00:00
|
|
|
|
AC_CHECK_MEMBERS([struct ifreq.ifr_flags, struct ifreq.ifr_hwaddr,
|
2003-09-23 12:39:44 +00:00
|
|
|
|
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], , ,
|
2003-12-24 16:45:27 +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])
|
1994-08-26 14:57:46 +00:00
|
|
|
|
|
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.
|
2002-11-27 22:53:51 +00:00
|
|
|
|
|
1994-08-26 14:57:46 +00:00
|
|
|
|
dnl check for Make feature
|
|
|
|
|
|
Replace AC_SUBST_FILE in configure with include in Makefiles.
* configure.ac (DEPDIR, MKDEPDIR, deps_frag, lwlib_deps_frag)
(oldxmenu_deps_frag, lisp_frag): Remove output variables/files.
(AUTO_DEPEND): New output variable.
* lwlib/Makefile.in (AUTO_DEPEND): New, set by configure.
(DEPFLAGS, MKDEPDIR): Set directly via conditional.
(lwlib_deps_frag): Replace by conditional include.
* lwlib/autodeps.mk: Remove file.
* oldXMenu/Makefile.in (AUTO_DEPEND): New, set by configure.
(DEPFLAGS, MKDEPDIR): Set directly via conditional.
(oldxmenu_deps_frag): Replace by conditional include.
* oldXMenu/autodeps.mk: Remove file.
* src/Makefile.in (AUTO_DEPEND): New, set by configure.
(DEPFLAGS, MKDEPDIR): Set directly via conditional.
(lisp_frag): Replace by an include.
(deps_frag): Replace by conditional include.
* src/autodeps.mk: Remove file.
2015-05-16 00:51:45 +00:00
|
|
|
|
AUTO_DEPEND=no
|
2017-03-21 16:59:10 +00:00
|
|
|
|
AUTODEPEND_PARENTS='lib src'
|
2014-03-27 19:41:57 +00:00
|
|
|
|
dnl check if we have GCC and autodepend is on.
|
2009-11-14 15:17:38 +00:00
|
|
|
|
if test "$GCC" = yes && test "$ac_enable_autodepend" = yes; then
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
AC_CACHE_CHECK([whether gcc understands -MMD -MF], [emacs_cv_autodepend],
|
|
|
|
|
[SAVE_CFLAGS="$CFLAGS"
|
2014-03-27 19:41:57 +00:00
|
|
|
|
CFLAGS="$CFLAGS -MMD -MF deps.d -MP"
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
|
|
|
|
|
[emacs_cv_autodepend=yes], [emacs_cv_autodepend=no])
|
2014-03-27 19:41:57 +00:00
|
|
|
|
CFLAGS="$SAVE_CFLAGS"
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
test -f deps.d || emacs_cv_autodepend=no
|
|
|
|
|
rm -rf deps.d])
|
|
|
|
|
if test $emacs_cv_autodepend = yes; then
|
Replace AC_SUBST_FILE in configure with include in Makefiles.
* configure.ac (DEPDIR, MKDEPDIR, deps_frag, lwlib_deps_frag)
(oldxmenu_deps_frag, lisp_frag): Remove output variables/files.
(AUTO_DEPEND): New output variable.
* lwlib/Makefile.in (AUTO_DEPEND): New, set by configure.
(DEPFLAGS, MKDEPDIR): Set directly via conditional.
(lwlib_deps_frag): Replace by conditional include.
* lwlib/autodeps.mk: Remove file.
* oldXMenu/Makefile.in (AUTO_DEPEND): New, set by configure.
(DEPFLAGS, MKDEPDIR): Set directly via conditional.
(oldxmenu_deps_frag): Replace by conditional include.
* oldXMenu/autodeps.mk: Remove file.
* src/Makefile.in (AUTO_DEPEND): New, set by configure.
(DEPFLAGS, MKDEPDIR): Set directly via conditional.
(lisp_frag): Replace by an include.
(deps_frag): Replace by conditional include.
* src/autodeps.mk: Remove file.
2015-05-16 00:51:45 +00:00
|
|
|
|
AUTO_DEPEND=yes
|
2009-11-14 15:17:38 +00:00
|
|
|
|
fi
|
|
|
|
|
fi
|
Replace AC_SUBST_FILE in configure with include in Makefiles.
* configure.ac (DEPDIR, MKDEPDIR, deps_frag, lwlib_deps_frag)
(oldxmenu_deps_frag, lisp_frag): Remove output variables/files.
(AUTO_DEPEND): New output variable.
* lwlib/Makefile.in (AUTO_DEPEND): New, set by configure.
(DEPFLAGS, MKDEPDIR): Set directly via conditional.
(lwlib_deps_frag): Replace by conditional include.
* lwlib/autodeps.mk: Remove file.
* oldXMenu/Makefile.in (AUTO_DEPEND): New, set by configure.
(DEPFLAGS, MKDEPDIR): Set directly via conditional.
(oldxmenu_deps_frag): Replace by conditional include.
* oldXMenu/autodeps.mk: Remove file.
* src/Makefile.in (AUTO_DEPEND): New, set by configure.
(DEPFLAGS, MKDEPDIR): Set directly via conditional.
(lisp_frag): Replace by an include.
(deps_frag): Replace by conditional include.
* src/autodeps.mk: Remove file.
2015-05-16 00:51:45 +00:00
|
|
|
|
AC_SUBST(AUTO_DEPEND)
|
2011-05-20 00:41:03 +00:00
|
|
|
|
|
1994-08-26 14:57:46 +00:00
|
|
|
|
#### 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
|
2020-07-02 06:27:30 +00:00
|
|
|
|
|
|
|
|
|
if test "${with_pgtk}" = "yes"; then
|
|
|
|
|
window_system=pgtk
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
1994-09-13 15:46:47 +00:00
|
|
|
|
AC_PATH_X
|
2020-07-02 06:27:30 +00:00
|
|
|
|
if test "$no_x" != yes && test "${with_pgtk}" != "yes"; then
|
1994-09-05 21:29:37 +00:00
|
|
|
|
window_system=x11
|
|
|
|
|
fi
|
1994-08-26 14:57:46 +00:00
|
|
|
|
|
2012-05-01 00:16:02 +00:00
|
|
|
|
LD_SWITCH_X_SITE_RPATH=
|
2006-10-23 15:28:18 +00:00
|
|
|
|
if test "${x_libraries}" != NONE; then
|
|
|
|
|
if test -n "${x_libraries}"; then
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
|
LD_SWITCH_X_SITE=-L`AS_ECHO(["$x_libraries"]) | sed -e 's/:/ -L/g'`
|
|
|
|
|
LD_SWITCH_X_SITE_RPATH=-Wl,-rpath,`
|
|
|
|
|
AS_ECHO(["$x_libraries"]) | sed -e 's/:/ -Wl,-rpath,/g'
|
|
|
|
|
`
|
2006-10-23 15:28:18 +00:00
|
|
|
|
fi
|
1997-08-24 01:01:45 +00:00
|
|
|
|
x_default_search_path=""
|
2006-10-23 15:28:18 +00:00
|
|
|
|
x_search_path=${x_libraries}
|
|
|
|
|
if test -z "${x_search_path}"; then
|
|
|
|
|
x_search_path=/usr/lib
|
|
|
|
|
fi
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
|
for x_library in `AS_ECHO(["$x_search_path:"]) | \
|
2006-10-23 15:28:18 +00:00
|
|
|
|
sed -e "s/:/ /g" -e p -e "s:/lib[[^ /]]* :/share :g"`; do
|
2001-01-13 07:10:58 +00:00
|
|
|
|
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"
|
1997-08-24 01:01:45 +00:00
|
|
|
|
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
|
1994-11-14 17:08:32 +00:00
|
|
|
|
fi
|
2012-05-01 00:16:02 +00:00
|
|
|
|
AC_SUBST(LD_SWITCH_X_SITE_RPATH)
|
2010-05-04 03:13:35 +00:00
|
|
|
|
|
1994-11-14 17:08:32 +00:00
|
|
|
|
if test "${x_includes}" != NONE && test -n "${x_includes}"; then
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
|
C_SWITCH_X_SITE=$isystem`AS_ECHO(["$x_includes"]) | sed -e "s/:/ $isystem/g"`
|
1994-11-14 17:08:32 +00:00
|
|
|
|
fi
|
1994-08-26 14:57:46 +00:00
|
|
|
|
|
1994-10-29 12:43:53 +00:00
|
|
|
|
if test x"${x_includes}" = x; then
|
|
|
|
|
bitmapdir=/usr/include/X11/bitmaps
|
1994-10-27 19:58:25 +00:00
|
|
|
|
else
|
1996-01-05 00:45:43 +00:00
|
|
|
|
# accumulate include directories that have X11 bitmap subdirectories
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
|
bmd_acc=
|
|
|
|
|
for bmd in `AS_ECHO(["$x_includes"]) | sed -e 's/:/ /g'`; do
|
1995-05-30 23:26:56 +00:00
|
|
|
|
if test -d "${bmd}/X11/bitmaps"; then
|
|
|
|
|
bmd_acc="${bmd_acc}:${bmd}/X11/bitmaps"
|
1999-11-11 16:49:03 +00:00
|
|
|
|
fi
|
|
|
|
|
if test -d "${bmd}/bitmaps"; then
|
1995-05-30 23:26:56 +00:00
|
|
|
|
bmd_acc="${bmd_acc}:${bmd}/bitmaps"
|
|
|
|
|
fi
|
|
|
|
|
done
|
2015-10-14 21:46:22 +00:00
|
|
|
|
bitmapdir=${bmd_acc#:}
|
1994-10-27 19:58:25 +00:00
|
|
|
|
fi
|
|
|
|
|
|
2020-04-14 21:56:06 +00:00
|
|
|
|
NATIVE_IMAGE_API=no
|
|
|
|
|
|
2015-06-23 02:03:33 +00:00
|
|
|
|
test "${with_ns}" = maybe && test "${opsys}" != darwin && with_ns=no
|
2008-07-15 18:15:18 +00:00
|
|
|
|
HAVE_NS=no
|
2015-01-25 02:05:33 +00:00
|
|
|
|
NS_GNUSTEP_CONFIG=no
|
2008-07-16 23:24:46 +00:00
|
|
|
|
NS_IMPL_COCOA=no
|
|
|
|
|
NS_IMPL_GNUSTEP=no
|
2008-07-15 18:15:18 +00:00
|
|
|
|
tmp_CPPFLAGS="$CPPFLAGS"
|
|
|
|
|
tmp_CFLAGS="$CFLAGS"
|
|
|
|
|
CPPFLAGS="$CPPFLAGS -x objective-c"
|
|
|
|
|
CFLAGS="$CFLAGS -x objective-c"
|
2020-09-03 20:56:03 +00:00
|
|
|
|
GNU_OBJC_CFLAGS=""
|
2012-12-29 19:37:32 +00:00
|
|
|
|
LIBS_GNUSTEP=
|
2008-07-15 18:15:18 +00:00
|
|
|
|
if test "${with_ns}" != no; then
|
2019-06-22 18:35:45 +00:00
|
|
|
|
# macfont.o requires macuvs.h which is absent after 'make extraclean',
|
2019-06-21 23:22:26 +00:00
|
|
|
|
# so avoid NS_IMPL_COCOA if macuvs.h is absent.
|
2019-06-22 18:35:45 +00:00
|
|
|
|
# Even a headless Emacs can build macuvs.h, so this should let you bootstrap.
|
2019-06-21 23:22:26 +00:00
|
|
|
|
if test "${opsys}" = darwin && test -f "$srcdir/src/macuvs.h"; then
|
2008-07-16 23:24:46 +00:00
|
|
|
|
NS_IMPL_COCOA=yes
|
2010-10-12 21:03:09 +00:00
|
|
|
|
ns_appdir=`pwd`/nextstep/Emacs.app
|
2012-05-12 18:10:37 +00:00
|
|
|
|
ns_appbindir=${ns_appdir}/Contents/MacOS
|
2010-10-12 21:03: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
|
2015-01-25 02:05:33 +00:00
|
|
|
|
elif flags=$( (gnustep-config --objc-flags) 2>/dev/null); then
|
|
|
|
|
NS_IMPL_GNUSTEP=yes
|
|
|
|
|
NS_GNUSTEP_CONFIG=yes
|
2020-09-03 20:56:03 +00:00
|
|
|
|
GNU_OBJC_CFLAGS="$flags"
|
2015-01-25 02:05:33 +00:00
|
|
|
|
LIBS_GNUSTEP=$(gnustep-config --gui-libs) || exit
|
2008-10-24 07:22:43 +00:00
|
|
|
|
elif test -f $GNUSTEP_CONFIG_FILE; then
|
2008-07-16 23:24:46 +00:00
|
|
|
|
NS_IMPL_GNUSTEP=yes
|
2010-05-26 03:42:07 +00:00
|
|
|
|
dnl FIXME sourcing this several times in subshells seems inefficient.
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
|
GNUSTEP_SYSTEM_HEADERS=$(
|
|
|
|
|
. $GNUSTEP_CONFIG_FILE
|
|
|
|
|
AS_ECHO(["$GNUSTEP_SYSTEM_HEADERS"])
|
|
|
|
|
)
|
|
|
|
|
GNUSTEP_SYSTEM_LIBRARIES=$(
|
|
|
|
|
. $GNUSTEP_CONFIG_FILE
|
|
|
|
|
AS_ECHO(["$GNUSTEP_SYSTEM_LIBRARIES"])
|
|
|
|
|
)
|
2010-05-26 03:50:16 +00:00
|
|
|
|
dnl I seemed to need these as well with GNUstep-startup 0.25.
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
|
GNUSTEP_LOCAL_HEADERS=$(
|
|
|
|
|
. $GNUSTEP_CONFIG_FILE
|
|
|
|
|
AS_ECHO(["$GNUSTEP_LOCAL_HEADERS"])
|
|
|
|
|
)
|
|
|
|
|
GNUSTEP_LOCAL_LIBRARIES=$(
|
|
|
|
|
. $GNUSTEP_CONFIG_FILE
|
|
|
|
|
AS_ECHO(["$GNUSTEP_LOCAL_LIBRARIES"])
|
|
|
|
|
)
|
2010-05-26 03:50:16 +00:00
|
|
|
|
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.])
|
2020-08-27 19:50:42 +00:00
|
|
|
|
GNU_OBJC_CFLAGS="$GNU_OBJC_CFLAGS -fobjc-exceptions"
|
2011-09-15 02:32:55 +00:00
|
|
|
|
fi
|
2008-07-15 18:15:18 +00:00
|
|
|
|
fi
|
2015-01-25 02:05:33 +00:00
|
|
|
|
if test $NS_IMPL_GNUSTEP = yes; then
|
|
|
|
|
ns_appdir=`pwd`/nextstep/Emacs.app
|
|
|
|
|
ns_appbindir=${ns_appdir}
|
|
|
|
|
ns_appresdir=${ns_appdir}/Resources
|
|
|
|
|
ns_appsrc=GNUstep/Emacs.base
|
|
|
|
|
ns_fontfile=nsfont.o
|
|
|
|
|
fi
|
2011-09-15 02:32:55 +00:00
|
|
|
|
|
|
|
|
|
dnl This is only used while we test the NS headers, it gets reset below.
|
2015-01-25 02:05:33 +00:00
|
|
|
|
CPPFLAGS="$CPPFLAGS $GNU_OBJC_CFLAGS"
|
2011-09-15 02:32:55 +00:00
|
|
|
|
CFLAGS="$CFLAGS $GNU_OBJC_CFLAGS"
|
|
|
|
|
|
2008-10-24 04:26:53 +00:00
|
|
|
|
AC_CHECK_HEADER([AppKit/AppKit.h], [HAVE_NS=yes],
|
2015-06-23 02:03:33 +00:00
|
|
|
|
[AC_MSG_ERROR([The include files (AppKit/AppKit.h etc) that
|
|
|
|
|
are required for a Nextstep build are missing or cannot be compiled.
|
|
|
|
|
Either fix this, or re-configure with the option '--without-ns'.])])
|
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
|
2016-11-06 07:33:43 +00:00
|
|
|
|
AC_MSG_CHECKING([for Mac OS X 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
|
2016-11-06 07:33:43 +00:00
|
|
|
|
error "Mac OS X 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
|
2016-11-06 07:33:43 +00:00
|
|
|
|
AC_MSG_ERROR([Mac OS X 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
|
2009-10-16 03:08:41 +00:00
|
|
|
|
fi
|
2020-04-14 21:56:06 +00:00
|
|
|
|
|
|
|
|
|
if test "${with_native_image_api}" = yes; then
|
|
|
|
|
AC_DEFINE(HAVE_NATIVE_IMAGE_API, 1, [Define to use native OS APIs for images.])
|
|
|
|
|
NATIVE_IMAGE_API="yes (ns)"
|
|
|
|
|
fi
|
2008-07-15 18:15:18 +00:00
|
|
|
|
fi
|
2012-09-17 11:55:02 +00:00
|
|
|
|
|
2012-12-29 19:37:32 +00:00
|
|
|
|
AC_SUBST(LIBS_GNUSTEP)
|
2010-04-28 06:54:25 +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-04-28 06:54:25 +00:00
|
|
|
|
NS_OBJ=
|
2011-02-08 21:42:56 +00:00
|
|
|
|
NS_OBJC_OBJ=
|
2008-07-15 18:15:18 +00:00
|
|
|
|
if test "${HAVE_NS}" = yes; then
|
2012-02-02 02:12:57 +00:00
|
|
|
|
if test "$with_toolkit_scroll_bars" = "no"; then
|
2020-01-01 11:44:21 +00:00
|
|
|
|
AC_MSG_WARN([Non-toolkit scroll bars are not implemented for Nextstep.])
|
2012-02-02 02:12:57 +00:00
|
|
|
|
fi
|
|
|
|
|
|
2008-07-15 18:15:18 +00:00
|
|
|
|
window_system=nextstep
|
2008-07-17 17:44:41 +00:00
|
|
|
|
# set up packaging dirs
|
|
|
|
|
if test "${EN_NS_SELF_CONTAINED}" = yes; then
|
2012-05-17 05:32:37 +00:00
|
|
|
|
ns_self_contained=yes
|
2008-07-17 17:44:41 +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"
|
2015-02-13 16:44:26 +00:00
|
|
|
|
test "$locallisppathset" = no && locallisppath=""
|
2012-05-18 07:41:13 +00:00
|
|
|
|
INSTALL_ARCH_INDEP_EXTRA=
|
2008-07-17 17:44:41 +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"
|
2008-07-15 18:15:18 +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-04-28 06:54:25 +00:00
|
|
|
|
AC_SUBST(NS_OBJ)
|
2011-02-08 21:42:56 +00:00
|
|
|
|
AC_SUBST(NS_OBJC_OBJ)
|
2008-07-15 18:15:18 +00:00
|
|
|
|
|
2017-05-25 18:23:39 +00:00
|
|
|
|
if test "${HAVE_NS}" = yes; then
|
|
|
|
|
AC_CACHE_CHECK(
|
|
|
|
|
[if the Objective C compiler supports instancetype],
|
|
|
|
|
[emacs_cv_objc_instancetype],
|
|
|
|
|
[AC_LANG_PUSH([Objective C])
|
|
|
|
|
AC_COMPILE_IFELSE(
|
|
|
|
|
[AC_LANG_SOURCE([[@interface Test
|
|
|
|
|
+ (instancetype)test;
|
|
|
|
|
@end]])],
|
|
|
|
|
emacs_cv_objc_instancetype=yes,
|
|
|
|
|
emacs_cv_objc_instancetype=no)
|
|
|
|
|
AC_LANG_POP([Objective C])])
|
|
|
|
|
|
|
|
|
|
if test x$emacs_cv_objc_instancetype = xyes ; then
|
|
|
|
|
AC_DEFINE(NATIVE_OBJC_INSTANCETYPE, 1,
|
|
|
|
|
[Define if ObjC compiler supports instancetype natively.])
|
|
|
|
|
fi
|
2020-09-03 20:56:03 +00:00
|
|
|
|
|
|
|
|
|
AC_CACHE_CHECK(
|
|
|
|
|
[if the Objective C compiler defaults to C99],
|
|
|
|
|
[emacs_cv_objc_c99],
|
|
|
|
|
[AC_LANG_PUSH([Objective C])
|
|
|
|
|
AC_COMPILE_IFELSE(
|
|
|
|
|
[AC_LANG_PROGRAM([], [[for (int i = 0;;);]])],
|
|
|
|
|
emacs_cv_objc_c99=yes,
|
|
|
|
|
emacs_cv_objc_c99=no)
|
|
|
|
|
AC_LANG_POP([Objective C])])
|
|
|
|
|
|
|
|
|
|
if test x$emacs_cv_objc_c99 = xno ; then
|
|
|
|
|
GNU_OBJC_CFLAGS="$GNU_OBJC_CFLAGS -std=c99"
|
|
|
|
|
fi
|
2017-05-25 18:23:39 +00:00
|
|
|
|
fi
|
|
|
|
|
|
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=
|
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],
|
2015-04-19 21:40:51 +00:00
|
|
|
|
[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
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
AC_CACHE_CHECK([whether Windows API headers are recent enough], [emacs_cv_w32api],
|
|
|
|
|
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
2012-11-24 12:39:36 +00:00
|
|
|
|
#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)]])],
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
[emacs_cv_w32api=yes], [emacs_cv_w32api=no])])
|
2012-11-24 12:39:36 +00:00
|
|
|
|
if test "${emacs_cv_w32api}" = "no"; then
|
|
|
|
|
AC_MSG_ERROR([the Windows API headers are too old to support this build.])
|
2012-09-17 11:55:02 +00:00
|
|
|
|
fi
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
HAVE_W32=${emacs_cv_w32api}
|
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.])
|
2015-01-20 16:26:28 +00:00
|
|
|
|
if test "$with_toolkit_scroll_bars" = "no"; then
|
|
|
|
|
AC_MSG_ERROR([Non-toolkit scroll bars are not implemented for w32 build.])
|
|
|
|
|
fi
|
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"
|
2018-01-12 13:51:16 +00:00
|
|
|
|
W32_OBJ="$W32_OBJ w32xfns.o w32select.o w32uniscribe.o w32cygwinx.o"
|
2013-04-01 13:18:20 +00:00
|
|
|
|
EMACSRES="emacs.res"
|
|
|
|
|
case "$canonical" in
|
|
|
|
|
x86_64-*-*) EMACS_MANIFEST="emacs-x64.manifest" ;;
|
|
|
|
|
*) EMACS_MANIFEST="emacs-x86.manifest" ;;
|
|
|
|
|
esac
|
2014-11-24 18:40:02 +00:00
|
|
|
|
dnl Construct something of the form "24,4,0,0" with 4 components.
|
2014-11-25 16:43:52 +00:00
|
|
|
|
comma_version=`echo "${PACKAGE_VERSION}.0.0" | sed -e 's/\./,/g' -e 's/^\([[^,]]*,[[^,]]*,[[^,]]*,[[^,]]*\).*/\1/'`
|
2014-11-24 18:40:02 +00:00
|
|
|
|
|
|
|
|
|
comma_space_version=`echo "$comma_version" | sed 's/,/, /g'`
|
|
|
|
|
AC_SUBST(comma_version)
|
|
|
|
|
AC_SUBST(comma_space_version)
|
|
|
|
|
AC_CONFIG_FILES([nt/emacs.rc nt/emacsclient.rc])
|
2012-11-23 15:22:47 +00:00
|
|
|
|
if test "${opsys}" = "cygwin"; then
|
2017-09-19 17:31:02 +00:00
|
|
|
|
W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lusp10 -lgdi32"
|
|
|
|
|
W32_LIBS="$W32_LIBS -lole32 -lcomdlg32 -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
|
2020-04-14 15:10:41 +00:00
|
|
|
|
W32_OBJ="$W32_OBJ w32.o w32console.o w32heap.o w32inevt.o w32proc.o"
|
|
|
|
|
dnl FIXME: This should probably be supported for Cygwin/w32 as
|
|
|
|
|
dnl well, but the Cygwin build needs to link against -lgdiplus
|
2020-04-13 10:04:39 +00:00
|
|
|
|
if test "${with_native_image_api}" = yes; then
|
2020-04-14 15:10:41 +00:00
|
|
|
|
AC_DEFINE(HAVE_NATIVE_IMAGE_API, 1, [Define to use native OS APIs for images.])
|
|
|
|
|
NATIVE_IMAGE_API="yes (w32)"
|
|
|
|
|
W32_OBJ="$W32_OBJ w32image.o"
|
2020-04-13 10:04:39 +00:00
|
|
|
|
fi
|
2017-09-19 17:31:02 +00:00
|
|
|
|
W32_LIBS="$W32_LIBS -lwinmm -lusp10 -lgdi32 -lcomdlg32"
|
|
|
|
|
W32_LIBS="$W32_LIBS -lmpr -lwinspool -lole32 -lcomctl32"
|
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
|
2018-01-12 13:51:16 +00:00
|
|
|
|
|
|
|
|
|
if test "${HAVE_W32}" = "no" && test "${opsys}" = "cygwin"; then
|
|
|
|
|
W32_LIBS="-lkernel32"
|
|
|
|
|
W32_OBJ="w32cygwinx.o"
|
|
|
|
|
fi
|
|
|
|
|
|
2012-09-17 11:55:02 +00:00
|
|
|
|
AC_SUBST(W32_OBJ)
|
|
|
|
|
AC_SUBST(W32_LIBS)
|
2013-04-01 13:18:20 +00:00
|
|
|
|
AC_SUBST(EMACSRES)
|
|
|
|
|
AC_SUBST(EMACS_MANIFEST)
|
|
|
|
|
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.
|
|
|
|
|
|
|
|
|
|
term_header=
|
|
|
|
|
HAVE_X_WINDOWS=no
|
|
|
|
|
HAVE_X11=no
|
|
|
|
|
USE_X_TOOLKIT=none
|
|
|
|
|
|
1994-08-26 14:57:46 +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
|
1994-08-26 14:57:46 +00:00
|
|
|
|
case "${with_x_toolkit}" in
|
1996-01-05 23:12:03 +00:00
|
|
|
|
athena | lucid ) USE_X_TOOLKIT=LUCID ;;
|
|
|
|
|
motif ) USE_X_TOOLKIT=MOTIF ;;
|
2003-01-19 21:50:03 +00:00
|
|
|
|
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
|
2003-01-19 21:50:03 +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 ;;
|
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
* configure.in: Add --with-x-toolkit=gtk3. Remove HAVE_GTK_MULTIDISPLAY,
check for gtk_file_chooser_dialog_new, and HAVE_GTK_FILE_BOTH (implied
by minimum required Gtk+ 2.6). Add checks for functions introduced
in Gtk+ 2.14 or newer.
* xterm.h (gtk_widget_get_window, gtk_widget_get_mapped)
(gtk_adjustment_get_page_size, gtk_adjustment_get_upper): New
defines based on what configure finds.
* xterm.c (XTflash): Use gtk_widget_get_window.
(xg_scroll_callback): Use gtk_adjustment_get_upper and
gtk_adjustment_get_page_size.
(handle_one_xevent): Use gtk_widget_get_mapped.
(x_term_init): Remove HAVE_GTK_MULTIDISPLAY and associated error
messages.
* xmenu.c (create_and_show_popup_menu): Call gtk_widget_get_mapped.
* gtkutil.h: Replace HAVE_GTK_FILE_BOTH with
HAVE_GTK_FILE_SELECTION_NEW.
* gtkutil.c (xg_display_open, xg_display_close): Remove
HAVE_GTK_MULTIDISPLAY, it is always defined.
(xg_display_open): Return type is void.
(gtk_widget_set_has_window)
(gtk_dialog_get_action_area, gtk_dialog_get_content_area)
(gtk_widget_get_sensitive, gtk_adjustment_set_page_size)
(gtk_adjustment_set_page_increment)
(gtk_adjustment_get_step_increment): #define these if not found
by configure.
(remove_submenu): New define based on Gtk+ version.
(xg_set_cursor, xg_frame_resized, xg_event_is_for_scrollbar): Use
gtk_widget_get_window.
(xg_frame_resized, xg_update_frame_menubar): Use gtk_widget_get_mapped.
(xg_create_frame_widgets): Use gtk_widget_set_has_window.
(create_dialog): Use gtk_dialog_get_action_area and
gtk_dialog_get_content_area.
(xg_uses_old_file_dialog, xg_get_file_name): Remove HAVE_GTK_FILE_BOTH
and HAVE_GTK_FILE_CHOOSER_DIALOG_NEW. File chooser is always
available, so checking for HAVE_GTK_FILE_SELECTION_NEW is enough.
(xg_update_menubar, xg_update_submenu, xg_show_toolbar_item): Use
g_object_ref and g_object_unref.
(xg_update_menu_item, xg_tool_bar_menu_proxy): Use
gtk_widget_get_sensitive.
(xg_update_submenu): Use remove_submenu.
(xg_update_scrollbar_pos): Don't use GtkFixedChild, use child
properties instead to get old x and y position.
(xg_set_toolkit_scroll_bar_thumb): Use gtk_adjustment_get_page_size,
gtk_adjustment_get_step_increment, gtk_adjustment_set_page_size,
gtk_adjustment_set_step_increment and gtk_adjustment_set_page_increment.
(xg_get_tool_bar_widgets): New function.
(xg_tool_bar_menu_proxy, xg_show_toolbar_item)
(update_frame_tool_bar): Call xg_get_tool_bar_widgets.
(toolbar_set_orientation): New #define based on if configure
finds gtk_orientable_set_orientation.
(xg_create_tool_bar): Call toolbar_set_orientation.
(xg_make_tool_item, xg_show_toolbar_item): Call gtk_box_pack_start
instead of gtk_box_pack_start_defaults.
2010-06-28 10:11:26 +00:00
|
|
|
|
gtk3 ) with_gtk3=yes
|
2012-09-01 06:38:52 +00:00
|
|
|
|
term_header=gtkutil.h
|
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
* configure.in: Add --with-x-toolkit=gtk3. Remove HAVE_GTK_MULTIDISPLAY,
check for gtk_file_chooser_dialog_new, and HAVE_GTK_FILE_BOTH (implied
by minimum required Gtk+ 2.6). Add checks for functions introduced
in Gtk+ 2.14 or newer.
* xterm.h (gtk_widget_get_window, gtk_widget_get_mapped)
(gtk_adjustment_get_page_size, gtk_adjustment_get_upper): New
defines based on what configure finds.
* xterm.c (XTflash): Use gtk_widget_get_window.
(xg_scroll_callback): Use gtk_adjustment_get_upper and
gtk_adjustment_get_page_size.
(handle_one_xevent): Use gtk_widget_get_mapped.
(x_term_init): Remove HAVE_GTK_MULTIDISPLAY and associated error
messages.
* xmenu.c (create_and_show_popup_menu): Call gtk_widget_get_mapped.
* gtkutil.h: Replace HAVE_GTK_FILE_BOTH with
HAVE_GTK_FILE_SELECTION_NEW.
* gtkutil.c (xg_display_open, xg_display_close): Remove
HAVE_GTK_MULTIDISPLAY, it is always defined.
(xg_display_open): Return type is void.
(gtk_widget_set_has_window)
(gtk_dialog_get_action_area, gtk_dialog_get_content_area)
(gtk_widget_get_sensitive, gtk_adjustment_set_page_size)
(gtk_adjustment_set_page_increment)
(gtk_adjustment_get_step_increment): #define these if not found
by configure.
(remove_submenu): New define based on Gtk+ version.
(xg_set_cursor, xg_frame_resized, xg_event_is_for_scrollbar): Use
gtk_widget_get_window.
(xg_frame_resized, xg_update_frame_menubar): Use gtk_widget_get_mapped.
(xg_create_frame_widgets): Use gtk_widget_set_has_window.
(create_dialog): Use gtk_dialog_get_action_area and
gtk_dialog_get_content_area.
(xg_uses_old_file_dialog, xg_get_file_name): Remove HAVE_GTK_FILE_BOTH
and HAVE_GTK_FILE_CHOOSER_DIALOG_NEW. File chooser is always
available, so checking for HAVE_GTK_FILE_SELECTION_NEW is enough.
(xg_update_menubar, xg_update_submenu, xg_show_toolbar_item): Use
g_object_ref and g_object_unref.
(xg_update_menu_item, xg_tool_bar_menu_proxy): Use
gtk_widget_get_sensitive.
(xg_update_submenu): Use remove_submenu.
(xg_update_scrollbar_pos): Don't use GtkFixedChild, use child
properties instead to get old x and y position.
(xg_set_toolkit_scroll_bar_thumb): Use gtk_adjustment_get_page_size,
gtk_adjustment_get_step_increment, gtk_adjustment_set_page_size,
gtk_adjustment_set_step_increment and gtk_adjustment_set_page_increment.
(xg_get_tool_bar_widgets): New function.
(xg_tool_bar_menu_proxy, xg_show_toolbar_item)
(update_frame_tool_bar): Call xg_get_tool_bar_widgets.
(toolbar_set_orientation): New #define based on if configure
finds gtk_orientable_set_orientation.
(xg_create_tool_bar): Call toolbar_set_orientation.
(xg_make_tool_item, xg_show_toolbar_item): Call gtk_box_pack_start
instead of gtk_box_pack_start_defaults.
2010-06-28 10:11:26 +00:00
|
|
|
|
USE_X_TOOLKIT=none ;;
|
1996-01-09 22:56:20 +00:00
|
|
|
|
no ) USE_X_TOOLKIT=none ;;
|
2007-06-08 03:46:32 +00:00
|
|
|
|
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.
|
2008-02-06 07:57:33 +00:00
|
|
|
|
* ) USE_X_TOOLKIT=maybe ;;
|
1994-08-26 14:57:46 +00:00
|
|
|
|
esac
|
|
|
|
|
;;
|
2012-09-01 06:38:52 +00:00
|
|
|
|
nextstep )
|
|
|
|
|
term_header=nsterm.h
|
1994-08-26 14:57:46 +00:00
|
|
|
|
;;
|
2012-09-17 11:55:02 +00:00
|
|
|
|
w32 )
|
|
|
|
|
term_header=w32term.h
|
|
|
|
|
;;
|
Introduce Pure GTK3 port
* src/xsettings.h:
* src/xsettings.c:
(dpyinfo_valid, store_tool_bar_style_changed)
(XSETTINGS_FONT_NAME, get_prop_window, read_settings)
(apply_xft_settings, read_and_apply_settings)
(xft_settings_event, init_xsettings, xsettings_initialize):
* src/xfaces.c:
(x_create_gc, x_free_gc):
* src/xdisp.c (redisplay_tool_bar, redisplay_internal)
(draw_glyphs_debug, draw_glyphs, mouse_face_from_buffer_pos)
(note_mouse_highlight):
* src/terminal.c (Fterminal_live_p):
* src/termhooks.h (enum output_method, GCALIGNED_STRUCT)
(TERMINAL_FONT_CACHE):
* src/process.c (wait_reading_process_output):
* src/pgtkterm.h:
* src/pgtkterm.c:
* src/pgtkselect.h:
* src/pgtkselect.c:
* src/pgtkgui.h:
* src/pgtkfns.c:
* src/image.c:
(XGetPixel, XPutPixel, image_create_bitmap_from_data)
(image_create_bitmap_from_file, free_bitmap_record)
(image_destroy_x_image, gui_put_x_image, image_get_x_image)
(Create_Pixmap_From_Bitmap_Data, xbm_load_image, )
(xpm_load_image, lookup_rgb_color, image_disable_image)
(image_build_heuristic_mask, imagemagick_load_image):
* src/gtkutil.h:
* src/gtkutil.c (PGTK_TRACE, xg_set_screen, xg_display_open)
(xg_display_close, xg_create_default_cursor)
(xg_get_pixbuf_from_pix_and_mask, xg_check_special_colors)
(qttip_cb, hierarchy_ch_cb, xg_prepare_tooltip, )
(xg_show_tooltip, xg_hide_tooltip, xg_frame_resized)
(xg_frame_set_char_size, xg_height_or_width_changed)
(xg_set_widget_bg, style_changed_cb, xg_create_frame_widgets)
(xg_free_frame_widgets, x_wm_set_size_hint, xg_frame_restack)
(xg_mark_data, xg_update_frame_menubar, free_frame_menubar)
(xg_update_submenu, xg_finish_scroll_bar_creation)
(xg_update_scrollbar_pos, xg_update_horizontal_scrollbar_pos)
(xg_set_toolkit_scroll_bar_thumb, xg_event_is_for_scrollbar)
(draw_page, xg_pack_tool_bar, xg_create_tool_bar)
(xg_update_tool_bar_sizes, update_frame_tool_bar)
(free_frame_tool_bar, xg_change_toolbar_position):
* src/ftcrfont.c:
(ftcrfont_draw):
* src/fringe.c:
(init_fringe_bitmap):
* src/frame.h (GCALIGNED_STRUCT, FRAME_WINDOW_P):
* src/frame.c (Fframep):
* src/font.h:
* src/font.c (syms_of_font):
* src/emacsgtkfixed.c:
(emacs_fixed_get_preferred_width)
(emacs_fixed_get_preferred_height, XSetWMSizeHints):
* src/emacs.c (main):
* src/dispnew.c (init_display_interactive):
* src/dispextern.h:
* src/alloc.c:
(garbage_collect):
* src/Makefile.in (PGTK_OBJ, PGTK_LIBS, base_obj, LIBES):
* src/.gdbinit:
* lisp/url/url-privacy.el (url-setup-privacy-info):
* lisp/term/pgtk-win.el (featurep):
* lisp/startup.el (command-line, fancy-splash-frame):
* lisp/net/eww.el (eww-form-submit, eww-form-file)
(eww-form-checkbox, eww-form-select):
* lisp/mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event):
* lisp/loadup.el (featurep):
* lisp/international/mule-cmds.el (set-coding-system-map):
* lisp/frame.el (pgtk-frame-geometry, frame-geometry)
(w32-frame-edges, frame-edges)
(pgtk-mouse-absolute-pixel-position)
(mouse-absolute-pixel-position)
(pgtk-set-mouse-absolute-pixel-position)
(pgtk-frame-list-z-order, frame-list-z-order)
(pgtk-frame-restack, frame-restack, display-mouse-p)
(display-graphic-p, display-symbol-keys-p, )
(display-pixel-height, display-mm-height, display-mm-width)
(display-backing-store, display-save-under, display-color-cells)
(display-planes, display-visual-class)
(pgtk-display-monitor-attributes-list)
(display-monitor-attributes-list):
* lisp/faces.el (face-spec-set-match-display, tool-bar):
* lisp/cus-edit.el (custom-button, custom-button-mouse)
(custom-button-pressed, custom-display):
* configure.ac (AUTO_DEPEND, XARGS_LIMIT, XWIDGETS_OBJ):
2017-10-28 07:16:29 +00:00
|
|
|
|
pgtk )
|
|
|
|
|
term_header=pgtkterm.h
|
|
|
|
|
with_gtk3=yes
|
|
|
|
|
USE_X_TOOLKIT=none
|
|
|
|
|
;;
|
1994-08-26 14:57:46 +00:00
|
|
|
|
esac
|
|
|
|
|
|
2007-06-20 19:38:28 +00:00
|
|
|
|
if test "$window_system" = none && test "X$with_x" != "Xno"; then
|
|
|
|
|
AC_CHECK_PROG(HAVE_XSERVER, X, true, false)
|
|
|
|
|
if test "$HAVE_XSERVER" = true ||
|
2007-12-02 15:46:00 +00:00
|
|
|
|
test -n "$DISPLAY" ||
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
|
{
|
|
|
|
|
for emacs_libX11 in /usr/lib/libX11.*; do break; done
|
|
|
|
|
test "$emacs_libX11" != '/usr/lib/libX11.*'
|
|
|
|
|
}
|
|
|
|
|
then
|
2007-06-20 19:38:28 +00:00
|
|
|
|
AC_MSG_ERROR([You seem to be running X, but no X development libraries
|
2007-06-21 06:53:24 +00:00
|
|
|
|
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
|
2007-06-20 19:38:28 +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?
|
1994-08-26 14:57:46 +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;]])],
|
2015-12-17 18:09:02 +00:00
|
|
|
|
[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-05-18 02:30:13 +00:00
|
|
|
|
|
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=
|
2016-11-08 17:48:53 +00:00
|
|
|
|
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
|
|
|
|
|
2019-02-01 21:03:18 +00:00
|
|
|
|
test $with_unexec = yes &&
|
2010-06-30 02:48:54 +00:00
|
|
|
|
case "$opsys" in
|
|
|
|
|
## darwin ld insists on the use of malloc routines in the System framework.
|
2020-08-06 00:36:50 +00:00
|
|
|
|
darwin | mingw32 | nacl | solaris) ;;
|
2017-11-30 23:22:46 +00:00
|
|
|
|
cygwin | qnxnto | freebsd)
|
2017-10-24 19:54:28 +00:00
|
|
|
|
hybrid_malloc=yes
|
2016-11-13 02:45:24 +00:00
|
|
|
|
system_malloc= ;;
|
2016-11-08 17:48:53 +00:00
|
|
|
|
*) test "$ac_cv_func_sbrk" = yes && system_malloc=$emacs_cv_sanitize_address;;
|
2010-06-30 02:48:54 +00:00
|
|
|
|
esac
|
|
|
|
|
|
2016-01-30 22:20:56 +00:00
|
|
|
|
if test "${system_malloc}" != yes && test "${doug_lea_malloc}" != yes \
|
2016-01-30 22:20:57 +00:00
|
|
|
|
&& test "${UNEXEC_OBJ}" = unexelf.o; then
|
2016-01-30 22:20:56 +00:00
|
|
|
|
hybrid_malloc=yes
|
|
|
|
|
fi
|
|
|
|
|
|
2013-11-07 05:31:04 +00:00
|
|
|
|
GMALLOC_OBJ=
|
2016-01-30 22:20:57 +00:00
|
|
|
|
HYBRID_MALLOC=
|
1997-04-11 08:24:41 +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.])
|
1994-08-26 14:57:46 +00:00
|
|
|
|
GNU_MALLOC=no
|
|
|
|
|
GNU_MALLOC_reason="
|
1997-04-09 03:52:47 +00:00
|
|
|
|
(The GNU allocators don't work with this system configuration.)"
|
2010-05-18 02:30:13 +00:00
|
|
|
|
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.])
|
2016-01-30 22:20:57 +00:00
|
|
|
|
HYBRID_MALLOC=1
|
2016-07-14 08:26:24 +00:00
|
|
|
|
GNU_MALLOC=no
|
|
|
|
|
GNU_MALLOC_reason=" (only before dumping)"
|
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
|
|
|
|
GMALLOC_OBJ=gmalloc.o
|
|
|
|
|
VMLIMIT_OBJ=
|
2010-05-18 02:30:13 +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
|
1994-08-26 14:57:46 +00:00
|
|
|
|
fi
|
2016-01-30 22:20:57 +00:00
|
|
|
|
AC_SUBST([HYBRID_MALLOC])
|
2010-05-18 02:30:13 +00:00
|
|
|
|
AC_SUBST(GMALLOC_OBJ)
|
|
|
|
|
AC_SUBST(VMLIMIT_OBJ)
|
|
|
|
|
|
2016-01-30 22:20:56 +00:00
|
|
|
|
if test "$doug_lea_malloc" = "yes" && test "$hybrid_malloc" != yes; then
|
1997-04-11 08:24:41 +00:00
|
|
|
|
if test "$GNU_MALLOC" = yes ; then
|
|
|
|
|
GNU_MALLOC_reason="
|
1997-06-30 02:26:51 +00:00
|
|
|
|
(Using Doug Lea's new malloc from the GNU C Library.)"
|
1997-04-11 08:24:41 +00:00
|
|
|
|
fi
|
2002-04-14 01:40:58 +00:00
|
|
|
|
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-05-18 02:44:07 +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-05-18 02:44:07 +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-05-18 02:44:07 +00:00
|
|
|
|
esac
|
1997-04-11 08:24:41 +00:00
|
|
|
|
fi
|
1994-08-26 14:57:46 +00:00
|
|
|
|
|
|
|
|
|
if test x"${REL_ALLOC}" = x; then
|
|
|
|
|
REL_ALLOC=${GNU_MALLOC}
|
|
|
|
|
fi
|
|
|
|
|
|
2010-06-30 02:48:54 +00:00
|
|
|
|
use_mmap_for_buffers=no
|
|
|
|
|
case "$opsys" in
|
2016-10-24 16:41:07 +00:00
|
|
|
|
mingw32) use_mmap_for_buffers=yes ;;
|
2010-06-30 02:48:54 +00:00
|
|
|
|
esac
|
2000-09-06 21:23:55 +00:00
|
|
|
|
|
|
|
|
|
AC_FUNC_MMAP
|
2000-09-14 15:11:53 +00:00
|
|
|
|
if test $use_mmap_for_buffers = yes; then
|
2010-06-30 02:48:54 +00:00
|
|
|
|
AC_DEFINE(USE_MMAP_FOR_BUFFERS, 1, [Define to use mmap to allocate buffer text.])
|
2000-09-14 15:11:53 +00:00
|
|
|
|
REL_ALLOC=no
|
2000-09-06 21:23:55 +00:00
|
|
|
|
fi
|
|
|
|
|
|
2010-05-10 02:16:09 +00:00
|
|
|
|
LIBS="$LIBS_SYSTEM $LIBS"
|
1994-08-26 14:57:46 +00:00
|
|
|
|
|
|
|
|
|
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=
|
2012-05-28 00:46:33 +00:00
|
|
|
|
AC_CHECK_HEADERS_ONCE(pthread.h)
|
2015-03-19 21:14:07 +00:00
|
|
|
|
if test "$ac_cv_header_pthread_h" && test "$opsys" != "mingw32"; then
|
|
|
|
|
AC_CACHE_CHECK([for pthread library],
|
|
|
|
|
[emacs_cv_pthread_lib],
|
|
|
|
|
[emacs_cv_pthread_lib=no
|
|
|
|
|
OLD_LIBS=$LIBS
|
|
|
|
|
for emacs_pthread_lib in 'none needed' -lpthread; do
|
|
|
|
|
case $emacs_pthread_lib in
|
|
|
|
|
-*) LIBS="$OLD_LIBS $emacs_pthread_lib";;
|
|
|
|
|
esac
|
|
|
|
|
AC_LINK_IFELSE(
|
|
|
|
|
[AC_LANG_PROGRAM(
|
|
|
|
|
[[#include <pthread.h>
|
|
|
|
|
#include <signal.h>
|
|
|
|
|
sigset_t old_mask, new_mask;
|
|
|
|
|
void noop (void) {}]],
|
|
|
|
|
[[pthread_t th = pthread_self ();
|
|
|
|
|
int status = 0;
|
|
|
|
|
status += pthread_create (&th, 0, 0, 0);
|
|
|
|
|
status += pthread_sigmask (SIG_BLOCK, &new_mask, &old_mask);
|
|
|
|
|
status += pthread_kill (th, 0);
|
|
|
|
|
#if ! (defined SYSTEM_MALLOC || defined HYBRID_MALLOC \
|
|
|
|
|
|| defined DOUG_LEA_MALLOC)
|
|
|
|
|
/* Test for pthread_atfork only if gmalloc uses it,
|
|
|
|
|
as older-style hosts like MirBSD 10 lack it. */
|
|
|
|
|
status += pthread_atfork (noop, noop, noop);
|
|
|
|
|
#endif
|
|
|
|
|
return status;]])],
|
|
|
|
|
[emacs_cv_pthread_lib=$emacs_pthread_lib])
|
|
|
|
|
LIBS=$OLD_LIBS
|
|
|
|
|
if test "$emacs_cv_pthread_lib" != no; then
|
|
|
|
|
break
|
|
|
|
|
fi
|
2015-12-16 07:10:12 +00:00
|
|
|
|
done])
|
2015-03-19 21:14:07 +00:00
|
|
|
|
if test "$emacs_cv_pthread_lib" != no; then
|
|
|
|
|
AC_DEFINE([HAVE_PTHREAD], 1, [Define to 1 if you have POSIX threads.])
|
|
|
|
|
case $emacs_cv_pthread_lib in
|
|
|
|
|
-*) LIB_PTHREAD=$emacs_cv_pthread_lib;;
|
|
|
|
|
esac
|
|
|
|
|
ac_cv_func_pthread_sigmask=yes
|
|
|
|
|
# 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>.
|
|
|
|
|
case $opsys in
|
2020-08-06 00:36:50 +00:00
|
|
|
|
hpux* | solaris)
|
2015-03-19 21:14:07 +00:00
|
|
|
|
AC_DEFINE([_REENTRANT], 1,
|
|
|
|
|
[Define to 1 if your system requires this in multithreaded code.]);;
|
2015-03-20 01:33:59 +00:00
|
|
|
|
aix4-2)
|
2015-03-19 21:14:07 +00:00
|
|
|
|
AC_DEFINE([_THREAD_SAFE], 1,
|
|
|
|
|
[Define to 1 if your system requires this in multithreaded code.]);;
|
|
|
|
|
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
|
|
|
|
fi
|
2011-08-04 17:04:39 +00:00
|
|
|
|
fi
|
|
|
|
|
AC_SUBST([LIB_PTHREAD])
|
2010-05-10 02:16:09 +00:00
|
|
|
|
|
2013-08-26 14:46:30 +00:00
|
|
|
|
AC_MSG_CHECKING([for thread support])
|
|
|
|
|
threads_enabled=no
|
|
|
|
|
if test "$with_threads" = yes; then
|
2015-11-01 05:42:21 +00:00
|
|
|
|
if test "$emacs_cv_pthread_lib" != no; then
|
2013-08-26 14:46:30 +00:00
|
|
|
|
AC_DEFINE(THREADS_ENABLED, 1,
|
|
|
|
|
[Define to 1 if you want elisp thread support.])
|
Enable thread support in the MS-Windows build.
src/systhread.h (w32thread_critsect, w32thread_cond_t, sys_mutex_t)
(sys_cond_t, sys_thread_t) [WINDOWSNT]: New data types.
src/systhread.c (sys_mutex_init, sys_mutex_lock, sys_mutex_unlock)
(sys_mutex_destroy, sys_cond_init, sys_cond_wait)
(sys_cond_signal, sys_cond_broadcast, sys_cond_destroy)
(sys_thread_self, sys_thread_equal, w32_beginthread_wrapper)
(sys_thread_create, sys_thread_yield) [WINDOWSNT]: New functions.
configure.ac (THREADS_ENABLED): Enable threads for MinGW, even
if pthreads is not available.
2013-08-30 14:19:16 +00:00
|
|
|
|
threads_enabled=yes
|
|
|
|
|
elif test "${opsys}" = "mingw32"; then
|
|
|
|
|
dnl MinGW can do native Windows threads even without pthreads
|
|
|
|
|
AC_DEFINE(THREADS_ENABLED, 1,
|
|
|
|
|
[Define to 1 if you want elisp thread support.])
|
2013-08-26 14:46:30 +00:00
|
|
|
|
threads_enabled=yes
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
AC_MSG_RESULT([$threads_enabled])
|
|
|
|
|
|
2003-03-16 22:30:36 +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=])
|
2003-03-16 22:30:36 +00:00
|
|
|
|
])
|
|
|
|
|
;;
|
|
|
|
|
esac
|
1994-08-26 14:57:46 +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
|
|
|
|
# Change CFLAGS, CPPFLAGS, and LIBS temporarily so that C_SWITCH_X_SITE
|
|
|
|
|
# is for the tests that follow. We set them back later on.
|
1994-08-26 14:57:46 +00:00
|
|
|
|
|
Properly handle C_WARNINGS_SWITCH, PROFILING_CFLAGS, PROFILING_LDFLAGS
* configure.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS)
(PROFILING_LDFLAGS): Substitute, don't add them to CFLAGS/LDFLAGS.
(C_OPTIMIZE_SWITCH): Remove.
(TEMACS_LDFLAGS2): Add ${PROFILING_LDFLAGS}.
* lib-src/Makefile.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS)
(PROFILING_LDFLAGS): Set from substitution.
(BASE_CFLAGS): Add ${C_WARNINGS_SWITCH}.
(ALL_CFLAGS, CPP_CFLAGS): Add ${PROFILING_CFLAGS}.
(LINK_CFLAGS): Add ${PROFILING_LDFLAGS}.
* lwlib/Makefile.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS): Set from
substitution.
(ALL_CFLAGS): Add ${C_WARNINGS_SWITCH} and ${PROFILING_CFLAGS}.
* oldXMenu/Makefile.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS): Set from
substitution.
(ALL_CFLAGS): Add ${C_WARNINGS_SWITCH} and ${PROFILING_CFLAGS}.
* src/Makefile.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS)
(PROFILING_LDFLAGS): Set from substitution.
(ALL_CFLAGS): Add C_WARNINGS_SWITCH and PROFILING_CFLAGS, put
CFLAGS last.
2010-07-12 14:16:38 +00:00
|
|
|
|
REAL_CFLAGS="$CFLAGS"
|
2000-06-30 22:02:25 +00:00
|
|
|
|
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"
|
2000-06-30 22:02:25 +00:00
|
|
|
|
|
1994-08-26 14:57:46 +00:00
|
|
|
|
if test "${HAVE_X11}" = "yes"; then
|
|
|
|
|
DEFS="$C_SWITCH_X_SITE $DEFS"
|
1996-01-17 22:03:09 +00:00
|
|
|
|
LDFLAGS="$LDFLAGS $LD_SWITCH_X_SITE"
|
2010-06-30 02:48:54 +00:00
|
|
|
|
LIBS="-lX11 $LIBS"
|
1994-08-26 14:57:46 +00:00
|
|
|
|
CFLAGS="$C_SWITCH_X_SITE $CFLAGS"
|
2000-06-30 22:02:25 +00:00
|
|
|
|
CPPFLAGS="$C_SWITCH_X_SITE $CPPFLAGS"
|
1995-06-19 18:50:13 +00:00
|
|
|
|
|
1996-02-04 20:16:38 +00:00
|
|
|
|
# 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.
|
1996-02-04 20:16:38 +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
|
|
|
|
|
|
1996-06-22 03:44:21 +00:00
|
|
|
|
if test "${opsys}" = "gnu-linux"; then
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
AC_CACHE_CHECK([whether X on GNU/Linux needs -b to link], [emacs_cv_b_link],
|
|
|
|
|
[AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
|
2011-03-26 19:29:10 +00:00
|
|
|
|
[[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
|
1995-06-19 18:50:13 +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
|
1995-06-19 18:50:13 +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.
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
emacs_cv_b_link=no
|
1995-06-19 18:50:13 +00:00
|
|
|
|
else
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
emacs_cv_b_link=yes
|
1995-06-19 18:50:13 +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
|
|
|
|
CPPFLAGS=$OLD_CPPFLAGS
|
|
|
|
|
LIBS=$OLD_LIBS
|
1995-06-19 18:50:13 +00:00
|
|
|
|
else
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
emacs_cv_b_link=no
|
|
|
|
|
fi])
|
|
|
|
|
if test "x$emacs_cv_b_link" = xyes ; then
|
|
|
|
|
LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -b i486-linuxaout"
|
|
|
|
|
C_SWITCH_X_SITE="$C_SWITCH_X_SITE -b i486-linuxaout"
|
1995-06-19 18:50:13 +00:00
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
2000-12-19 11:26:41 +00:00
|
|
|
|
# Reportedly, some broken Solaris systems have XKBlib.h but are missing
|
|
|
|
|
# header files included from there.
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
AC_CACHE_CHECK([for Xkb], [emacs_cv_xkb],
|
|
|
|
|
[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>
|
2011-03-26 19:29:10 +00:00
|
|
|
|
#include <X11/XKBlib.h>]],
|
|
|
|
|
[[XkbDescPtr kb = XkbGetKeyboard (0, XkbAllComponentsMask, XkbUseCoreKbd);]])],
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
emacs_cv_xkb=yes, emacs_cv_xkb=no)])
|
|
|
|
|
if test $emacs_cv_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.])
|
2000-12-19 11:26:41 +00:00
|
|
|
|
fi
|
|
|
|
|
|
1994-09-13 15:46:47 +00:00
|
|
|
|
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)
|
1994-08-26 14:57:46 +00:00
|
|
|
|
fi
|
|
|
|
|
|
1995-12-25 01:23:18 +00:00
|
|
|
|
if test "${window_system}" = "x11"; then
|
1996-01-09 22:56:20 +00:00
|
|
|
|
AC_MSG_CHECKING(X11 version 6)
|
1997-12-17 13:16:22 +00:00
|
|
|
|
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
|
1995-12-25 01:23:18 +00:00
|
|
|
|
fail;
|
|
|
|
|
#endif
|
2011-03-26 19:29:10 +00:00
|
|
|
|
]])], emacs_cv_x11_version_6=yes, emacs_cv_x11_version_6=no)])
|
1997-12-17 13:16:22 +00:00
|
|
|
|
if test $emacs_cv_x11_version_6 = yes; then
|
|
|
|
|
AC_MSG_RESULT(6 or newer)
|
2002-04-14 01:40:58 +00:00
|
|
|
|
AC_DEFINE(HAVE_X11R6, 1,
|
|
|
|
|
[Define to 1 if you have the X11R6 or newer version of Xlib.])
|
2010-06-30 03:43:30 +00:00
|
|
|
|
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
|
2020-08-06 00:36:50 +00:00
|
|
|
|
solaris) : ;;
|
2010-06-30 03:43:30 +00:00
|
|
|
|
*) AC_DEFINE(HAVE_X11R6_XIM, 1,
|
|
|
|
|
[Define if you have usable X11R6-style XIM support.])
|
|
|
|
|
;;
|
|
|
|
|
esac
|
1997-12-17 13:16:22 +00:00
|
|
|
|
else
|
|
|
|
|
AC_MSG_RESULT(before 6)
|
|
|
|
|
fi
|
1995-12-25 01:23:18 +00:00
|
|
|
|
fi
|
|
|
|
|
|
1996-06-09 20:52:47 +00:00
|
|
|
|
|
2015-04-19 21:40:51 +00:00
|
|
|
|
### Use -lrsvg-2 if available, unless '--with-rsvg=no' is specified.
|
2015-04-05 16:34:07 +00:00
|
|
|
|
HAVE_RSVG=no
|
Introduce Pure GTK3 port
* src/xsettings.h:
* src/xsettings.c:
(dpyinfo_valid, store_tool_bar_style_changed)
(XSETTINGS_FONT_NAME, get_prop_window, read_settings)
(apply_xft_settings, read_and_apply_settings)
(xft_settings_event, init_xsettings, xsettings_initialize):
* src/xfaces.c:
(x_create_gc, x_free_gc):
* src/xdisp.c (redisplay_tool_bar, redisplay_internal)
(draw_glyphs_debug, draw_glyphs, mouse_face_from_buffer_pos)
(note_mouse_highlight):
* src/terminal.c (Fterminal_live_p):
* src/termhooks.h (enum output_method, GCALIGNED_STRUCT)
(TERMINAL_FONT_CACHE):
* src/process.c (wait_reading_process_output):
* src/pgtkterm.h:
* src/pgtkterm.c:
* src/pgtkselect.h:
* src/pgtkselect.c:
* src/pgtkgui.h:
* src/pgtkfns.c:
* src/image.c:
(XGetPixel, XPutPixel, image_create_bitmap_from_data)
(image_create_bitmap_from_file, free_bitmap_record)
(image_destroy_x_image, gui_put_x_image, image_get_x_image)
(Create_Pixmap_From_Bitmap_Data, xbm_load_image, )
(xpm_load_image, lookup_rgb_color, image_disable_image)
(image_build_heuristic_mask, imagemagick_load_image):
* src/gtkutil.h:
* src/gtkutil.c (PGTK_TRACE, xg_set_screen, xg_display_open)
(xg_display_close, xg_create_default_cursor)
(xg_get_pixbuf_from_pix_and_mask, xg_check_special_colors)
(qttip_cb, hierarchy_ch_cb, xg_prepare_tooltip, )
(xg_show_tooltip, xg_hide_tooltip, xg_frame_resized)
(xg_frame_set_char_size, xg_height_or_width_changed)
(xg_set_widget_bg, style_changed_cb, xg_create_frame_widgets)
(xg_free_frame_widgets, x_wm_set_size_hint, xg_frame_restack)
(xg_mark_data, xg_update_frame_menubar, free_frame_menubar)
(xg_update_submenu, xg_finish_scroll_bar_creation)
(xg_update_scrollbar_pos, xg_update_horizontal_scrollbar_pos)
(xg_set_toolkit_scroll_bar_thumb, xg_event_is_for_scrollbar)
(draw_page, xg_pack_tool_bar, xg_create_tool_bar)
(xg_update_tool_bar_sizes, update_frame_tool_bar)
(free_frame_tool_bar, xg_change_toolbar_position):
* src/ftcrfont.c:
(ftcrfont_draw):
* src/fringe.c:
(init_fringe_bitmap):
* src/frame.h (GCALIGNED_STRUCT, FRAME_WINDOW_P):
* src/frame.c (Fframep):
* src/font.h:
* src/font.c (syms_of_font):
* src/emacsgtkfixed.c:
(emacs_fixed_get_preferred_width)
(emacs_fixed_get_preferred_height, XSetWMSizeHints):
* src/emacs.c (main):
* src/dispnew.c (init_display_interactive):
* src/dispextern.h:
* src/alloc.c:
(garbage_collect):
* src/Makefile.in (PGTK_OBJ, PGTK_LIBS, base_obj, LIBES):
* src/.gdbinit:
* lisp/url/url-privacy.el (url-setup-privacy-info):
* lisp/term/pgtk-win.el (featurep):
* lisp/startup.el (command-line, fancy-splash-frame):
* lisp/net/eww.el (eww-form-submit, eww-form-file)
(eww-form-checkbox, eww-form-select):
* lisp/mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event):
* lisp/loadup.el (featurep):
* lisp/international/mule-cmds.el (set-coding-system-map):
* lisp/frame.el (pgtk-frame-geometry, frame-geometry)
(w32-frame-edges, frame-edges)
(pgtk-mouse-absolute-pixel-position)
(mouse-absolute-pixel-position)
(pgtk-set-mouse-absolute-pixel-position)
(pgtk-frame-list-z-order, frame-list-z-order)
(pgtk-frame-restack, frame-restack, display-mouse-p)
(display-graphic-p, display-symbol-keys-p, )
(display-pixel-height, display-mm-height, display-mm-width)
(display-backing-store, display-save-under, display-color-cells)
(display-planes, display-visual-class)
(pgtk-display-monitor-attributes-list)
(display-monitor-attributes-list):
* lisp/faces.el (face-spec-set-match-display, tool-bar):
* lisp/cus-edit.el (custom-button, custom-button-mouse)
(custom-button-pressed, custom-display):
* configure.ac (AUTO_DEPEND, XARGS_LIMIT, XWIDGETS_OBJ):
2017-10-28 07:16:29 +00:00
|
|
|
|
if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${window_system}" = "pgtk" || test "${opsys}" = "mingw32"; then
|
2015-04-05 16:34:07 +00:00
|
|
|
|
if test "${with_rsvg}" != "no"; then
|
2019-07-12 00:03:39 +00:00
|
|
|
|
RSVG_REQUIRED=2.14.0
|
2015-04-05 16:34:07 +00:00
|
|
|
|
RSVG_MODULE="librsvg-2.0 >= $RSVG_REQUIRED"
|
|
|
|
|
|
|
|
|
|
EMACS_CHECK_MODULES([RSVG], [$RSVG_MODULE])
|
|
|
|
|
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"
|
|
|
|
|
# Windows loads librsvg dynamically
|
|
|
|
|
if test "${opsys}" = "mingw32"; then
|
2015-04-19 21:40:51 +00:00
|
|
|
|
RSVG_LIBS=
|
2015-04-05 16:34:07 +00:00
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
2010-04-02 21:09:13 +00:00
|
|
|
|
HAVE_IMAGEMAGICK=no
|
Introduce Pure GTK3 port
* src/xsettings.h:
* src/xsettings.c:
(dpyinfo_valid, store_tool_bar_style_changed)
(XSETTINGS_FONT_NAME, get_prop_window, read_settings)
(apply_xft_settings, read_and_apply_settings)
(xft_settings_event, init_xsettings, xsettings_initialize):
* src/xfaces.c:
(x_create_gc, x_free_gc):
* src/xdisp.c (redisplay_tool_bar, redisplay_internal)
(draw_glyphs_debug, draw_glyphs, mouse_face_from_buffer_pos)
(note_mouse_highlight):
* src/terminal.c (Fterminal_live_p):
* src/termhooks.h (enum output_method, GCALIGNED_STRUCT)
(TERMINAL_FONT_CACHE):
* src/process.c (wait_reading_process_output):
* src/pgtkterm.h:
* src/pgtkterm.c:
* src/pgtkselect.h:
* src/pgtkselect.c:
* src/pgtkgui.h:
* src/pgtkfns.c:
* src/image.c:
(XGetPixel, XPutPixel, image_create_bitmap_from_data)
(image_create_bitmap_from_file, free_bitmap_record)
(image_destroy_x_image, gui_put_x_image, image_get_x_image)
(Create_Pixmap_From_Bitmap_Data, xbm_load_image, )
(xpm_load_image, lookup_rgb_color, image_disable_image)
(image_build_heuristic_mask, imagemagick_load_image):
* src/gtkutil.h:
* src/gtkutil.c (PGTK_TRACE, xg_set_screen, xg_display_open)
(xg_display_close, xg_create_default_cursor)
(xg_get_pixbuf_from_pix_and_mask, xg_check_special_colors)
(qttip_cb, hierarchy_ch_cb, xg_prepare_tooltip, )
(xg_show_tooltip, xg_hide_tooltip, xg_frame_resized)
(xg_frame_set_char_size, xg_height_or_width_changed)
(xg_set_widget_bg, style_changed_cb, xg_create_frame_widgets)
(xg_free_frame_widgets, x_wm_set_size_hint, xg_frame_restack)
(xg_mark_data, xg_update_frame_menubar, free_frame_menubar)
(xg_update_submenu, xg_finish_scroll_bar_creation)
(xg_update_scrollbar_pos, xg_update_horizontal_scrollbar_pos)
(xg_set_toolkit_scroll_bar_thumb, xg_event_is_for_scrollbar)
(draw_page, xg_pack_tool_bar, xg_create_tool_bar)
(xg_update_tool_bar_sizes, update_frame_tool_bar)
(free_frame_tool_bar, xg_change_toolbar_position):
* src/ftcrfont.c:
(ftcrfont_draw):
* src/fringe.c:
(init_fringe_bitmap):
* src/frame.h (GCALIGNED_STRUCT, FRAME_WINDOW_P):
* src/frame.c (Fframep):
* src/font.h:
* src/font.c (syms_of_font):
* src/emacsgtkfixed.c:
(emacs_fixed_get_preferred_width)
(emacs_fixed_get_preferred_height, XSetWMSizeHints):
* src/emacs.c (main):
* src/dispnew.c (init_display_interactive):
* src/dispextern.h:
* src/alloc.c:
(garbage_collect):
* src/Makefile.in (PGTK_OBJ, PGTK_LIBS, base_obj, LIBES):
* src/.gdbinit:
* lisp/url/url-privacy.el (url-setup-privacy-info):
* lisp/term/pgtk-win.el (featurep):
* lisp/startup.el (command-line, fancy-splash-frame):
* lisp/net/eww.el (eww-form-submit, eww-form-file)
(eww-form-checkbox, eww-form-select):
* lisp/mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event):
* lisp/loadup.el (featurep):
* lisp/international/mule-cmds.el (set-coding-system-map):
* lisp/frame.el (pgtk-frame-geometry, frame-geometry)
(w32-frame-edges, frame-edges)
(pgtk-mouse-absolute-pixel-position)
(mouse-absolute-pixel-position)
(pgtk-set-mouse-absolute-pixel-position)
(pgtk-frame-list-z-order, frame-list-z-order)
(pgtk-frame-restack, frame-restack, display-mouse-p)
(display-graphic-p, display-symbol-keys-p, )
(display-pixel-height, display-mm-height, display-mm-width)
(display-backing-store, display-save-under, display-color-cells)
(display-planes, display-visual-class)
(pgtk-display-monitor-attributes-list)
(display-monitor-attributes-list):
* lisp/faces.el (face-spec-set-match-display, tool-bar):
* lisp/cus-edit.el (custom-button, custom-button-mouse)
(custom-button-pressed, custom-display):
* configure.ac (AUTO_DEPEND, XARGS_LIMIT, XWIDGETS_OBJ):
2017-10-28 07:16:29 +00:00
|
|
|
|
if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${window_system}" = "pgtk" || test "${HAVE_W32}" = "yes"; then
|
2010-09-29 18:52:34 +00:00
|
|
|
|
if test "${with_imagemagick}" != "no"; then
|
2018-01-09 23:47:56 +00:00
|
|
|
|
if test -n "$BREW"; then
|
|
|
|
|
# Homebrew doesn't link ImageMagick 6 by default, so make sure
|
|
|
|
|
# pkgconfig can find it.
|
|
|
|
|
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH$PATH_SEPARATOR`$BREW --prefix imagemagick@6 2>/dev/null`/lib/pkgconfig"
|
|
|
|
|
fi
|
|
|
|
|
|
2018-08-30 17:56:08 +00:00
|
|
|
|
EMACS_CHECK_MODULES([IMAGEMAGICK], [MagickWand >= 7])
|
|
|
|
|
if test $HAVE_IMAGEMAGICK = yes; then
|
2018-08-28 02:03:25 +00:00
|
|
|
|
AC_DEFINE([HAVE_IMAGEMAGICK7], 1, [Define to 1 if using ImageMagick7.])
|
|
|
|
|
else
|
|
|
|
|
## 6.3.5 is the earliest version known to work; see Bug#17339.
|
|
|
|
|
## 6.8.2 makes Emacs crash; see Bug#13867.
|
|
|
|
|
EMACS_CHECK_MODULES([IMAGEMAGICK], [Wand >= 6.3.5 Wand != 6.8.2])
|
|
|
|
|
fi
|
2011-01-22 00:12:10 +00:00
|
|
|
|
|
Introduce Pure GTK3 port
* src/xsettings.h:
* src/xsettings.c:
(dpyinfo_valid, store_tool_bar_style_changed)
(XSETTINGS_FONT_NAME, get_prop_window, read_settings)
(apply_xft_settings, read_and_apply_settings)
(xft_settings_event, init_xsettings, xsettings_initialize):
* src/xfaces.c:
(x_create_gc, x_free_gc):
* src/xdisp.c (redisplay_tool_bar, redisplay_internal)
(draw_glyphs_debug, draw_glyphs, mouse_face_from_buffer_pos)
(note_mouse_highlight):
* src/terminal.c (Fterminal_live_p):
* src/termhooks.h (enum output_method, GCALIGNED_STRUCT)
(TERMINAL_FONT_CACHE):
* src/process.c (wait_reading_process_output):
* src/pgtkterm.h:
* src/pgtkterm.c:
* src/pgtkselect.h:
* src/pgtkselect.c:
* src/pgtkgui.h:
* src/pgtkfns.c:
* src/image.c:
(XGetPixel, XPutPixel, image_create_bitmap_from_data)
(image_create_bitmap_from_file, free_bitmap_record)
(image_destroy_x_image, gui_put_x_image, image_get_x_image)
(Create_Pixmap_From_Bitmap_Data, xbm_load_image, )
(xpm_load_image, lookup_rgb_color, image_disable_image)
(image_build_heuristic_mask, imagemagick_load_image):
* src/gtkutil.h:
* src/gtkutil.c (PGTK_TRACE, xg_set_screen, xg_display_open)
(xg_display_close, xg_create_default_cursor)
(xg_get_pixbuf_from_pix_and_mask, xg_check_special_colors)
(qttip_cb, hierarchy_ch_cb, xg_prepare_tooltip, )
(xg_show_tooltip, xg_hide_tooltip, xg_frame_resized)
(xg_frame_set_char_size, xg_height_or_width_changed)
(xg_set_widget_bg, style_changed_cb, xg_create_frame_widgets)
(xg_free_frame_widgets, x_wm_set_size_hint, xg_frame_restack)
(xg_mark_data, xg_update_frame_menubar, free_frame_menubar)
(xg_update_submenu, xg_finish_scroll_bar_creation)
(xg_update_scrollbar_pos, xg_update_horizontal_scrollbar_pos)
(xg_set_toolkit_scroll_bar_thumb, xg_event_is_for_scrollbar)
(draw_page, xg_pack_tool_bar, xg_create_tool_bar)
(xg_update_tool_bar_sizes, update_frame_tool_bar)
(free_frame_tool_bar, xg_change_toolbar_position):
* src/ftcrfont.c:
(ftcrfont_draw):
* src/fringe.c:
(init_fringe_bitmap):
* src/frame.h (GCALIGNED_STRUCT, FRAME_WINDOW_P):
* src/frame.c (Fframep):
* src/font.h:
* src/font.c (syms_of_font):
* src/emacsgtkfixed.c:
(emacs_fixed_get_preferred_width)
(emacs_fixed_get_preferred_height, XSetWMSizeHints):
* src/emacs.c (main):
* src/dispnew.c (init_display_interactive):
* src/dispextern.h:
* src/alloc.c:
(garbage_collect):
* src/Makefile.in (PGTK_OBJ, PGTK_LIBS, base_obj, LIBES):
* src/.gdbinit:
* lisp/url/url-privacy.el (url-setup-privacy-info):
* lisp/term/pgtk-win.el (featurep):
* lisp/startup.el (command-line, fancy-splash-frame):
* lisp/net/eww.el (eww-form-submit, eww-form-file)
(eww-form-checkbox, eww-form-select):
* lisp/mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event):
* lisp/loadup.el (featurep):
* lisp/international/mule-cmds.el (set-coding-system-map):
* lisp/frame.el (pgtk-frame-geometry, frame-geometry)
(w32-frame-edges, frame-edges)
(pgtk-mouse-absolute-pixel-position)
(mouse-absolute-pixel-position)
(pgtk-set-mouse-absolute-pixel-position)
(pgtk-frame-list-z-order, frame-list-z-order)
(pgtk-frame-restack, frame-restack, display-mouse-p)
(display-graphic-p, display-symbol-keys-p, )
(display-pixel-height, display-mm-height, display-mm-width)
(display-backing-store, display-save-under, display-color-cells)
(display-planes, display-visual-class)
(pgtk-display-monitor-attributes-list)
(display-monitor-attributes-list):
* lisp/faces.el (face-spec-set-match-display, tool-bar):
* lisp/cus-edit.el (custom-button, custom-button-mouse)
(custom-button-pressed, custom-display):
* configure.ac (AUTO_DEPEND, XARGS_LIMIT, XWIDGETS_OBJ):
2017-10-28 07:16:29 +00:00
|
|
|
|
if test $HAVE_IMAGEMAGICK != yes; then
|
|
|
|
|
IMAGEMAGICK_MODULE="MagickWand-6.Q16HDRI >= 6.3.5 MagickWand-6.Q16HDRI != 6.8.2 MagickWand-6.Q16HDRI < 7 MagickCore-6.Q16HDRI >= 6.9.9 MagickCore-6.Q16HDRI < 7"
|
|
|
|
|
EMACS_CHECK_MODULES([IMAGEMAGICK], [$IMAGEMAGICK_MODULE])
|
|
|
|
|
fi
|
|
|
|
|
|
2010-09-29 18:52:34 +00:00
|
|
|
|
if test $HAVE_IMAGEMAGICK = yes; 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_CFLAGS=$CFLAGS
|
|
|
|
|
OLD_LIBS=$LIBS
|
2010-09-29 18:52:34 +00:00
|
|
|
|
CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS"
|
|
|
|
|
LIBS="$IMAGEMAGICK_LIBS $LIBS"
|
2017-06-15 18:25:23 +00:00
|
|
|
|
AC_CHECK_FUNCS([MagickRelinquishMemory MagickExportImagePixels \
|
|
|
|
|
MagickMergeImageLayers MagickAutoOrientImage])
|
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
|
2017-06-15 18:25:23 +00:00
|
|
|
|
# Check that ImageMagick links. It does not link on Fedora 25
|
|
|
|
|
# with './configure CC=clang', as pkg-config outputs flags like
|
|
|
|
|
# -lomp that work for GCC but not Clang.
|
|
|
|
|
if test "$ac_cv_func_MagickRelinquishMemory" != yes; then
|
|
|
|
|
HAVE_IMAGEMAGICK=no
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
if test $HAVE_IMAGEMAGICK = yes; then
|
|
|
|
|
AC_DEFINE([HAVE_IMAGEMAGICK], 1, [Define to 1 if using ImageMagick.])
|
|
|
|
|
else
|
2019-09-24 17:01:51 +00:00
|
|
|
|
if test "${with_imagemagick}" != "no"; then
|
|
|
|
|
AC_MSG_ERROR([ImageMagick wanted, but it does not compile. Maybe some library files are missing?]);
|
|
|
|
|
fi
|
2017-06-15 18:25:23 +00:00
|
|
|
|
IMAGEMAGICK_CFLAGS=
|
|
|
|
|
IMAGEMAGICK_LIBS=
|
2010-09-29 18:52:34 +00:00
|
|
|
|
fi
|
2017-06-15 18:25:23 +00:00
|
|
|
|
AC_SUBST([IMAGEMAGICK_CFLAGS])
|
|
|
|
|
AC_SUBST([IMAGEMAGICK_LIBS])
|
2010-05-14 10:07:01 +00:00
|
|
|
|
fi
|
2010-04-02 21:09:13 +00:00
|
|
|
|
fi
|
2007-08-22 03:56:20 +00:00
|
|
|
|
|
2016-02-01 03:53:27 +00:00
|
|
|
|
AC_CHECK_LIB(anl, getaddrinfo_a, HAVE_GETADDRINFO_A=yes)
|
|
|
|
|
if test "${HAVE_GETADDRINFO_A}" = "yes"; then
|
|
|
|
|
AC_DEFINE(HAVE_GETADDRINFO_A, 1,
|
|
|
|
|
[Define to 1 if you have getaddrinfo_a for asynchronous DNS resolution.])
|
|
|
|
|
GETADDRINFO_A_LIBS="-lanl"
|
|
|
|
|
AC_SUBST(GETADDRINFO_A_LIBS)
|
|
|
|
|
fi
|
2007-08-22 03:56:20 +00:00
|
|
|
|
|
2003-01-19 21:50:03 +00:00
|
|
|
|
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
|
2019-04-08 01:02:03 +00:00
|
|
|
|
GLIB_REQUIRED=2.37.5
|
|
|
|
|
GTK_REQUIRED=3.10
|
2012-11-23 15:22:47 +00:00
|
|
|
|
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
|
2019-07-17 16:07:36 +00:00
|
|
|
|
if test "$window_system" = pgtk; then
|
|
|
|
|
GLIB_GSETTINGS
|
|
|
|
|
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
|
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
* configure.in: Add --with-x-toolkit=gtk3. Remove HAVE_GTK_MULTIDISPLAY,
check for gtk_file_chooser_dialog_new, and HAVE_GTK_FILE_BOTH (implied
by minimum required Gtk+ 2.6). Add checks for functions introduced
in Gtk+ 2.14 or newer.
* xterm.h (gtk_widget_get_window, gtk_widget_get_mapped)
(gtk_adjustment_get_page_size, gtk_adjustment_get_upper): New
defines based on what configure finds.
* xterm.c (XTflash): Use gtk_widget_get_window.
(xg_scroll_callback): Use gtk_adjustment_get_upper and
gtk_adjustment_get_page_size.
(handle_one_xevent): Use gtk_widget_get_mapped.
(x_term_init): Remove HAVE_GTK_MULTIDISPLAY and associated error
messages.
* xmenu.c (create_and_show_popup_menu): Call gtk_widget_get_mapped.
* gtkutil.h: Replace HAVE_GTK_FILE_BOTH with
HAVE_GTK_FILE_SELECTION_NEW.
* gtkutil.c (xg_display_open, xg_display_close): Remove
HAVE_GTK_MULTIDISPLAY, it is always defined.
(xg_display_open): Return type is void.
(gtk_widget_set_has_window)
(gtk_dialog_get_action_area, gtk_dialog_get_content_area)
(gtk_widget_get_sensitive, gtk_adjustment_set_page_size)
(gtk_adjustment_set_page_increment)
(gtk_adjustment_get_step_increment): #define these if not found
by configure.
(remove_submenu): New define based on Gtk+ version.
(xg_set_cursor, xg_frame_resized, xg_event_is_for_scrollbar): Use
gtk_widget_get_window.
(xg_frame_resized, xg_update_frame_menubar): Use gtk_widget_get_mapped.
(xg_create_frame_widgets): Use gtk_widget_set_has_window.
(create_dialog): Use gtk_dialog_get_action_area and
gtk_dialog_get_content_area.
(xg_uses_old_file_dialog, xg_get_file_name): Remove HAVE_GTK_FILE_BOTH
and HAVE_GTK_FILE_CHOOSER_DIALOG_NEW. File chooser is always
available, so checking for HAVE_GTK_FILE_SELECTION_NEW is enough.
(xg_update_menubar, xg_update_submenu, xg_show_toolbar_item): Use
g_object_ref and g_object_unref.
(xg_update_menu_item, xg_tool_bar_menu_proxy): Use
gtk_widget_get_sensitive.
(xg_update_submenu): Use remove_submenu.
(xg_update_scrollbar_pos): Don't use GtkFixedChild, use child
properties instead to get old x and y position.
(xg_set_toolkit_scroll_bar_thumb): Use gtk_adjustment_get_page_size,
gtk_adjustment_get_step_increment, gtk_adjustment_set_page_size,
gtk_adjustment_set_step_increment and gtk_adjustment_set_page_increment.
(xg_get_tool_bar_widgets): New function.
(xg_tool_bar_menu_proxy, xg_show_toolbar_item)
(update_frame_tool_bar): Call xg_get_tool_bar_widgets.
(toolbar_set_orientation): New #define based on if configure
finds gtk_orientable_set_orientation.
(xg_create_tool_bar): Call toolbar_set_orientation.
(xg_make_tool_item, xg_show_toolbar_item): Call gtk_box_pack_start
instead of gtk_box_pack_start_defaults.
2010-06-28 10:11:26 +00:00
|
|
|
|
|
2012-11-23 15:22:47 +00:00
|
|
|
|
if test "${with_gtk2}" = "yes" || test "$check_gtk2" = "yes"; then
|
2019-04-08 01:02:03 +00:00
|
|
|
|
GLIB_REQUIRED=2.28
|
|
|
|
|
GTK_REQUIRED=2.24
|
2012-11-23 15:22:47 +00:00
|
|
|
|
GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
|
2003-01-19 21:50:03 +00:00
|
|
|
|
|
2012-11-23 15:22:47 +00:00
|
|
|
|
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"
|
2007-06-08 03:46:32 +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
|
|
|
|
|
|
2007-06-08 03:46:32 +00:00
|
|
|
|
if test x"$pkg_check_gtk" = xyes; then
|
|
|
|
|
|
2003-01-19 21:50:03 +00:00
|
|
|
|
AC_SUBST(GTK_LIBS)
|
2003-11-16 16:09:07 +00:00
|
|
|
|
CFLAGS="$CFLAGS $GTK_CFLAGS"
|
|
|
|
|
LIBS="$GTK_LIBS $LIBS"
|
2006-12-19 06:48:25 +00:00
|
|
|
|
dnl Try to compile a simple GTK program.
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
AC_CACHE_CHECK([whether GTK compiles], [emacs_cv_gtk_compiles],
|
|
|
|
|
[AC_LINK_IFELSE(
|
2013-07-02 02:17:12 +00:00
|
|
|
|
[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 ();
|
|
|
|
|
]])],
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
[emacs_cv_gtk_compiles=yes], [emacs_cv_gtk_compiles=no])])
|
|
|
|
|
if test "${emacs_cv_gtk_compiles}" != "yes"; then
|
2013-06-30 15:24:14 +00:00
|
|
|
|
GTK_OBJ=
|
2007-06-08 03:46:32 +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"
|
2007-06-08 03:46:32 +00:00
|
|
|
|
HAVE_GTK=yes
|
2008-04-16 19:53:06 +00:00
|
|
|
|
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
|
2007-06-08 03:46:32 +00:00
|
|
|
|
USE_X_TOOLKIT=none
|
2015-05-07 18:09:16 +00:00
|
|
|
|
AC_MSG_WARN([[Your version of Gtk+ will have problems with
|
2008-02-27 18:32:13 +00:00
|
|
|
|
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
|
2015-05-07 18:09:16 +00:00
|
|
|
|
Emacs may crash.
|
2018-05-26 23:42:52 +00:00
|
|
|
|
See https://gitlab.gnome.org/GNOME/gtk/issues/221]])
|
2006-12-19 06:48:25 +00:00
|
|
|
|
fi
|
2007-06-08 03:46:32 +00:00
|
|
|
|
|
|
|
|
|
fi
|
2010-04-21 06:35:35 +00:00
|
|
|
|
AC_SUBST(GTK_OBJ)
|
2007-06-08 03:46:32 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if test "${HAVE_GTK}" = "yes"; then
|
2003-01-19 21:50:03 +00:00
|
|
|
|
|
2003-11-16 16:09:07 +00:00
|
|
|
|
dnl GTK scrollbars resemble toolkit scrollbars a lot, so to avoid
|
2003-01-19 21:50:03 +00:00
|
|
|
|
dnl a lot if #ifdef:s, say we have toolkit scrollbars.
|
2004-11-02 16:26:46 +00:00
|
|
|
|
if test "$with_toolkit_scroll_bars" != no; then
|
|
|
|
|
with_toolkit_scroll_bars=yes
|
|
|
|
|
fi
|
2003-11-16 16:09:07 +00:00
|
|
|
|
|
2019-04-21 02:16:20 +00:00
|
|
|
|
term_header=gtkutil.h
|
2004-12-07 08:29:07 +00:00
|
|
|
|
|
2019-04-21 02:16:20 +00:00
|
|
|
|
if test "${USE_GTK_TOOLKIT}" = GTK2; then
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
2019-04-21 02:16:20 +00:00
|
|
|
|
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
|
2012-12-30 19:08:15 +00:00
|
|
|
|
#include <gtk/gtk.h>])
|
2019-04-21 02:16:20 +00:00
|
|
|
|
if test "$HAVE_GTK_FILE_SELECTION" = yes; then
|
|
|
|
|
AC_CHECK_FUNCS(gtk_file_selection_new)
|
|
|
|
|
fi
|
2012-09-01 06:38:52 +00:00
|
|
|
|
|
2019-04-21 02:16:20 +00:00
|
|
|
|
dnl This procedure causes a bug on certain Ubuntu GTK+2 builds
|
|
|
|
|
AC_CHECK_FUNCS(gtk_window_set_has_resize_grip)
|
|
|
|
|
fi
|
2003-01-19 21:50:03 +00:00
|
|
|
|
fi
|
|
|
|
|
|
Support for the new Xwidget feature.
* configure.ac:
(HAVE_XWIDGETS, WIDGET_OBJ, EMACS_CONFIG_FEATURES):
* xterm.c (x_draw_glyph_string, x_draw_bar_cursor):
* xdisp.c:
(handle_display_spec, handle_single_display_spec, push_it)
(pop_it, set_iterator_to_next, dump_glyph)
(calc_pixel_width_or_height, fill_xwidget_glyph_string)
(BUILD_XWIDGET_GLYPH_STRING, BUILD_GLYPH_STRINGS)
(produce_xwidget_glyph, x_produce_glyphs)
(get_window_cursor_type):
* window.c (Fdelete_window_internal):
* termhooks.h (e):
* print.c (print_object):
* lisp.h (ptrdiff_t):
* keyboard.c (kbd_buffer_get_event, make_lispy_event)
(syms_of_keyboard):
* emacs.c (main):
* dispnew.c (update_window, scrolling_window):
* dispextern.h (g, i):
* Makefile.in (XWIDGETS_OBJ, WEBKIT_CFLAGS, WEBKIT_LIBS)
(GIR_LIBS, ALL_CFLAGS, base_obj, LIBES):
* keyboard.c (kbd_buffer_get_event):
* emacsgtkfixed.c (emacs_fixed_gtk_widget_size_allocate)
(emacs_fixed_class_init): Add case for an xwidget view.
* xwidget.c, xwidget.h, xwidget.el: New files for xwidgets
Co-authored-by: Grégoire Jadi <daimrod@gmail.com>
Various improvements to the Xwidget feature.
* xwidgets.c:
* emacsgtkfixed.c:
* xwidget.el:
2016-01-19 19:27:12 +00:00
|
|
|
|
|
2016-01-20 19:06:01 +00:00
|
|
|
|
dnl Enable xwidgets if GTK3 and WebKitGTK+ are available.
|
2020-08-12 10:12:34 +00:00
|
|
|
|
dnl Enable xwidgets if macOS Cocoa and WebKit framework are available.
|
Support for the new Xwidget feature.
* configure.ac:
(HAVE_XWIDGETS, WIDGET_OBJ, EMACS_CONFIG_FEATURES):
* xterm.c (x_draw_glyph_string, x_draw_bar_cursor):
* xdisp.c:
(handle_display_spec, handle_single_display_spec, push_it)
(pop_it, set_iterator_to_next, dump_glyph)
(calc_pixel_width_or_height, fill_xwidget_glyph_string)
(BUILD_XWIDGET_GLYPH_STRING, BUILD_GLYPH_STRINGS)
(produce_xwidget_glyph, x_produce_glyphs)
(get_window_cursor_type):
* window.c (Fdelete_window_internal):
* termhooks.h (e):
* print.c (print_object):
* lisp.h (ptrdiff_t):
* keyboard.c (kbd_buffer_get_event, make_lispy_event)
(syms_of_keyboard):
* emacs.c (main):
* dispnew.c (update_window, scrolling_window):
* dispextern.h (g, i):
* Makefile.in (XWIDGETS_OBJ, WEBKIT_CFLAGS, WEBKIT_LIBS)
(GIR_LIBS, ALL_CFLAGS, base_obj, LIBES):
* keyboard.c (kbd_buffer_get_event):
* emacsgtkfixed.c (emacs_fixed_gtk_widget_size_allocate)
(emacs_fixed_class_init): Add case for an xwidget view.
* xwidget.c, xwidget.h, xwidget.el: New files for xwidgets
Co-authored-by: Grégoire Jadi <daimrod@gmail.com>
Various improvements to the Xwidget feature.
* xwidgets.c:
* emacsgtkfixed.c:
* xwidget.el:
2016-01-19 19:27:12 +00:00
|
|
|
|
HAVE_XWIDGETS=no
|
|
|
|
|
XWIDGETS_OBJ=
|
2016-01-20 19:06:01 +00:00
|
|
|
|
if test "$with_xwidgets" != "no"; then
|
2020-08-12 10:12:34 +00:00
|
|
|
|
if test "$USE_GTK_TOOLKIT" = "GTK3" && test "$window_system" != "none"; then
|
|
|
|
|
WEBKIT_REQUIRED=2.12
|
|
|
|
|
WEBKIT_MODULES="webkit2gtk-4.0 >= $WEBKIT_REQUIRED"
|
|
|
|
|
EMACS_CHECK_MODULES([WEBKIT], [$WEBKIT_MODULES])
|
|
|
|
|
HAVE_XWIDGETS=$HAVE_WEBKIT
|
|
|
|
|
XWIDGETS_OBJ="xwidget.o"
|
|
|
|
|
elif test "${NS_IMPL_COCOA}" = "yes"; then
|
|
|
|
|
dnl FIXME: Check framework WebKit2
|
|
|
|
|
dnl WEBKIT_REQUIRED=M.m.p
|
|
|
|
|
WEBKIT_LIBS="-Wl,-framework -Wl,WebKit"
|
|
|
|
|
WEBKIT_CFLAGS="-I/System/Library/Frameworks/WebKit.framework/Headers"
|
|
|
|
|
HAVE_WEBKIT="yes"
|
|
|
|
|
HAVE_XWIDGETS=$HAVE_WEBKIT
|
|
|
|
|
XWIDGETS_OBJ="xwidget.o"
|
|
|
|
|
NS_OBJC_OBJ="$NS_OBJC_OBJ nsxwidget.o"
|
|
|
|
|
dnl Update NS_OBJC_OBJ with added nsxwidget.o
|
|
|
|
|
AC_SUBST(NS_OBJC_OBJ)
|
|
|
|
|
else
|
|
|
|
|
AC_MSG_ERROR([xwidgets requested, it requires GTK3 as X window toolkit or macOS Cocoa as window system.])
|
|
|
|
|
fi
|
Support for the new Xwidget feature.
* configure.ac:
(HAVE_XWIDGETS, WIDGET_OBJ, EMACS_CONFIG_FEATURES):
* xterm.c (x_draw_glyph_string, x_draw_bar_cursor):
* xdisp.c:
(handle_display_spec, handle_single_display_spec, push_it)
(pop_it, set_iterator_to_next, dump_glyph)
(calc_pixel_width_or_height, fill_xwidget_glyph_string)
(BUILD_XWIDGET_GLYPH_STRING, BUILD_GLYPH_STRINGS)
(produce_xwidget_glyph, x_produce_glyphs)
(get_window_cursor_type):
* window.c (Fdelete_window_internal):
* termhooks.h (e):
* print.c (print_object):
* lisp.h (ptrdiff_t):
* keyboard.c (kbd_buffer_get_event, make_lispy_event)
(syms_of_keyboard):
* emacs.c (main):
* dispnew.c (update_window, scrolling_window):
* dispextern.h (g, i):
* Makefile.in (XWIDGETS_OBJ, WEBKIT_CFLAGS, WEBKIT_LIBS)
(GIR_LIBS, ALL_CFLAGS, base_obj, LIBES):
* keyboard.c (kbd_buffer_get_event):
* emacsgtkfixed.c (emacs_fixed_gtk_widget_size_allocate)
(emacs_fixed_class_init): Add case for an xwidget view.
* xwidget.c, xwidget.h, xwidget.el: New files for xwidgets
Co-authored-by: Grégoire Jadi <daimrod@gmail.com>
Various improvements to the Xwidget feature.
* xwidgets.c:
* emacsgtkfixed.c:
* xwidget.el:
2016-01-19 19:27:12 +00:00
|
|
|
|
|
2016-01-20 19:06:01 +00:00
|
|
|
|
test $HAVE_XWIDGETS = yes ||
|
2020-08-12 10:12:34 +00:00
|
|
|
|
AC_MSG_ERROR([xwidgets requested but WebKitGTK+ or WebKit framework not found.])
|
Support for the new Xwidget feature.
* configure.ac:
(HAVE_XWIDGETS, WIDGET_OBJ, EMACS_CONFIG_FEATURES):
* xterm.c (x_draw_glyph_string, x_draw_bar_cursor):
* xdisp.c:
(handle_display_spec, handle_single_display_spec, push_it)
(pop_it, set_iterator_to_next, dump_glyph)
(calc_pixel_width_or_height, fill_xwidget_glyph_string)
(BUILD_XWIDGET_GLYPH_STRING, BUILD_GLYPH_STRINGS)
(produce_xwidget_glyph, x_produce_glyphs)
(get_window_cursor_type):
* window.c (Fdelete_window_internal):
* termhooks.h (e):
* print.c (print_object):
* lisp.h (ptrdiff_t):
* keyboard.c (kbd_buffer_get_event, make_lispy_event)
(syms_of_keyboard):
* emacs.c (main):
* dispnew.c (update_window, scrolling_window):
* dispextern.h (g, i):
* Makefile.in (XWIDGETS_OBJ, WEBKIT_CFLAGS, WEBKIT_LIBS)
(GIR_LIBS, ALL_CFLAGS, base_obj, LIBES):
* keyboard.c (kbd_buffer_get_event):
* emacsgtkfixed.c (emacs_fixed_gtk_widget_size_allocate)
(emacs_fixed_class_init): Add case for an xwidget view.
* xwidget.c, xwidget.h, xwidget.el: New files for xwidgets
Co-authored-by: Grégoire Jadi <daimrod@gmail.com>
Various improvements to the Xwidget feature.
* xwidgets.c:
* emacsgtkfixed.c:
* xwidget.el:
2016-01-19 19:27:12 +00:00
|
|
|
|
|
2016-01-20 19:06:01 +00:00
|
|
|
|
AC_DEFINE([HAVE_XWIDGETS], 1, [Define to 1 if you have xwidgets support.])
|
Support for the new Xwidget feature.
* configure.ac:
(HAVE_XWIDGETS, WIDGET_OBJ, EMACS_CONFIG_FEATURES):
* xterm.c (x_draw_glyph_string, x_draw_bar_cursor):
* xdisp.c:
(handle_display_spec, handle_single_display_spec, push_it)
(pop_it, set_iterator_to_next, dump_glyph)
(calc_pixel_width_or_height, fill_xwidget_glyph_string)
(BUILD_XWIDGET_GLYPH_STRING, BUILD_GLYPH_STRINGS)
(produce_xwidget_glyph, x_produce_glyphs)
(get_window_cursor_type):
* window.c (Fdelete_window_internal):
* termhooks.h (e):
* print.c (print_object):
* lisp.h (ptrdiff_t):
* keyboard.c (kbd_buffer_get_event, make_lispy_event)
(syms_of_keyboard):
* emacs.c (main):
* dispnew.c (update_window, scrolling_window):
* dispextern.h (g, i):
* Makefile.in (XWIDGETS_OBJ, WEBKIT_CFLAGS, WEBKIT_LIBS)
(GIR_LIBS, ALL_CFLAGS, base_obj, LIBES):
* keyboard.c (kbd_buffer_get_event):
* emacsgtkfixed.c (emacs_fixed_gtk_widget_size_allocate)
(emacs_fixed_class_init): Add case for an xwidget view.
* xwidget.c, xwidget.h, xwidget.el: New files for xwidgets
Co-authored-by: Grégoire Jadi <daimrod@gmail.com>
Various improvements to the Xwidget feature.
* xwidgets.c:
* emacsgtkfixed.c:
* xwidget.el:
2016-01-19 19:27:12 +00:00
|
|
|
|
fi
|
|
|
|
|
AC_SUBST(XWIDGETS_OBJ)
|
|
|
|
|
|
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
|
2011-07-12 00:34:15 +00:00
|
|
|
|
|
Introduce Pure GTK3 port
* src/xsettings.h:
* src/xsettings.c:
(dpyinfo_valid, store_tool_bar_style_changed)
(XSETTINGS_FONT_NAME, get_prop_window, read_settings)
(apply_xft_settings, read_and_apply_settings)
(xft_settings_event, init_xsettings, xsettings_initialize):
* src/xfaces.c:
(x_create_gc, x_free_gc):
* src/xdisp.c (redisplay_tool_bar, redisplay_internal)
(draw_glyphs_debug, draw_glyphs, mouse_face_from_buffer_pos)
(note_mouse_highlight):
* src/terminal.c (Fterminal_live_p):
* src/termhooks.h (enum output_method, GCALIGNED_STRUCT)
(TERMINAL_FONT_CACHE):
* src/process.c (wait_reading_process_output):
* src/pgtkterm.h:
* src/pgtkterm.c:
* src/pgtkselect.h:
* src/pgtkselect.c:
* src/pgtkgui.h:
* src/pgtkfns.c:
* src/image.c:
(XGetPixel, XPutPixel, image_create_bitmap_from_data)
(image_create_bitmap_from_file, free_bitmap_record)
(image_destroy_x_image, gui_put_x_image, image_get_x_image)
(Create_Pixmap_From_Bitmap_Data, xbm_load_image, )
(xpm_load_image, lookup_rgb_color, image_disable_image)
(image_build_heuristic_mask, imagemagick_load_image):
* src/gtkutil.h:
* src/gtkutil.c (PGTK_TRACE, xg_set_screen, xg_display_open)
(xg_display_close, xg_create_default_cursor)
(xg_get_pixbuf_from_pix_and_mask, xg_check_special_colors)
(qttip_cb, hierarchy_ch_cb, xg_prepare_tooltip, )
(xg_show_tooltip, xg_hide_tooltip, xg_frame_resized)
(xg_frame_set_char_size, xg_height_or_width_changed)
(xg_set_widget_bg, style_changed_cb, xg_create_frame_widgets)
(xg_free_frame_widgets, x_wm_set_size_hint, xg_frame_restack)
(xg_mark_data, xg_update_frame_menubar, free_frame_menubar)
(xg_update_submenu, xg_finish_scroll_bar_creation)
(xg_update_scrollbar_pos, xg_update_horizontal_scrollbar_pos)
(xg_set_toolkit_scroll_bar_thumb, xg_event_is_for_scrollbar)
(draw_page, xg_pack_tool_bar, xg_create_tool_bar)
(xg_update_tool_bar_sizes, update_frame_tool_bar)
(free_frame_tool_bar, xg_change_toolbar_position):
* src/ftcrfont.c:
(ftcrfont_draw):
* src/fringe.c:
(init_fringe_bitmap):
* src/frame.h (GCALIGNED_STRUCT, FRAME_WINDOW_P):
* src/frame.c (Fframep):
* src/font.h:
* src/font.c (syms_of_font):
* src/emacsgtkfixed.c:
(emacs_fixed_get_preferred_width)
(emacs_fixed_get_preferred_height, XSetWMSizeHints):
* src/emacs.c (main):
* src/dispnew.c (init_display_interactive):
* src/dispextern.h:
* src/alloc.c:
(garbage_collect):
* src/Makefile.in (PGTK_OBJ, PGTK_LIBS, base_obj, LIBES):
* src/.gdbinit:
* lisp/url/url-privacy.el (url-setup-privacy-info):
* lisp/term/pgtk-win.el (featurep):
* lisp/startup.el (command-line, fancy-splash-frame):
* lisp/net/eww.el (eww-form-submit, eww-form-file)
(eww-form-checkbox, eww-form-select):
* lisp/mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event):
* lisp/loadup.el (featurep):
* lisp/international/mule-cmds.el (set-coding-system-map):
* lisp/frame.el (pgtk-frame-geometry, frame-geometry)
(w32-frame-edges, frame-edges)
(pgtk-mouse-absolute-pixel-position)
(mouse-absolute-pixel-position)
(pgtk-set-mouse-absolute-pixel-position)
(pgtk-frame-list-z-order, frame-list-z-order)
(pgtk-frame-restack, frame-restack, display-mouse-p)
(display-graphic-p, display-symbol-keys-p, )
(display-pixel-height, display-mm-height, display-mm-width)
(display-backing-store, display-save-under, display-color-cells)
(display-planes, display-visual-class)
(pgtk-display-monitor-attributes-list)
(display-monitor-attributes-list):
* lisp/faces.el (face-spec-set-match-display, tool-bar):
* lisp/cus-edit.el (custom-button, custom-button-mouse)
(custom-button-pressed, custom-display):
* configure.ac (AUTO_DEPEND, XARGS_LIMIT, XWIDGETS_OBJ):
2017-10-28 07:16:29 +00:00
|
|
|
|
PGTK_OBJ=
|
|
|
|
|
PGTK_LIBS=
|
|
|
|
|
if test "$window_system" = "pgtk"; then
|
implement pre-edit input method
* src/termhooks.h (enum event_kind): new pgtk value
* src/pgtkterm.h (struct pgtk_display_info):
* src/pgtkterm.c (x_free_frame_resources, pgtk_delete_terminal)
(pgtk_enqueue_string, pgtk_enqueue_preedit, key_press_event)
(focus_in_event, focus_out_event, pgtk_term_init): call pgtkim
* src/pgtkim.c: new file
(im_context_commit_cb, im_context_retrieve_surrounding_cb)
(make_color_string, im_context_preedit_changed_cb)
(im_context_preedit_end_cb, im_context_preedit_start_cb)
(pgtk_im_focus_in, pgtk_im_focus_out, pgtk_im_filter_keypress)
(pgtk_im_finish, Fpgtk_use_im_context, syms_of_pgtkim):
* src/pgtkfns.c (check_pgtk_display_info):
* src/keyboard.c (kbd_buffer_get_event, make_lispy_event)
(keys_of_keyboard):
* src/emacs.c (main): add syms_of_pgtkim
* lisp/term/pgtk-win.el (pgtk-preedit-text): new defun
* configure.ac (XWIDGETS_OBJ): add pgtkim.o
input method 対応
preedit を overlay で表示するようにした。
preedit 表示後すぐに反映されなかったのを修正
この機能を ON/OFF できるようにした。
default off.
確定と同時に次の preedit が始まった場合に表示位置がおかしかったのを修正。
sample.
preedit をテキストで渡すようにした
2019-11-13 14:36:27 +00:00
|
|
|
|
PGTK_OBJ="pgtkfns.o pgtkterm.o pgtkselect.o pgtkmenu.o pgtkim.o xsettings.o"
|
Introduce Pure GTK3 port
* src/xsettings.h:
* src/xsettings.c:
(dpyinfo_valid, store_tool_bar_style_changed)
(XSETTINGS_FONT_NAME, get_prop_window, read_settings)
(apply_xft_settings, read_and_apply_settings)
(xft_settings_event, init_xsettings, xsettings_initialize):
* src/xfaces.c:
(x_create_gc, x_free_gc):
* src/xdisp.c (redisplay_tool_bar, redisplay_internal)
(draw_glyphs_debug, draw_glyphs, mouse_face_from_buffer_pos)
(note_mouse_highlight):
* src/terminal.c (Fterminal_live_p):
* src/termhooks.h (enum output_method, GCALIGNED_STRUCT)
(TERMINAL_FONT_CACHE):
* src/process.c (wait_reading_process_output):
* src/pgtkterm.h:
* src/pgtkterm.c:
* src/pgtkselect.h:
* src/pgtkselect.c:
* src/pgtkgui.h:
* src/pgtkfns.c:
* src/image.c:
(XGetPixel, XPutPixel, image_create_bitmap_from_data)
(image_create_bitmap_from_file, free_bitmap_record)
(image_destroy_x_image, gui_put_x_image, image_get_x_image)
(Create_Pixmap_From_Bitmap_Data, xbm_load_image, )
(xpm_load_image, lookup_rgb_color, image_disable_image)
(image_build_heuristic_mask, imagemagick_load_image):
* src/gtkutil.h:
* src/gtkutil.c (PGTK_TRACE, xg_set_screen, xg_display_open)
(xg_display_close, xg_create_default_cursor)
(xg_get_pixbuf_from_pix_and_mask, xg_check_special_colors)
(qttip_cb, hierarchy_ch_cb, xg_prepare_tooltip, )
(xg_show_tooltip, xg_hide_tooltip, xg_frame_resized)
(xg_frame_set_char_size, xg_height_or_width_changed)
(xg_set_widget_bg, style_changed_cb, xg_create_frame_widgets)
(xg_free_frame_widgets, x_wm_set_size_hint, xg_frame_restack)
(xg_mark_data, xg_update_frame_menubar, free_frame_menubar)
(xg_update_submenu, xg_finish_scroll_bar_creation)
(xg_update_scrollbar_pos, xg_update_horizontal_scrollbar_pos)
(xg_set_toolkit_scroll_bar_thumb, xg_event_is_for_scrollbar)
(draw_page, xg_pack_tool_bar, xg_create_tool_bar)
(xg_update_tool_bar_sizes, update_frame_tool_bar)
(free_frame_tool_bar, xg_change_toolbar_position):
* src/ftcrfont.c:
(ftcrfont_draw):
* src/fringe.c:
(init_fringe_bitmap):
* src/frame.h (GCALIGNED_STRUCT, FRAME_WINDOW_P):
* src/frame.c (Fframep):
* src/font.h:
* src/font.c (syms_of_font):
* src/emacsgtkfixed.c:
(emacs_fixed_get_preferred_width)
(emacs_fixed_get_preferred_height, XSetWMSizeHints):
* src/emacs.c (main):
* src/dispnew.c (init_display_interactive):
* src/dispextern.h:
* src/alloc.c:
(garbage_collect):
* src/Makefile.in (PGTK_OBJ, PGTK_LIBS, base_obj, LIBES):
* src/.gdbinit:
* lisp/url/url-privacy.el (url-setup-privacy-info):
* lisp/term/pgtk-win.el (featurep):
* lisp/startup.el (command-line, fancy-splash-frame):
* lisp/net/eww.el (eww-form-submit, eww-form-file)
(eww-form-checkbox, eww-form-select):
* lisp/mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event):
* lisp/loadup.el (featurep):
* lisp/international/mule-cmds.el (set-coding-system-map):
* lisp/frame.el (pgtk-frame-geometry, frame-geometry)
(w32-frame-edges, frame-edges)
(pgtk-mouse-absolute-pixel-position)
(mouse-absolute-pixel-position)
(pgtk-set-mouse-absolute-pixel-position)
(pgtk-frame-list-z-order, frame-list-z-order)
(pgtk-frame-restack, frame-restack, display-mouse-p)
(display-graphic-p, display-symbol-keys-p, )
(display-pixel-height, display-mm-height, display-mm-width)
(display-backing-store, display-save-under, display-color-cells)
(display-planes, display-visual-class)
(pgtk-display-monitor-attributes-list)
(display-monitor-attributes-list):
* lisp/faces.el (face-spec-set-match-display, tool-bar):
* lisp/cus-edit.el (custom-button, custom-button-mouse)
(custom-button-pressed, custom-display):
* configure.ac (AUTO_DEPEND, XARGS_LIMIT, XWIDGETS_OBJ):
2017-10-28 07:16:29 +00:00
|
|
|
|
PGTK_LIBS="$GTK_LIBS -ldl"
|
|
|
|
|
AC_DEFINE([HAVE_PGTK], 1, [Define to 1 if you have pure Gtk+-3.])
|
|
|
|
|
fi
|
|
|
|
|
AC_SUBST(PGTK_OBJ)
|
|
|
|
|
AC_SUBST(PGTK_LIBS)
|
|
|
|
|
|
2007-12-02 15:46:00 +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.
|
2007-12-02 15:46:00 +00:00
|
|
|
|
HAVE_DBUS=no
|
2010-04-21 06:35:35 +00:00
|
|
|
|
DBUS_OBJ=
|
2007-12-02 15:46:00 +00:00
|
|
|
|
if test "${with_dbus}" = "yes"; then
|
2014-05-03 08:12:06 +00:00
|
|
|
|
EMACS_CHECK_MODULES([DBUS], [dbus-1 >= 1.0])
|
2007-12-02 15:46:00 +00:00
|
|
|
|
if test "$HAVE_DBUS" = yes; then
|
2009-08-22 08:47:01 +00:00
|
|
|
|
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-04-21 06:35:35 +00:00
|
|
|
|
DBUS_OBJ=dbusbind.o
|
2007-12-02 15:46:00 +00:00
|
|
|
|
fi
|
|
|
|
|
fi
|
2014-05-02 23:18:11 +00:00
|
|
|
|
AC_SUBST(DBUS_CFLAGS)
|
|
|
|
|
AC_SUBST(DBUS_LIBS)
|
2010-04-21 06:35:35 +00:00
|
|
|
|
AC_SUBST(DBUS_OBJ)
|
2007-12-02 15:46:00 +00:00
|
|
|
|
|
2011-06-30 14:00:26 +00:00
|
|
|
|
dnl GSettings has been tested under GNU/Linux only.
|
|
|
|
|
HAVE_GSETTINGS=no
|
Introduce Pure GTK3 port
* src/xsettings.h:
* src/xsettings.c:
(dpyinfo_valid, store_tool_bar_style_changed)
(XSETTINGS_FONT_NAME, get_prop_window, read_settings)
(apply_xft_settings, read_and_apply_settings)
(xft_settings_event, init_xsettings, xsettings_initialize):
* src/xfaces.c:
(x_create_gc, x_free_gc):
* src/xdisp.c (redisplay_tool_bar, redisplay_internal)
(draw_glyphs_debug, draw_glyphs, mouse_face_from_buffer_pos)
(note_mouse_highlight):
* src/terminal.c (Fterminal_live_p):
* src/termhooks.h (enum output_method, GCALIGNED_STRUCT)
(TERMINAL_FONT_CACHE):
* src/process.c (wait_reading_process_output):
* src/pgtkterm.h:
* src/pgtkterm.c:
* src/pgtkselect.h:
* src/pgtkselect.c:
* src/pgtkgui.h:
* src/pgtkfns.c:
* src/image.c:
(XGetPixel, XPutPixel, image_create_bitmap_from_data)
(image_create_bitmap_from_file, free_bitmap_record)
(image_destroy_x_image, gui_put_x_image, image_get_x_image)
(Create_Pixmap_From_Bitmap_Data, xbm_load_image, )
(xpm_load_image, lookup_rgb_color, image_disable_image)
(image_build_heuristic_mask, imagemagick_load_image):
* src/gtkutil.h:
* src/gtkutil.c (PGTK_TRACE, xg_set_screen, xg_display_open)
(xg_display_close, xg_create_default_cursor)
(xg_get_pixbuf_from_pix_and_mask, xg_check_special_colors)
(qttip_cb, hierarchy_ch_cb, xg_prepare_tooltip, )
(xg_show_tooltip, xg_hide_tooltip, xg_frame_resized)
(xg_frame_set_char_size, xg_height_or_width_changed)
(xg_set_widget_bg, style_changed_cb, xg_create_frame_widgets)
(xg_free_frame_widgets, x_wm_set_size_hint, xg_frame_restack)
(xg_mark_data, xg_update_frame_menubar, free_frame_menubar)
(xg_update_submenu, xg_finish_scroll_bar_creation)
(xg_update_scrollbar_pos, xg_update_horizontal_scrollbar_pos)
(xg_set_toolkit_scroll_bar_thumb, xg_event_is_for_scrollbar)
(draw_page, xg_pack_tool_bar, xg_create_tool_bar)
(xg_update_tool_bar_sizes, update_frame_tool_bar)
(free_frame_tool_bar, xg_change_toolbar_position):
* src/ftcrfont.c:
(ftcrfont_draw):
* src/fringe.c:
(init_fringe_bitmap):
* src/frame.h (GCALIGNED_STRUCT, FRAME_WINDOW_P):
* src/frame.c (Fframep):
* src/font.h:
* src/font.c (syms_of_font):
* src/emacsgtkfixed.c:
(emacs_fixed_get_preferred_width)
(emacs_fixed_get_preferred_height, XSetWMSizeHints):
* src/emacs.c (main):
* src/dispnew.c (init_display_interactive):
* src/dispextern.h:
* src/alloc.c:
(garbage_collect):
* src/Makefile.in (PGTK_OBJ, PGTK_LIBS, base_obj, LIBES):
* src/.gdbinit:
* lisp/url/url-privacy.el (url-setup-privacy-info):
* lisp/term/pgtk-win.el (featurep):
* lisp/startup.el (command-line, fancy-splash-frame):
* lisp/net/eww.el (eww-form-submit, eww-form-file)
(eww-form-checkbox, eww-form-select):
* lisp/mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event):
* lisp/loadup.el (featurep):
* lisp/international/mule-cmds.el (set-coding-system-map):
* lisp/frame.el (pgtk-frame-geometry, frame-geometry)
(w32-frame-edges, frame-edges)
(pgtk-mouse-absolute-pixel-position)
(mouse-absolute-pixel-position)
(pgtk-set-mouse-absolute-pixel-position)
(pgtk-frame-list-z-order, frame-list-z-order)
(pgtk-frame-restack, frame-restack, display-mouse-p)
(display-graphic-p, display-symbol-keys-p, )
(display-pixel-height, display-mm-height, display-mm-width)
(display-backing-store, display-save-under, display-color-cells)
(display-planes, display-visual-class)
(pgtk-display-monitor-attributes-list)
(display-monitor-attributes-list):
* lisp/faces.el (face-spec-set-match-display, tool-bar):
* lisp/cus-edit.el (custom-button, custom-button-mouse)
(custom-button-pressed, custom-display):
* configure.ac (AUTO_DEPEND, XARGS_LIMIT, XWIDGETS_OBJ):
2017-10-28 07:16:29 +00:00
|
|
|
|
if test "${HAVE_X11}" = "yes" -o "${window_system}" = "pgtk" && 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"
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
AC_CACHE_CHECK([whether GSettings is in gio], [emacs_cv_gsettings_in_gio],
|
|
|
|
|
[AC_LINK_IFELSE(
|
2014-03-29 12:08:47 +00:00
|
|
|
|
[AC_LANG_PROGRAM(
|
2015-04-19 21:40:51 +00:00
|
|
|
|
[[/* Check that gsettings really is present. */
|
|
|
|
|
#include <glib-object.h>
|
2014-03-29 12:08:47 +00:00
|
|
|
|
#include <gio/gio.h>
|
2015-04-19 21:40:51 +00:00
|
|
|
|
]],
|
|
|
|
|
[[
|
2014-03-29 12:08:47 +00:00
|
|
|
|
GSettings *settings;
|
|
|
|
|
GVariant *val = g_settings_get_value (settings, "");
|
2015-04-19 21:40:51 +00:00
|
|
|
|
]])],
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
[emacs_cv_gsettings_in_gio=yes], [emacs_cv_gsettings_in_gio=no])])
|
2014-03-29 12:08:47 +00:00
|
|
|
|
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
if test "$emacs_cv_gsettings_in_gio" = "yes"; then
|
2014-03-29 12:08:47 +00:00
|
|
|
|
AC_DEFINE(HAVE_GSETTINGS, 1, [Define to 1 if using GSettings.])
|
2015-04-19 21:40:51 +00:00
|
|
|
|
SETTINGS_CFLAGS="$GSETTINGS_CFLAGS"
|
|
|
|
|
SETTINGS_LIBS="$GSETTINGS_LIBS"
|
2017-07-23 01:43:28 +00:00
|
|
|
|
test "$with_gconf" = "yes" || with_gconf=no
|
2014-03-29 12:08:47 +00:00
|
|
|
|
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
|
|
|
|
|
|
2009-11-17 08:21:23 +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
|
Introduce Pure GTK3 port
* src/xsettings.h:
* src/xsettings.c:
(dpyinfo_valid, store_tool_bar_style_changed)
(XSETTINGS_FONT_NAME, get_prop_window, read_settings)
(apply_xft_settings, read_and_apply_settings)
(xft_settings_event, init_xsettings, xsettings_initialize):
* src/xfaces.c:
(x_create_gc, x_free_gc):
* src/xdisp.c (redisplay_tool_bar, redisplay_internal)
(draw_glyphs_debug, draw_glyphs, mouse_face_from_buffer_pos)
(note_mouse_highlight):
* src/terminal.c (Fterminal_live_p):
* src/termhooks.h (enum output_method, GCALIGNED_STRUCT)
(TERMINAL_FONT_CACHE):
* src/process.c (wait_reading_process_output):
* src/pgtkterm.h:
* src/pgtkterm.c:
* src/pgtkselect.h:
* src/pgtkselect.c:
* src/pgtkgui.h:
* src/pgtkfns.c:
* src/image.c:
(XGetPixel, XPutPixel, image_create_bitmap_from_data)
(image_create_bitmap_from_file, free_bitmap_record)
(image_destroy_x_image, gui_put_x_image, image_get_x_image)
(Create_Pixmap_From_Bitmap_Data, xbm_load_image, )
(xpm_load_image, lookup_rgb_color, image_disable_image)
(image_build_heuristic_mask, imagemagick_load_image):
* src/gtkutil.h:
* src/gtkutil.c (PGTK_TRACE, xg_set_screen, xg_display_open)
(xg_display_close, xg_create_default_cursor)
(xg_get_pixbuf_from_pix_and_mask, xg_check_special_colors)
(qttip_cb, hierarchy_ch_cb, xg_prepare_tooltip, )
(xg_show_tooltip, xg_hide_tooltip, xg_frame_resized)
(xg_frame_set_char_size, xg_height_or_width_changed)
(xg_set_widget_bg, style_changed_cb, xg_create_frame_widgets)
(xg_free_frame_widgets, x_wm_set_size_hint, xg_frame_restack)
(xg_mark_data, xg_update_frame_menubar, free_frame_menubar)
(xg_update_submenu, xg_finish_scroll_bar_creation)
(xg_update_scrollbar_pos, xg_update_horizontal_scrollbar_pos)
(xg_set_toolkit_scroll_bar_thumb, xg_event_is_for_scrollbar)
(draw_page, xg_pack_tool_bar, xg_create_tool_bar)
(xg_update_tool_bar_sizes, update_frame_tool_bar)
(free_frame_tool_bar, xg_change_toolbar_position):
* src/ftcrfont.c:
(ftcrfont_draw):
* src/fringe.c:
(init_fringe_bitmap):
* src/frame.h (GCALIGNED_STRUCT, FRAME_WINDOW_P):
* src/frame.c (Fframep):
* src/font.h:
* src/font.c (syms_of_font):
* src/emacsgtkfixed.c:
(emacs_fixed_get_preferred_width)
(emacs_fixed_get_preferred_height, XSetWMSizeHints):
* src/emacs.c (main):
* src/dispnew.c (init_display_interactive):
* src/dispextern.h:
* src/alloc.c:
(garbage_collect):
* src/Makefile.in (PGTK_OBJ, PGTK_LIBS, base_obj, LIBES):
* src/.gdbinit:
* lisp/url/url-privacy.el (url-setup-privacy-info):
* lisp/term/pgtk-win.el (featurep):
* lisp/startup.el (command-line, fancy-splash-frame):
* lisp/net/eww.el (eww-form-submit, eww-form-file)
(eww-form-checkbox, eww-form-select):
* lisp/mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event):
* lisp/loadup.el (featurep):
* lisp/international/mule-cmds.el (set-coding-system-map):
* lisp/frame.el (pgtk-frame-geometry, frame-geometry)
(w32-frame-edges, frame-edges)
(pgtk-mouse-absolute-pixel-position)
(mouse-absolute-pixel-position)
(pgtk-set-mouse-absolute-pixel-position)
(pgtk-frame-list-z-order, frame-list-z-order)
(pgtk-frame-restack, frame-restack, display-mouse-p)
(display-graphic-p, display-symbol-keys-p, )
(display-pixel-height, display-mm-height, display-mm-width)
(display-backing-store, display-save-under, display-color-cells)
(display-planes, display-visual-class)
(pgtk-display-monitor-attributes-list)
(display-monitor-attributes-list):
* lisp/faces.el (face-spec-set-match-display, tool-bar):
* lisp/cus-edit.el (custom-button, custom-button-mouse)
(custom-button-pressed, custom-display):
* configure.ac (AUTO_DEPEND, XARGS_LIMIT, XWIDGETS_OBJ):
2017-10-28 07:16:29 +00:00
|
|
|
|
if test "${HAVE_X11}" = "yes" -o "${window_system}" = "pgtk" && test "${with_gconf}" != "no"; then
|
2014-05-03 08:12:06 +00:00
|
|
|
|
EMACS_CHECK_MODULES([GCONF], [gconf-2.0 >= 2.13])
|
2009-11-17 08:21:23 +00:00
|
|
|
|
if test "$HAVE_GCONF" = yes; then
|
|
|
|
|
AC_DEFINE(HAVE_GCONF, 1, [Define to 1 if using GConf.])
|
2010-12-03 14:45:09 +00:00
|
|
|
|
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"
|
2009-11-17 08:21:23 +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-04-21 03:02:58 +00:00
|
|
|
|
dnl SELinux is available for GNU/Linux only.
|
|
|
|
|
HAVE_LIBSELINUX=no
|
2010-04-21 03:33:04 +00:00
|
|
|
|
LIBSELINUX_LIBS=
|
2010-04-21 03:02:58 +00:00
|
|
|
|
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
|
2010-04-21 03:33:04 +00:00
|
|
|
|
AC_SUBST(LIBSELINUX_LIBS)
|
2010-04-21 03:02:58 +00:00
|
|
|
|
|
2010-09-26 06:06:28 +00:00
|
|
|
|
HAVE_GNUTLS=no
|
2019-03-25 17:46:04 +00:00
|
|
|
|
if test "${with_gnutls}" != "no" ; then
|
2016-08-03 08:33:21 +00:00
|
|
|
|
EMACS_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.12.2],
|
2014-11-29 03:00:15 +00:00
|
|
|
|
[HAVE_GNUTLS=yes], [HAVE_GNUTLS=no])
|
2010-09-26 15:18:47 +00:00
|
|
|
|
if test "${HAVE_GNUTLS}" = "yes"; then
|
2010-09-28 02:22:37 +00:00
|
|
|
|
AC_DEFINE(HAVE_GNUTLS, 1, [Define if using GnuTLS.])
|
2010-09-26 15:18:47 +00:00
|
|
|
|
fi
|
2011-04-25 01:30:05 +00:00
|
|
|
|
|
2012-11-23 17:59:10 +00:00
|
|
|
|
# Windows loads GnuTLS dynamically
|
|
|
|
|
if test "${opsys}" = "mingw32"; then
|
|
|
|
|
LIBGNUTLS_LIBS=
|
|
|
|
|
fi
|
2010-09-26 06:06:28 +00:00
|
|
|
|
fi
|
2011-04-25 01:30:05 +00:00
|
|
|
|
|
2010-09-26 15:18:47 +00:00
|
|
|
|
AC_SUBST(LIBGNUTLS_LIBS)
|
|
|
|
|
AC_SUBST(LIBGNUTLS_CFLAGS)
|
2010-09-26 06:06:28 +00:00
|
|
|
|
|
2016-04-16 09:43:01 +00:00
|
|
|
|
HAVE_LIBSYSTEMD=no
|
|
|
|
|
if test "${with_libsystemd}" = "yes" ; then
|
2016-04-18 05:41:14 +00:00
|
|
|
|
dnl This code has been tested with libsystemd 222 and later.
|
|
|
|
|
dnl FIXME: Find the earliest version number for which Emacs should work,
|
|
|
|
|
dnl and change '222' to that number.
|
|
|
|
|
EMACS_CHECK_MODULES([LIBSYSTEMD], [libsystemd >= 222],
|
2016-04-16 09:43:01 +00:00
|
|
|
|
[HAVE_LIBSYSTEMD=yes], [HAVE_LIBSYSTEMD=no])
|
|
|
|
|
if test "${HAVE_LIBSYSTEMD}" = "yes"; then
|
|
|
|
|
AC_DEFINE(HAVE_LIBSYSTEMD, 1, [Define if using libsystemd.])
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
AC_SUBST(LIBSYSTEMD_LIBS)
|
|
|
|
|
AC_SUBST(LIBSYSTEMD_CFLAGS)
|
|
|
|
|
|
Implement native JSON support using Jansson
* configure.ac: New option --with-json.
* src/json.c (Fjson_serialize, Fjson_insert, Fjson_parse_string)
(Fjson_parse_buffer): New defuns.
(json_malloc, json_free, json_has_prefix, json_has_suffix)
(json_make_string, json_build_string, json_encode)
(json_out_of_memory, json_parse_error)
(json_release_object, check_string_without_embedded_nulls, json_check)
(lisp_to_json, lisp_to_json_toplevel, lisp_to_json_toplevel_1)
(json_insert, json_insert_callback, json_to_lisp)
(json_read_buffer_callback, Fjson_parse_buffer, define_error): New
helper functions.
(init_json, syms_of_json): New file.
* src/lisp.h: Declaration for init_json and syms_of_json.
* src/emacs.c (main): Enable JSON functions.
* src/eval.c (internal_catch_all, internal_catch_all_1): New helper
functions to catch all signals.
(syms_of_eval): Add uninterned symbol to signify out of memory.
* src/Makefile.in (JSON_LIBS, JSON_CFLAGS, JSON_OBJ, EMACS_CFLAGS)
(base_obj, LIBES): Compile json.c if --with-json is enabled.
* test/src/json-tests.el (json-serialize/roundtrip)
(json-serialize/object, json-parse-string/object)
(json-parse-string/string, json-serialize/string)
(json-parse-string/incomplete, json-parse-string/trailing)
(json-parse-buffer/incomplete, json-parse-buffer/trailing): New unit
tests.
* doc/lispref/text.texi (Parsing JSON): New manual section.
2017-09-18 08:51:39 +00:00
|
|
|
|
HAVE_JSON=no
|
|
|
|
|
JSON_OBJ=
|
|
|
|
|
|
2020-08-14 17:31:16 +00:00
|
|
|
|
if test "${with_json}" != no; then
|
2017-12-10 15:55:31 +00:00
|
|
|
|
EMACS_CHECK_MODULES([JSON], [jansson >= 2.7],
|
Implement native JSON support using Jansson
* configure.ac: New option --with-json.
* src/json.c (Fjson_serialize, Fjson_insert, Fjson_parse_string)
(Fjson_parse_buffer): New defuns.
(json_malloc, json_free, json_has_prefix, json_has_suffix)
(json_make_string, json_build_string, json_encode)
(json_out_of_memory, json_parse_error)
(json_release_object, check_string_without_embedded_nulls, json_check)
(lisp_to_json, lisp_to_json_toplevel, lisp_to_json_toplevel_1)
(json_insert, json_insert_callback, json_to_lisp)
(json_read_buffer_callback, Fjson_parse_buffer, define_error): New
helper functions.
(init_json, syms_of_json): New file.
* src/lisp.h: Declaration for init_json and syms_of_json.
* src/emacs.c (main): Enable JSON functions.
* src/eval.c (internal_catch_all, internal_catch_all_1): New helper
functions to catch all signals.
(syms_of_eval): Add uninterned symbol to signify out of memory.
* src/Makefile.in (JSON_LIBS, JSON_CFLAGS, JSON_OBJ, EMACS_CFLAGS)
(base_obj, LIBES): Compile json.c if --with-json is enabled.
* test/src/json-tests.el (json-serialize/roundtrip)
(json-serialize/object, json-parse-string/object)
(json-parse-string/string, json-serialize/string)
(json-parse-string/incomplete, json-parse-string/trailing)
(json-parse-buffer/incomplete, json-parse-buffer/trailing): New unit
tests.
* doc/lispref/text.texi (Parsing JSON): New manual section.
2017-09-18 08:51:39 +00:00
|
|
|
|
[HAVE_JSON=yes], [HAVE_JSON=no])
|
|
|
|
|
if test "${HAVE_JSON}" = yes; then
|
|
|
|
|
AC_DEFINE(HAVE_JSON, 1, [Define if using Jansson.])
|
|
|
|
|
JSON_OBJ=json.o
|
2017-12-10 16:36:37 +00:00
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Windows loads libjansson dynamically
|
|
|
|
|
if test "${opsys}" = "mingw32"; then
|
|
|
|
|
JSON_LIBS=
|
Implement native JSON support using Jansson
* configure.ac: New option --with-json.
* src/json.c (Fjson_serialize, Fjson_insert, Fjson_parse_string)
(Fjson_parse_buffer): New defuns.
(json_malloc, json_free, json_has_prefix, json_has_suffix)
(json_make_string, json_build_string, json_encode)
(json_out_of_memory, json_parse_error)
(json_release_object, check_string_without_embedded_nulls, json_check)
(lisp_to_json, lisp_to_json_toplevel, lisp_to_json_toplevel_1)
(json_insert, json_insert_callback, json_to_lisp)
(json_read_buffer_callback, Fjson_parse_buffer, define_error): New
helper functions.
(init_json, syms_of_json): New file.
* src/lisp.h: Declaration for init_json and syms_of_json.
* src/emacs.c (main): Enable JSON functions.
* src/eval.c (internal_catch_all, internal_catch_all_1): New helper
functions to catch all signals.
(syms_of_eval): Add uninterned symbol to signify out of memory.
* src/Makefile.in (JSON_LIBS, JSON_CFLAGS, JSON_OBJ, EMACS_CFLAGS)
(base_obj, LIBES): Compile json.c if --with-json is enabled.
* test/src/json-tests.el (json-serialize/roundtrip)
(json-serialize/object, json-parse-string/object)
(json-parse-string/string, json-serialize/string)
(json-parse-string/incomplete, json-parse-string/trailing)
(json-parse-buffer/incomplete, json-parse-buffer/trailing): New unit
tests.
* doc/lispref/text.texi (Parsing JSON): New manual section.
2017-09-18 08:51:39 +00:00
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
AC_SUBST(JSON_LIBS)
|
|
|
|
|
AC_SUBST(JSON_CFLAGS)
|
|
|
|
|
AC_SUBST(JSON_OBJ)
|
|
|
|
|
|
2013-06-03 13:03:05 +00:00
|
|
|
|
NOTIFY_OBJ=
|
|
|
|
|
NOTIFY_SUMMARY=no
|
|
|
|
|
|
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
|
2015-03-02 13:52:22 +00:00
|
|
|
|
w32,cygwin)
|
2015-04-19 21:40:51 +00:00
|
|
|
|
AC_MSG_ERROR(['--with-file-notification=w32' was specified, but
|
2015-03-02 13:52:22 +00:00
|
|
|
|
this is only supported on MS-Windows native and MinGW32 builds.
|
|
|
|
|
Consider using gfile instead.])
|
|
|
|
|
;;
|
2013-07-13 00:01:43 +00:00
|
|
|
|
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
|
|
|
|
|
2015-08-15 01:20:35 +00:00
|
|
|
|
dnl inotify is available only on GNU/Linux.
|
2013-07-13 00:01:43 +00:00
|
|
|
|
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
|
|
|
|
|
|
2015-11-09 09:00:56 +00:00
|
|
|
|
dnl kqueue is available on BSD-like systems.
|
|
|
|
|
case $with_file_notification,$NOTIFY_OBJ in
|
|
|
|
|
kqueue,* | yes,)
|
|
|
|
|
EMACS_CHECK_MODULES([KQUEUE], [libkqueue])
|
|
|
|
|
if test "$HAVE_KQUEUE" = "yes"; then
|
|
|
|
|
AC_DEFINE(HAVE_KQUEUE, 1, [Define to 1 to use kqueue.])
|
|
|
|
|
CPPFLAGS="$CPPFLAGS -I/usr/include/kqueue"
|
|
|
|
|
NOTIFY_CFLAGS=$KQUEUE_CFLAGS
|
|
|
|
|
NOTIFY_LIBS=$KQUEUE_LIBS
|
|
|
|
|
NOTIFY_OBJ=kqueue.o
|
|
|
|
|
NOTIFY_SUMMARY="yes -lkqueue"
|
2015-11-11 15:07:50 +00:00
|
|
|
|
else
|
|
|
|
|
AC_SEARCH_LIBS(kqueue, [])
|
|
|
|
|
if test "$ac_cv_search_kqueue" != no; then
|
|
|
|
|
AC_DEFINE(HAVE_KQUEUE, 1, [Define to 1 to use kqueue.])
|
|
|
|
|
NOTIFY_OBJ=kqueue.o
|
|
|
|
|
NOTIFY_SUMMARY="yes (kqueue)"
|
|
|
|
|
fi
|
2015-11-09 09:00:56 +00:00
|
|
|
|
fi ;;
|
|
|
|
|
esac
|
|
|
|
|
|
2015-08-15 01:20:35 +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.
|
|
|
|
|
case $with_file_notification,$NOTIFY_OBJ in
|
|
|
|
|
gfile,* | yes,)
|
2016-01-03 16:34:32 +00:00
|
|
|
|
if test "${HAVE_NS}" = yes; then
|
2016-01-03 17:25:19 +00:00
|
|
|
|
AC_MSG_ERROR(['--with-file-notification=gfile' is not supported in NextStep builds.
|
2016-01-03 16:34:32 +00:00
|
|
|
|
Consider kqueue instead.])
|
|
|
|
|
else
|
2015-11-09 09:00:56 +00:00
|
|
|
|
EMACS_CHECK_MODULES([GFILENOTIFY], [gio-2.0 >= 2.24])
|
|
|
|
|
if test "$HAVE_GFILENOTIFY" = "yes"; then
|
|
|
|
|
AC_DEFINE(HAVE_GFILENOTIFY, 1, [Define to 1 if using GFile.])
|
|
|
|
|
NOTIFY_CFLAGS=$GFILENOTIFY_CFLAGS
|
|
|
|
|
NOTIFY_LIBS=$GFILENOTIFY_LIBS
|
|
|
|
|
NOTIFY_OBJ=gfilenotify.o
|
|
|
|
|
NOTIFY_SUMMARY="yes -lgio (gfile)"
|
|
|
|
|
fi
|
2015-08-15 01:20:35 +00:00
|
|
|
|
fi ;;
|
|
|
|
|
esac
|
|
|
|
|
|
2013-07-13 00:01:43 +00:00
|
|
|
|
case $with_file_notification,$NOTIFY_OBJ in
|
|
|
|
|
yes,* | no,* | *,?*) ;;
|
2015-04-19 21:40:51 +00:00
|
|
|
|
*) AC_MSG_ERROR([File notification '$with_file_notification' requested but requirements not found.]) ;;
|
2013-07-13 00:01:43 +00:00
|
|
|
|
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
|
2015-11-09 09:00:56 +00:00
|
|
|
|
AC_SUBST(NOTIFY_CFLAGS)
|
|
|
|
|
AC_SUBST(NOTIFY_LIBS)
|
2013-06-03 13:03:05 +00:00
|
|
|
|
AC_SUBST(NOTIFY_OBJ)
|
2012-12-10 11:17:21 +00:00
|
|
|
|
|
1996-06-30 07:05:55 +00:00
|
|
|
|
dnl Do not put whitespace before the #include statements below.
|
|
|
|
|
dnl Older compilers (eg sunos4 cc) choke on it.
|
2007-06-13 17:32:14 +00:00
|
|
|
|
HAVE_XAW3D=no
|
2010-04-27 02:36:20 +00:00
|
|
|
|
LUCID_LIBW=
|
2007-04-19 18:07:26 +00:00
|
|
|
|
if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
|
2007-11-01 07:38:13 +00:00
|
|
|
|
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([[
|
1996-06-30 07:05:55 +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)],
|
2007-11-01 07:38:13 +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)
|
2007-11-01 07:38:13 +00:00
|
|
|
|
AC_MSG_RESULT([yes; using Lucid toolkit])
|
|
|
|
|
USE_X_TOOLKIT=LUCID
|
|
|
|
|
HAVE_XAW3D=yes
|
2010-04-27 02:36:20 +00:00
|
|
|
|
LUCID_LIBW=-lXaw3d
|
2007-11-01 07:38:13 +00:00
|
|
|
|
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)
|
2007-11-01 07:38:13 +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([[
|
2007-11-01 07:38:13 +00:00
|
|
|
|
#include <X11/Intrinsic.h>
|
2011-03-26 19:29:10 +00:00
|
|
|
|
#include <X11/Xaw/Simple.h>]],
|
|
|
|
|
[[]])],
|
2007-11-01 07:38:13 +00:00
|
|
|
|
emacs_cv_xaw=yes,
|
|
|
|
|
emacs_cv_xaw=no)])
|
|
|
|
|
if test $emacs_cv_xaw = yes; then
|
2007-06-13 17:32:14 +00:00
|
|
|
|
AC_MSG_RESULT([yes; using Lucid toolkit])
|
1997-12-17 13:16:22 +00:00
|
|
|
|
USE_X_TOOLKIT=LUCID
|
2010-04-27 02:36:20 +00:00
|
|
|
|
LUCID_LIBW=-lXaw
|
2007-11-01 07:38:13 +00:00
|
|
|
|
elif test x"${USE_X_TOOLKIT}" = xLUCID; then
|
|
|
|
|
AC_MSG_ERROR([Lucid toolkit requires X11/Xaw include files])
|
1997-12-17 13:16:22 +00:00
|
|
|
|
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.])
|
1997-12-17 13:16:22 +00:00
|
|
|
|
fi
|
1996-06-09 20:52:47 +00:00
|
|
|
|
fi
|
1996-01-09 22:56:20 +00:00
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
X_TOOLKIT_TYPE=$USE_X_TOOLKIT
|
|
|
|
|
|
2010-04-27 08:09:01 +00:00
|
|
|
|
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=
|
1994-08-26 14:57:46 +00:00
|
|
|
|
if test "${USE_X_TOOLKIT}" != "none"; then
|
|
|
|
|
AC_MSG_CHECKING(X11 toolkit version)
|
1997-12-17 13:16:22 +00:00
|
|
|
|
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
|
1994-08-26 14:57:46 +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)])
|
1997-12-17 13:16:22 +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)
|
2002-04-14 01:40:58 +00:00
|
|
|
|
AC_DEFINE(HAVE_X11XTR6, 1,
|
|
|
|
|
[Define to 1 if you have the X11R6 or newer version of Xt.])
|
2010-04-27 08:09:01 +00:00
|
|
|
|
LIBXTR6="-lSM -lICE"
|
|
|
|
|
case "$opsys" in
|
|
|
|
|
## Use libw.a along with X11R6 Xt.
|
|
|
|
|
unixware) LIBXTR6="$LIBXTR6 -lw" ;;
|
|
|
|
|
esac
|
1997-12-17 13:16:22 +00:00
|
|
|
|
else
|
|
|
|
|
AC_MSG_RESULT(before 6)
|
|
|
|
|
fi
|
1996-01-15 05:11:07 +00:00
|
|
|
|
|
|
|
|
|
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"
|
1996-02-26 19:42:29 +00:00
|
|
|
|
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'
|
1996-02-26 19:42:29 +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
|
1996-02-26 19:42:29 +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.
|
2001-01-10 15:18:48 +00:00
|
|
|
|
fi
|
2010-04-27 08:09:01 +00:00
|
|
|
|
AC_SUBST(LIBXTR6)
|
2010-04-28 07:01:43 +00:00
|
|
|
|
AC_SUBST(LIBXMU)
|
2001-01-10 15:18:48 +00:00
|
|
|
|
|
2010-04-27 02:36:20 +00:00
|
|
|
|
LIBXP=
|
1997-08-24 01:01:45 +00:00
|
|
|
|
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)
|
1997-08-24 01:01:45 +00:00
|
|
|
|
int x = 5;
|
|
|
|
|
#else
|
|
|
|
|
Motif version prior to 2.1.
|
2011-03-26 19:29:10 +00:00
|
|
|
|
#endif]])],
|
2001-10-19 12:30:52 +00:00
|
|
|
|
emacs_cv_motif_version_2_1=yes, emacs_cv_motif_version_2_1=no)])
|
1997-12-17 13:16:22 +00:00
|
|
|
|
if test $emacs_cv_motif_version_2_1 = yes; then
|
2010-04-27 03:32:39 +00:00
|
|
|
|
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
|
2005-03-16 22:21:31 +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;]])],
|
2005-03-16 22:21:31 +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
|
1997-12-17 13:16:22 +00:00
|
|
|
|
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.])])
|
1997-08-24 01:01:45 +00:00
|
|
|
|
fi
|
|
|
|
|
|
2003-01-19 21:50:03 +00:00
|
|
|
|
dnl Use toolkit scroll bars if configured for GTK or X toolkit and either
|
1999-08-30 22:50:51 +00:00
|
|
|
|
dnl using Motif or Xaw3d is available, and unless
|
|
|
|
|
dnl --with-toolkit-scroll-bars=no was specified.
|
|
|
|
|
|
2002-04-14 01:40:58 +00:00
|
|
|
|
AH_TEMPLATE(USE_TOOLKIT_SCROLL_BARS,
|
|
|
|
|
[Define to 1 if we should use toolkit scroll bars.])dnl
|
1999-08-30 22:50:51 +00:00
|
|
|
|
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
|
1999-08-30 22:50:51 +00:00
|
|
|
|
AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
|
|
|
|
|
USE_TOOLKIT_SCROLL_BARS=yes
|
|
|
|
|
fi
|
2003-01-19 21:50:03 +00:00
|
|
|
|
elif test "${HAVE_GTK}" = "yes"; then
|
|
|
|
|
AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
|
|
|
|
|
USE_TOOLKIT_SCROLL_BARS=yes
|
2008-07-15 18:15:18 +00:00
|
|
|
|
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
|
1999-08-30 22:50:51 +00:00
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
2003-07-29 17:41:12 +00:00
|
|
|
|
dnl See if XIM is available.
|
2011-03-26 19:29:10 +00:00
|
|
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
2003-07-29 17:41:12 +00:00
|
|
|
|
#include <X11/Xlib.h>
|
2011-03-26 19:29:10 +00:00
|
|
|
|
#include <X11/Xresource.h>]],
|
|
|
|
|
[[XIMProc callback;]])],
|
2007-09-01 23:26:52 +00:00
|
|
|
|
[HAVE_XIM=yes
|
|
|
|
|
AC_DEFINE(HAVE_XIM, 1, [Define to 1 if XIM is available])],
|
2003-07-29 17:41:12 +00:00
|
|
|
|
HAVE_XIM=no)
|
|
|
|
|
|
2018-08-28 01:44:29 +00:00
|
|
|
|
dnl Note this is non-standard. --with-xim does not control whether
|
|
|
|
|
dnl XIM support is compiled in, it only affects the runtime default of
|
|
|
|
|
dnl use_xim in xterm.c.
|
2000-06-26 15:38:07 +00:00
|
|
|
|
if test "${with_xim}" != "no"; then
|
2002-04-14 01:40:58 +00:00
|
|
|
|
AC_DEFINE(USE_XIM, 1,
|
2018-08-28 01:44:29 +00:00
|
|
|
|
[Define to 1 to default runtime use of XIM to on.])
|
2003-07-28 18:01:39 +00:00
|
|
|
|
fi
|
2005-04-20 10:54:46 +00:00
|
|
|
|
|
2003-07-29 17:41:12 +00:00
|
|
|
|
|
|
|
|
|
if test "${HAVE_XIM}" != "no"; then
|
2003-06-29 12:01:08 +00:00
|
|
|
|
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([[
|
2003-06-23 18:35:23 +00:00
|
|
|
|
#include <X11/Xlib.h>
|
2011-03-26 19:29:10 +00:00
|
|
|
|
#include <X11/Xresource.h>]],
|
|
|
|
|
[[Display *display;
|
2003-06-23 18:35:23 +00:00
|
|
|
|
XrmDatabase db;
|
|
|
|
|
char *res_name;
|
|
|
|
|
char *res_class;
|
|
|
|
|
XIMProc callback;
|
|
|
|
|
XPointer *client_data;
|
2003-06-29 12:01:08 +00:00
|
|
|
|
#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
|
2003-06-23 18:35:23 +00:00
|
|
|
|
(void)XRegisterIMInstantiateCallback(display, db, res_name, res_class, callback,
|
2011-03-26 19:29:10 +00:00
|
|
|
|
client_data);]])],
|
2003-06-23 18:35:23 +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
|
2003-07-22 17:29:56 +00:00
|
|
|
|
AC_DEFINE(XRegisterIMInstantiateCallback_arg6, [XPointer*])
|
2003-06-23 18:35:23 +00:00
|
|
|
|
else
|
2003-07-22 17:29:56 +00:00
|
|
|
|
AC_DEFINE(XRegisterIMInstantiateCallback_arg6, [XPointer])
|
2003-06-23 18:35:23 +00:00
|
|
|
|
fi
|
2003-06-29 12:01:08 +00:00
|
|
|
|
CFLAGS=$late_CFLAGS
|
2000-06-26 15:38:07 +00:00
|
|
|
|
fi
|
|
|
|
|
|
2019-01-02 21:00:09 +00:00
|
|
|
|
# Check for XRender
|
|
|
|
|
HAVE_XRENDER=no
|
|
|
|
|
if test "${HAVE_X11}" = "yes"; then
|
2019-09-04 18:07:14 +00:00
|
|
|
|
AC_CHECK_HEADER([X11/extensions/Xrender.h],
|
|
|
|
|
[AC_CHECK_LIB([Xrender], [XRenderQueryExtension], [HAVE_XRENDER=yes])])
|
2019-01-02 21:00:09 +00:00
|
|
|
|
if test $HAVE_XRENDER = yes; then
|
|
|
|
|
XRENDER_LIBS="-lXrender"
|
|
|
|
|
AC_SUBST(XRENDER_LIBS)
|
|
|
|
|
AC_DEFINE([HAVE_XRENDER], 1, [Define to 1 if XRender is available.])
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
Don't link libXft when using cairo
* configure.ac: Check cairo early. Don't try Xft if cairo is used.
* lwlib/lwlib-utils.h [USE_CAIRO]: Include cairo.h and fontconfig.h.
(XftFont, XftDraw, XftColor, XGlyphInfo) [USE_CAIRO]: New typedefs.
(XftFontOpenName, XftFontClose, XftDrawCreate, XftDrawDestroy)
(XftDrawRect, XftDrawStringUtf8, XftTextExtentsUtf8) [USE_CAIRO]: New macros.
(crxft_font_open_name, crxft_font_close, crxft_draw_create)
(crxft_draw_rect, crxft_draw_string, crxft_text_extents) [USE_CAIRO]: New
externs.
* lwlib/lwlib-utils.c [USE_CAIRO]: Include math.h, cairo-ft.h, and
cairo-xlib.h.
(crxft_font_open_name, crxft_font_close, crxft_draw_create)
(crxft_set_source_color, crxft_draw_rect, crxft_draw_string)
(crxft_text_extents) [USE_CAIRO]: New Xft compatibility functions.
* lwlib/xlwmenuP.h [USE_CAIRO]: Include lwlib-utils.h.
* lwlib/xlwmenu.c (display_menu_item) [USE_CAIRO]: Call
cairo_surface_mark_dirty and cairo_surface_flush.
* lwlib/lwlib-Xaw.c [USE_CAIRO]: Include stdlib.h and lwlib-utils.h.
(draw_text) [USE_CAIRO]: Call cairo_surface_flush.
* src/xsettings.c [USE_CAIRO]: Include fontconfig.h
(apply_xft_settings) [!HAVE_XFT]: Don't call XftDefaultSubstitute or
XftDefaultSet.
* lwlib/lwlib-Xaw.c:
* lwlib/lwlib-int.h:
* lwlib/xlwmenu.c:
* lwlib/xlwmenuP.h:
* src/xrdb.c:
* src/xsettings.c:
* src/xterm.c: Replace all #ifdef HAVE_XFT with #if defined USE_CAIRO ||
defined HAVE_XFT.
* src/xfns.c (x_default_font_parameter): Replace #ifdef HAVE_XFT with #if
defined USE_CAIRO || defined HAVE_XFT.
2019-04-24 03:31:37 +00:00
|
|
|
|
HAVE_CAIRO=no
|
|
|
|
|
if test "${HAVE_X11}" = "yes"; then
|
|
|
|
|
if test "${with_cairo}" != "no"; then
|
2019-06-15 03:46:30 +00:00
|
|
|
|
CAIRO_REQUIRED=1.8.0
|
Don't link libXft when using cairo
* configure.ac: Check cairo early. Don't try Xft if cairo is used.
* lwlib/lwlib-utils.h [USE_CAIRO]: Include cairo.h and fontconfig.h.
(XftFont, XftDraw, XftColor, XGlyphInfo) [USE_CAIRO]: New typedefs.
(XftFontOpenName, XftFontClose, XftDrawCreate, XftDrawDestroy)
(XftDrawRect, XftDrawStringUtf8, XftTextExtentsUtf8) [USE_CAIRO]: New macros.
(crxft_font_open_name, crxft_font_close, crxft_draw_create)
(crxft_draw_rect, crxft_draw_string, crxft_text_extents) [USE_CAIRO]: New
externs.
* lwlib/lwlib-utils.c [USE_CAIRO]: Include math.h, cairo-ft.h, and
cairo-xlib.h.
(crxft_font_open_name, crxft_font_close, crxft_draw_create)
(crxft_set_source_color, crxft_draw_rect, crxft_draw_string)
(crxft_text_extents) [USE_CAIRO]: New Xft compatibility functions.
* lwlib/xlwmenuP.h [USE_CAIRO]: Include lwlib-utils.h.
* lwlib/xlwmenu.c (display_menu_item) [USE_CAIRO]: Call
cairo_surface_mark_dirty and cairo_surface_flush.
* lwlib/lwlib-Xaw.c [USE_CAIRO]: Include stdlib.h and lwlib-utils.h.
(draw_text) [USE_CAIRO]: Call cairo_surface_flush.
* src/xsettings.c [USE_CAIRO]: Include fontconfig.h
(apply_xft_settings) [!HAVE_XFT]: Don't call XftDefaultSubstitute or
XftDefaultSet.
* lwlib/lwlib-Xaw.c:
* lwlib/lwlib-int.h:
* lwlib/xlwmenu.c:
* lwlib/xlwmenuP.h:
* src/xrdb.c:
* src/xsettings.c:
* src/xterm.c: Replace all #ifdef HAVE_XFT with #if defined USE_CAIRO ||
defined HAVE_XFT.
* src/xfns.c (x_default_font_parameter): Replace #ifdef HAVE_XFT with #if
defined USE_CAIRO || defined HAVE_XFT.
2019-04-24 03:31:37 +00:00
|
|
|
|
CAIRO_MODULE="cairo >= $CAIRO_REQUIRED"
|
|
|
|
|
EMACS_CHECK_MODULES(CAIRO, $CAIRO_MODULE)
|
|
|
|
|
if test $HAVE_CAIRO = yes; then
|
|
|
|
|
AC_DEFINE(USE_CAIRO, 1, [Define to 1 if using cairo.])
|
2020-01-14 10:18:20 +00:00
|
|
|
|
CFLAGS="$CFLAGS $CAIRO_CFLAGS"
|
|
|
|
|
LIBS="$LIBS $CAIRO_LIBS"
|
|
|
|
|
AC_SUBST(CAIRO_CFLAGS)
|
|
|
|
|
AC_SUBST(CAIRO_LIBS)
|
Don't link libXft when using cairo
* configure.ac: Check cairo early. Don't try Xft if cairo is used.
* lwlib/lwlib-utils.h [USE_CAIRO]: Include cairo.h and fontconfig.h.
(XftFont, XftDraw, XftColor, XGlyphInfo) [USE_CAIRO]: New typedefs.
(XftFontOpenName, XftFontClose, XftDrawCreate, XftDrawDestroy)
(XftDrawRect, XftDrawStringUtf8, XftTextExtentsUtf8) [USE_CAIRO]: New macros.
(crxft_font_open_name, crxft_font_close, crxft_draw_create)
(crxft_draw_rect, crxft_draw_string, crxft_text_extents) [USE_CAIRO]: New
externs.
* lwlib/lwlib-utils.c [USE_CAIRO]: Include math.h, cairo-ft.h, and
cairo-xlib.h.
(crxft_font_open_name, crxft_font_close, crxft_draw_create)
(crxft_set_source_color, crxft_draw_rect, crxft_draw_string)
(crxft_text_extents) [USE_CAIRO]: New Xft compatibility functions.
* lwlib/xlwmenuP.h [USE_CAIRO]: Include lwlib-utils.h.
* lwlib/xlwmenu.c (display_menu_item) [USE_CAIRO]: Call
cairo_surface_mark_dirty and cairo_surface_flush.
* lwlib/lwlib-Xaw.c [USE_CAIRO]: Include stdlib.h and lwlib-utils.h.
(draw_text) [USE_CAIRO]: Call cairo_surface_flush.
* src/xsettings.c [USE_CAIRO]: Include fontconfig.h
(apply_xft_settings) [!HAVE_XFT]: Don't call XftDefaultSubstitute or
XftDefaultSet.
* lwlib/lwlib-Xaw.c:
* lwlib/lwlib-int.h:
* lwlib/xlwmenu.c:
* lwlib/xlwmenuP.h:
* src/xrdb.c:
* src/xsettings.c:
* src/xterm.c: Replace all #ifdef HAVE_XFT with #if defined USE_CAIRO ||
defined HAVE_XFT.
* src/xfns.c (x_default_font_parameter): Replace #ifdef HAVE_XFT with #if
defined USE_CAIRO || defined HAVE_XFT.
2019-04-24 03:31:37 +00:00
|
|
|
|
else
|
2020-01-14 10:18:20 +00:00
|
|
|
|
AC_MSG_WARN([cairo requested but not found.])
|
Don't link libXft when using cairo
* configure.ac: Check cairo early. Don't try Xft if cairo is used.
* lwlib/lwlib-utils.h [USE_CAIRO]: Include cairo.h and fontconfig.h.
(XftFont, XftDraw, XftColor, XGlyphInfo) [USE_CAIRO]: New typedefs.
(XftFontOpenName, XftFontClose, XftDrawCreate, XftDrawDestroy)
(XftDrawRect, XftDrawStringUtf8, XftTextExtentsUtf8) [USE_CAIRO]: New macros.
(crxft_font_open_name, crxft_font_close, crxft_draw_create)
(crxft_draw_rect, crxft_draw_string, crxft_text_extents) [USE_CAIRO]: New
externs.
* lwlib/lwlib-utils.c [USE_CAIRO]: Include math.h, cairo-ft.h, and
cairo-xlib.h.
(crxft_font_open_name, crxft_font_close, crxft_draw_create)
(crxft_set_source_color, crxft_draw_rect, crxft_draw_string)
(crxft_text_extents) [USE_CAIRO]: New Xft compatibility functions.
* lwlib/xlwmenuP.h [USE_CAIRO]: Include lwlib-utils.h.
* lwlib/xlwmenu.c (display_menu_item) [USE_CAIRO]: Call
cairo_surface_mark_dirty and cairo_surface_flush.
* lwlib/lwlib-Xaw.c [USE_CAIRO]: Include stdlib.h and lwlib-utils.h.
(draw_text) [USE_CAIRO]: Call cairo_surface_flush.
* src/xsettings.c [USE_CAIRO]: Include fontconfig.h
(apply_xft_settings) [!HAVE_XFT]: Don't call XftDefaultSubstitute or
XftDefaultSet.
* lwlib/lwlib-Xaw.c:
* lwlib/lwlib-int.h:
* lwlib/xlwmenu.c:
* lwlib/xlwmenuP.h:
* src/xrdb.c:
* src/xsettings.c:
* src/xterm.c: Replace all #ifdef HAVE_XFT with #if defined USE_CAIRO ||
defined HAVE_XFT.
* src/xfns.c (x_default_font_parameter): Replace #ifdef HAVE_XFT with #if
defined USE_CAIRO || defined HAVE_XFT.
2019-04-24 03:31:37 +00:00
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
2009-02-26 21:23:17 +00:00
|
|
|
|
### Start of font-backend (under any platform) section.
|
|
|
|
|
# (nothing here yet -- this is a placeholder)
|
|
|
|
|
### End of font-backend (under any platform) section.
|
2008-05-14 01:49:04 +00:00
|
|
|
|
|
2009-02-26 21:23:17 +00:00
|
|
|
|
### Start of font-backend (under X11) section.
|
|
|
|
|
if test "${HAVE_X11}" = "yes"; then
|
Don't link libXft when using cairo
* configure.ac: Check cairo early. Don't try Xft if cairo is used.
* lwlib/lwlib-utils.h [USE_CAIRO]: Include cairo.h and fontconfig.h.
(XftFont, XftDraw, XftColor, XGlyphInfo) [USE_CAIRO]: New typedefs.
(XftFontOpenName, XftFontClose, XftDrawCreate, XftDrawDestroy)
(XftDrawRect, XftDrawStringUtf8, XftTextExtentsUtf8) [USE_CAIRO]: New macros.
(crxft_font_open_name, crxft_font_close, crxft_draw_create)
(crxft_draw_rect, crxft_draw_string, crxft_text_extents) [USE_CAIRO]: New
externs.
* lwlib/lwlib-utils.c [USE_CAIRO]: Include math.h, cairo-ft.h, and
cairo-xlib.h.
(crxft_font_open_name, crxft_font_close, crxft_draw_create)
(crxft_set_source_color, crxft_draw_rect, crxft_draw_string)
(crxft_text_extents) [USE_CAIRO]: New Xft compatibility functions.
* lwlib/xlwmenuP.h [USE_CAIRO]: Include lwlib-utils.h.
* lwlib/xlwmenu.c (display_menu_item) [USE_CAIRO]: Call
cairo_surface_mark_dirty and cairo_surface_flush.
* lwlib/lwlib-Xaw.c [USE_CAIRO]: Include stdlib.h and lwlib-utils.h.
(draw_text) [USE_CAIRO]: Call cairo_surface_flush.
* src/xsettings.c [USE_CAIRO]: Include fontconfig.h
(apply_xft_settings) [!HAVE_XFT]: Don't call XftDefaultSubstitute or
XftDefaultSet.
* lwlib/lwlib-Xaw.c:
* lwlib/lwlib-int.h:
* lwlib/xlwmenu.c:
* lwlib/xlwmenuP.h:
* src/xrdb.c:
* src/xsettings.c:
* src/xterm.c: Replace all #ifdef HAVE_XFT with #if defined USE_CAIRO ||
defined HAVE_XFT.
* src/xfns.c (x_default_font_parameter): Replace #ifdef HAVE_XFT with #if
defined USE_CAIRO || defined HAVE_XFT.
2019-04-24 03:31:37 +00:00
|
|
|
|
if test $HAVE_CAIRO = yes; then
|
|
|
|
|
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.
|
|
|
|
|
EMACS_CHECK_MODULES([FREETYPE], [freetype2])
|
|
|
|
|
|
|
|
|
|
test "$HAVE_FREETYPE" = "no" && AC_MSG_ERROR(cairo requires libfreetype)
|
|
|
|
|
|
|
|
|
|
EMACS_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.2.0])
|
|
|
|
|
|
|
|
|
|
test "$HAVE_FONTCONFIG" = "no" && AC_MSG_ERROR(cairo requires libfontconfig)
|
2019-06-24 22:24:37 +00:00
|
|
|
|
dnl For the "Does Emacs use" message at the end.
|
|
|
|
|
HAVE_XFT=no
|
Don't link libXft when using cairo
* configure.ac: Check cairo early. Don't try Xft if cairo is used.
* lwlib/lwlib-utils.h [USE_CAIRO]: Include cairo.h and fontconfig.h.
(XftFont, XftDraw, XftColor, XGlyphInfo) [USE_CAIRO]: New typedefs.
(XftFontOpenName, XftFontClose, XftDrawCreate, XftDrawDestroy)
(XftDrawRect, XftDrawStringUtf8, XftTextExtentsUtf8) [USE_CAIRO]: New macros.
(crxft_font_open_name, crxft_font_close, crxft_draw_create)
(crxft_draw_rect, crxft_draw_string, crxft_text_extents) [USE_CAIRO]: New
externs.
* lwlib/lwlib-utils.c [USE_CAIRO]: Include math.h, cairo-ft.h, and
cairo-xlib.h.
(crxft_font_open_name, crxft_font_close, crxft_draw_create)
(crxft_set_source_color, crxft_draw_rect, crxft_draw_string)
(crxft_text_extents) [USE_CAIRO]: New Xft compatibility functions.
* lwlib/xlwmenuP.h [USE_CAIRO]: Include lwlib-utils.h.
* lwlib/xlwmenu.c (display_menu_item) [USE_CAIRO]: Call
cairo_surface_mark_dirty and cairo_surface_flush.
* lwlib/lwlib-Xaw.c [USE_CAIRO]: Include stdlib.h and lwlib-utils.h.
(draw_text) [USE_CAIRO]: Call cairo_surface_flush.
* src/xsettings.c [USE_CAIRO]: Include fontconfig.h
(apply_xft_settings) [!HAVE_XFT]: Don't call XftDefaultSubstitute or
XftDefaultSet.
* lwlib/lwlib-Xaw.c:
* lwlib/lwlib-int.h:
* lwlib/xlwmenu.c:
* lwlib/xlwmenuP.h:
* src/xrdb.c:
* src/xsettings.c:
* src/xterm.c: Replace all #ifdef HAVE_XFT with #if defined USE_CAIRO ||
defined HAVE_XFT.
* src/xfns.c (x_default_font_parameter): Replace #ifdef HAVE_XFT with #if
defined USE_CAIRO || defined HAVE_XFT.
2019-04-24 03:31:37 +00:00
|
|
|
|
else
|
2015-04-19 21:40:51 +00:00
|
|
|
|
## Use -lXft if available, unless '--with-xft=no'.
|
2014-06-05 00:34:34 +00:00
|
|
|
|
HAVE_XFT=maybe
|
|
|
|
|
if test "x${with_x}" = "xno"; then
|
2009-02-26 21:23:17 +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
|
|
|
|
|
|
2009-02-26 21:23:17 +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])
|
2018-05-29 18:32:08 +00:00
|
|
|
|
## Because xterm.c uses XRenderQueryExtension when XFT is
|
|
|
|
|
## enabled, we also need to link to -lXrender.
|
2010-01-12 16:25:08 +00:00
|
|
|
|
if test "$HAVE_XFT" != no && test "$HAVE_XRENDER" != no; then
|
2009-02-26 21:23:17 +00:00
|
|
|
|
OLD_CPPFLAGS="$CPPFLAGS"
|
|
|
|
|
OLD_CFLAGS="$CFLAGS"
|
|
|
|
|
OLD_LIBS="$LIBS"
|
|
|
|
|
CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
|
|
|
|
|
CFLAGS="$CFLAGS $XFT_CFLAGS"
|
|
|
|
|
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>]])
|
2009-02-26 21:23:17 +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
|
2018-05-29 18:32:08 +00:00
|
|
|
|
else
|
|
|
|
|
# Make sure XFT is disabled if we found XFT but not XRender
|
|
|
|
|
HAVE_XFT=no
|
2009-02-26 21:23:17 +00:00
|
|
|
|
fi # "$HAVE_XFT" != no
|
|
|
|
|
fi # "x${with_xft}" != "xno"
|
|
|
|
|
|
|
|
|
|
if test "$HAVE_XFT" != "yes"; then
|
2011-03-06 01:42:13 +00:00
|
|
|
|
dnl For the "Does Emacs use" message at the end.
|
2009-02-26 21:23:17 +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)
|
2009-02-26 21:23:17 +00:00
|
|
|
|
fi
|
Don't link libXft when using cairo
* configure.ac: Check cairo early. Don't try Xft if cairo is used.
* lwlib/lwlib-utils.h [USE_CAIRO]: Include cairo.h and fontconfig.h.
(XftFont, XftDraw, XftColor, XGlyphInfo) [USE_CAIRO]: New typedefs.
(XftFontOpenName, XftFontClose, XftDrawCreate, XftDrawDestroy)
(XftDrawRect, XftDrawStringUtf8, XftTextExtentsUtf8) [USE_CAIRO]: New macros.
(crxft_font_open_name, crxft_font_close, crxft_draw_create)
(crxft_draw_rect, crxft_draw_string, crxft_text_extents) [USE_CAIRO]: New
externs.
* lwlib/lwlib-utils.c [USE_CAIRO]: Include math.h, cairo-ft.h, and
cairo-xlib.h.
(crxft_font_open_name, crxft_font_close, crxft_draw_create)
(crxft_set_source_color, crxft_draw_rect, crxft_draw_string)
(crxft_text_extents) [USE_CAIRO]: New Xft compatibility functions.
* lwlib/xlwmenuP.h [USE_CAIRO]: Include lwlib-utils.h.
* lwlib/xlwmenu.c (display_menu_item) [USE_CAIRO]: Call
cairo_surface_mark_dirty and cairo_surface_flush.
* lwlib/lwlib-Xaw.c [USE_CAIRO]: Include stdlib.h and lwlib-utils.h.
(draw_text) [USE_CAIRO]: Call cairo_surface_flush.
* src/xsettings.c [USE_CAIRO]: Include fontconfig.h
(apply_xft_settings) [!HAVE_XFT]: Don't call XftDefaultSubstitute or
XftDefaultSet.
* lwlib/lwlib-Xaw.c:
* lwlib/lwlib-int.h:
* lwlib/xlwmenu.c:
* lwlib/xlwmenuP.h:
* src/xrdb.c:
* src/xsettings.c:
* src/xterm.c: Replace all #ifdef HAVE_XFT with #if defined USE_CAIRO ||
defined HAVE_XFT.
* src/xfns.c (x_default_font_parameter): Replace #ifdef HAVE_XFT with #if
defined USE_CAIRO || defined HAVE_XFT.
2019-04-24 03:31:37 +00:00
|
|
|
|
fi # $HAVE_CAIRO != yes
|
New args --enable-font-backend, --with-xft,
--with-freetyp. New AC_DEFINEs USE_FONT_BACKEND, HAVE_XFT,
HAVE_FREETYPE, HAVE_LIBOTF. New AC_SUBSTs XFT_LIBS,
FREETYPE_CFLAGS, FREETYPE_LIBS, FONTCONFIG_CFLAGS,
FONTCONFIG_LIBS, LIBOTF_CFLAGS, LIBOTF_LIBS.
2006-06-06 03:53:23 +00:00
|
|
|
|
|
Add HarfBuzz font backend for MS-Windows
* src/w32uniscribe.c [HAVE_HARFBUZZ]: Include math.h and
hb.h.
(bswap_32): Define for GCC 4.3.0 and later; else include
<byteswap.h> from Gnulib.
(struct uniscribe_font_info): Extend for HarfBuzz; 'cache' is
now a 'void *' (all users changed).
[HAVE_HARFBUZZ]: Define typedefs for HarfBuzz functions to be
loaded dynamically from the HarfBuzz DLL. Define macros to
call those functions via function pointers.
(uniscribe_open) [HAVE_HARFBUZZ]: Use the HarfBuzz font driver
if the type of the font entity is 'harfbuzz'.
(uniscribe_close) [HAVE_HARFBUZZ]: For fonts using the
HarfBuzz backend, call hb_font_destroy to free memory used for
the cached hb_font data.
(uniscribe_shape): Fix assignment of character codepoints to
glyphs from a single cluster.
(w32hb_list, w32hb_match, free_cb, w32hb_get_font_table)
(w32hb_get_font, w32hb_encode_char, w32hb_begin_font)
(w32uni_combining, w32uni_general, w32uni_mirroring)
(get_hb_unicode_funcs, w32hb_shape)
(w32hb_combining_capability, load_harfbuzz_funcs)
[HAVE_HARFBUZZ]: New functions.
(syms_of_w32uniscribe_for_pdumper) [HAVE_HARFBUZZ]: Load the
HarfBuzz DLL and register the HarfBuzz backend with its
functions.
* src/w32font.c (syms_of_w32font) <Qharfbuzz>: New DEFSYM.
* src/w32fns.c (Fx_create_frame, w32_create_tip_frame)
[HAVE_HARFBUZZ]: Register the harfbuzz font backend.
* src/lisp.h (get_unicode_property): Declare prototype.
* src/font.h (harfbuzz_font_driver) [HAVE_NTGUI]: Declare.
* src/chartab.c (get_unicode_property): New function, body
taken from get-unicode-property-internal.
(Fget_unicode_property_internal): Call get_unicode_property
after validating input.
* doc/lispref/frames.texi (Font and Color Parameters):
* doc/emacs/msdos.texi (Windows Fonts): Document support for
HarfBuzz text shaping on MS-Windows.
* configure.ac (HAVE_HARFBUZZ): Move out of the X-specific
part, and consider HarfBuzz also for HAVE_W32 systems.
Require HarfBuzz v1.2.3 for w32.
2019-05-31 08:30:36 +00:00
|
|
|
|
HAVE_LIBOTF=no
|
|
|
|
|
if test "${HAVE_FREETYPE}" = "yes"; then
|
|
|
|
|
AC_DEFINE(HAVE_FREETYPE, 1,
|
|
|
|
|
[Define to 1 if using the freetype and fontconfig libraries.])
|
2019-06-02 04:33:43 +00:00
|
|
|
|
OLD_CFLAGS=$CFLAGS
|
|
|
|
|
OLD_LIBS=$LIBS
|
|
|
|
|
CFLAGS="$CFLAGS $FREETYPE_CFLAGS"
|
|
|
|
|
LIBS="$FREETYPE_LIBS $LIBS"
|
|
|
|
|
AC_CHECK_FUNCS(FT_Face_GetCharVariantIndex)
|
|
|
|
|
CFLAGS=$OLD_CFLAGS
|
|
|
|
|
LIBS=$OLD_LIBS
|
Add HarfBuzz font backend for MS-Windows
* src/w32uniscribe.c [HAVE_HARFBUZZ]: Include math.h and
hb.h.
(bswap_32): Define for GCC 4.3.0 and later; else include
<byteswap.h> from Gnulib.
(struct uniscribe_font_info): Extend for HarfBuzz; 'cache' is
now a 'void *' (all users changed).
[HAVE_HARFBUZZ]: Define typedefs for HarfBuzz functions to be
loaded dynamically from the HarfBuzz DLL. Define macros to
call those functions via function pointers.
(uniscribe_open) [HAVE_HARFBUZZ]: Use the HarfBuzz font driver
if the type of the font entity is 'harfbuzz'.
(uniscribe_close) [HAVE_HARFBUZZ]: For fonts using the
HarfBuzz backend, call hb_font_destroy to free memory used for
the cached hb_font data.
(uniscribe_shape): Fix assignment of character codepoints to
glyphs from a single cluster.
(w32hb_list, w32hb_match, free_cb, w32hb_get_font_table)
(w32hb_get_font, w32hb_encode_char, w32hb_begin_font)
(w32uni_combining, w32uni_general, w32uni_mirroring)
(get_hb_unicode_funcs, w32hb_shape)
(w32hb_combining_capability, load_harfbuzz_funcs)
[HAVE_HARFBUZZ]: New functions.
(syms_of_w32uniscribe_for_pdumper) [HAVE_HARFBUZZ]: Load the
HarfBuzz DLL and register the HarfBuzz backend with its
functions.
* src/w32font.c (syms_of_w32font) <Qharfbuzz>: New DEFSYM.
* src/w32fns.c (Fx_create_frame, w32_create_tip_frame)
[HAVE_HARFBUZZ]: Register the harfbuzz font backend.
* src/lisp.h (get_unicode_property): Declare prototype.
* src/font.h (harfbuzz_font_driver) [HAVE_NTGUI]: Declare.
* src/chartab.c (get_unicode_property): New function, body
taken from get-unicode-property-internal.
(Fget_unicode_property_internal): Call get_unicode_property
after validating input.
* doc/lispref/frames.texi (Font and Color Parameters):
* doc/emacs/msdos.texi (Windows Fonts): Document support for
HarfBuzz text shaping on MS-Windows.
* configure.ac (HAVE_HARFBUZZ): Move out of the X-specific
part, and consider HarfBuzz also for HAVE_W32 systems.
Require HarfBuzz v1.2.3 for w32.
2019-05-31 08:30:36 +00:00
|
|
|
|
if test "${with_libotf}" != "no"; then
|
|
|
|
|
EMACS_CHECK_MODULES([LIBOTF], [libotf])
|
|
|
|
|
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.])
|
2018-06-05 10:12:26 +00:00
|
|
|
|
fi
|
Add HarfBuzz font backend for MS-Windows
* src/w32uniscribe.c [HAVE_HARFBUZZ]: Include math.h and
hb.h.
(bswap_32): Define for GCC 4.3.0 and later; else include
<byteswap.h> from Gnulib.
(struct uniscribe_font_info): Extend for HarfBuzz; 'cache' is
now a 'void *' (all users changed).
[HAVE_HARFBUZZ]: Define typedefs for HarfBuzz functions to be
loaded dynamically from the HarfBuzz DLL. Define macros to
call those functions via function pointers.
(uniscribe_open) [HAVE_HARFBUZZ]: Use the HarfBuzz font driver
if the type of the font entity is 'harfbuzz'.
(uniscribe_close) [HAVE_HARFBUZZ]: For fonts using the
HarfBuzz backend, call hb_font_destroy to free memory used for
the cached hb_font data.
(uniscribe_shape): Fix assignment of character codepoints to
glyphs from a single cluster.
(w32hb_list, w32hb_match, free_cb, w32hb_get_font_table)
(w32hb_get_font, w32hb_encode_char, w32hb_begin_font)
(w32uni_combining, w32uni_general, w32uni_mirroring)
(get_hb_unicode_funcs, w32hb_shape)
(w32hb_combining_capability, load_harfbuzz_funcs)
[HAVE_HARFBUZZ]: New functions.
(syms_of_w32uniscribe_for_pdumper) [HAVE_HARFBUZZ]: Load the
HarfBuzz DLL and register the HarfBuzz backend with its
functions.
* src/w32font.c (syms_of_w32font) <Qharfbuzz>: New DEFSYM.
* src/w32fns.c (Fx_create_frame, w32_create_tip_frame)
[HAVE_HARFBUZZ]: Register the harfbuzz font backend.
* src/lisp.h (get_unicode_property): Declare prototype.
* src/font.h (harfbuzz_font_driver) [HAVE_NTGUI]: Declare.
* src/chartab.c (get_unicode_property): New function, body
taken from get-unicode-property-internal.
(Fget_unicode_property_internal): Call get_unicode_property
after validating input.
* doc/lispref/frames.texi (Font and Color Parameters):
* doc/emacs/msdos.texi (Windows Fonts): Document support for
HarfBuzz text shaping on MS-Windows.
* configure.ac (HAVE_HARFBUZZ): Move out of the X-specific
part, and consider HarfBuzz also for HAVE_W32 systems.
Require HarfBuzz v1.2.3 for w32.
2019-05-31 08:30:36 +00:00
|
|
|
|
if ! $PKG_CONFIG --atleast-version=0.9.16 libotf; then
|
|
|
|
|
AC_DEFINE(HAVE_OTF_KANNADA_BUG, 1,
|
2018-01-27 03:53:20 +00:00
|
|
|
|
[Define to 1 if libotf is affected by https://debbugs.gnu.org/28110.])
|
2009-02-26 21:23:17 +00:00
|
|
|
|
fi
|
2008-12-30 23:46:29 +00:00
|
|
|
|
fi
|
New args --enable-font-backend, --with-xft,
--with-freetyp. New AC_DEFINEs USE_FONT_BACKEND, HAVE_XFT,
HAVE_FREETYPE, HAVE_LIBOTF. New AC_SUBSTs XFT_LIBS,
FREETYPE_CFLAGS, FREETYPE_LIBS, FONTCONFIG_CFLAGS,
FONTCONFIG_LIBS, LIBOTF_CFLAGS, LIBOTF_LIBS.
2006-06-06 03:53:23 +00:00
|
|
|
|
fi
|
Add HarfBuzz font backend for MS-Windows
* src/w32uniscribe.c [HAVE_HARFBUZZ]: Include math.h and
hb.h.
(bswap_32): Define for GCC 4.3.0 and later; else include
<byteswap.h> from Gnulib.
(struct uniscribe_font_info): Extend for HarfBuzz; 'cache' is
now a 'void *' (all users changed).
[HAVE_HARFBUZZ]: Define typedefs for HarfBuzz functions to be
loaded dynamically from the HarfBuzz DLL. Define macros to
call those functions via function pointers.
(uniscribe_open) [HAVE_HARFBUZZ]: Use the HarfBuzz font driver
if the type of the font entity is 'harfbuzz'.
(uniscribe_close) [HAVE_HARFBUZZ]: For fonts using the
HarfBuzz backend, call hb_font_destroy to free memory used for
the cached hb_font data.
(uniscribe_shape): Fix assignment of character codepoints to
glyphs from a single cluster.
(w32hb_list, w32hb_match, free_cb, w32hb_get_font_table)
(w32hb_get_font, w32hb_encode_char, w32hb_begin_font)
(w32uni_combining, w32uni_general, w32uni_mirroring)
(get_hb_unicode_funcs, w32hb_shape)
(w32hb_combining_capability, load_harfbuzz_funcs)
[HAVE_HARFBUZZ]: New functions.
(syms_of_w32uniscribe_for_pdumper) [HAVE_HARFBUZZ]: Load the
HarfBuzz DLL and register the HarfBuzz backend with its
functions.
* src/w32font.c (syms_of_w32font) <Qharfbuzz>: New DEFSYM.
* src/w32fns.c (Fx_create_frame, w32_create_tip_frame)
[HAVE_HARFBUZZ]: Register the harfbuzz font backend.
* src/lisp.h (get_unicode_property): Declare prototype.
* src/font.h (harfbuzz_font_driver) [HAVE_NTGUI]: Declare.
* src/chartab.c (get_unicode_property): New function, body
taken from get-unicode-property-internal.
(Fget_unicode_property_internal): Call get_unicode_property
after validating input.
* doc/lispref/frames.texi (Font and Color Parameters):
* doc/emacs/msdos.texi (Windows Fonts): Document support for
HarfBuzz text shaping on MS-Windows.
* configure.ac (HAVE_HARFBUZZ): Move out of the X-specific
part, and consider HarfBuzz also for HAVE_W32 systems.
Require HarfBuzz v1.2.3 for w32.
2019-05-31 08:30:36 +00:00
|
|
|
|
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
|
2008-05-14 01:49:04 +00:00
|
|
|
|
|
Add HarfBuzz font backend for MS-Windows
* src/w32uniscribe.c [HAVE_HARFBUZZ]: Include math.h and
hb.h.
(bswap_32): Define for GCC 4.3.0 and later; else include
<byteswap.h> from Gnulib.
(struct uniscribe_font_info): Extend for HarfBuzz; 'cache' is
now a 'void *' (all users changed).
[HAVE_HARFBUZZ]: Define typedefs for HarfBuzz functions to be
loaded dynamically from the HarfBuzz DLL. Define macros to
call those functions via function pointers.
(uniscribe_open) [HAVE_HARFBUZZ]: Use the HarfBuzz font driver
if the type of the font entity is 'harfbuzz'.
(uniscribe_close) [HAVE_HARFBUZZ]: For fonts using the
HarfBuzz backend, call hb_font_destroy to free memory used for
the cached hb_font data.
(uniscribe_shape): Fix assignment of character codepoints to
glyphs from a single cluster.
(w32hb_list, w32hb_match, free_cb, w32hb_get_font_table)
(w32hb_get_font, w32hb_encode_char, w32hb_begin_font)
(w32uni_combining, w32uni_general, w32uni_mirroring)
(get_hb_unicode_funcs, w32hb_shape)
(w32hb_combining_capability, load_harfbuzz_funcs)
[HAVE_HARFBUZZ]: New functions.
(syms_of_w32uniscribe_for_pdumper) [HAVE_HARFBUZZ]: Load the
HarfBuzz DLL and register the HarfBuzz backend with its
functions.
* src/w32font.c (syms_of_w32font) <Qharfbuzz>: New DEFSYM.
* src/w32fns.c (Fx_create_frame, w32_create_tip_frame)
[HAVE_HARFBUZZ]: Register the harfbuzz font backend.
* src/lisp.h (get_unicode_property): Declare prototype.
* src/font.h (harfbuzz_font_driver) [HAVE_NTGUI]: Declare.
* src/chartab.c (get_unicode_property): New function, body
taken from get-unicode-property-internal.
(Fget_unicode_property_internal): Call get_unicode_property
after validating input.
* doc/lispref/frames.texi (Font and Color Parameters):
* doc/emacs/msdos.texi (Windows Fonts): Document support for
HarfBuzz text shaping on MS-Windows.
* configure.ac (HAVE_HARFBUZZ): Move out of the X-specific
part, and consider HarfBuzz also for HAVE_W32 systems.
Require HarfBuzz v1.2.3 for w32.
2019-05-31 08:30:36 +00:00
|
|
|
|
HAVE_M17N_FLT=no
|
|
|
|
|
if test "${HAVE_LIBOTF}" = yes; then
|
|
|
|
|
if test "${with_m17n_flt}" != "no"; then
|
|
|
|
|
EMACS_CHECK_MODULES([M17N_FLT], [m17n-flt])
|
|
|
|
|
if test "$HAVE_M17N_FLT" = "yes"; then
|
|
|
|
|
AC_DEFINE(HAVE_M17N_FLT, 1, [Define to 1 if using libm17n-flt.])
|
2009-02-26 21:23:17 +00:00
|
|
|
|
fi
|
2008-10-12 12:47:22 +00:00
|
|
|
|
fi
|
Add HarfBuzz font backend for MS-Windows
* src/w32uniscribe.c [HAVE_HARFBUZZ]: Include math.h and
hb.h.
(bswap_32): Define for GCC 4.3.0 and later; else include
<byteswap.h> from Gnulib.
(struct uniscribe_font_info): Extend for HarfBuzz; 'cache' is
now a 'void *' (all users changed).
[HAVE_HARFBUZZ]: Define typedefs for HarfBuzz functions to be
loaded dynamically from the HarfBuzz DLL. Define macros to
call those functions via function pointers.
(uniscribe_open) [HAVE_HARFBUZZ]: Use the HarfBuzz font driver
if the type of the font entity is 'harfbuzz'.
(uniscribe_close) [HAVE_HARFBUZZ]: For fonts using the
HarfBuzz backend, call hb_font_destroy to free memory used for
the cached hb_font data.
(uniscribe_shape): Fix assignment of character codepoints to
glyphs from a single cluster.
(w32hb_list, w32hb_match, free_cb, w32hb_get_font_table)
(w32hb_get_font, w32hb_encode_char, w32hb_begin_font)
(w32uni_combining, w32uni_general, w32uni_mirroring)
(get_hb_unicode_funcs, w32hb_shape)
(w32hb_combining_capability, load_harfbuzz_funcs)
[HAVE_HARFBUZZ]: New functions.
(syms_of_w32uniscribe_for_pdumper) [HAVE_HARFBUZZ]: Load the
HarfBuzz DLL and register the HarfBuzz backend with its
functions.
* src/w32font.c (syms_of_w32font) <Qharfbuzz>: New DEFSYM.
* src/w32fns.c (Fx_create_frame, w32_create_tip_frame)
[HAVE_HARFBUZZ]: Register the harfbuzz font backend.
* src/lisp.h (get_unicode_property): Declare prototype.
* src/font.h (harfbuzz_font_driver) [HAVE_NTGUI]: Declare.
* src/chartab.c (get_unicode_property): New function, body
taken from get-unicode-property-internal.
(Fget_unicode_property_internal): Call get_unicode_property
after validating input.
* doc/lispref/frames.texi (Font and Color Parameters):
* doc/emacs/msdos.texi (Windows Fonts): Document support for
HarfBuzz text shaping on MS-Windows.
* configure.ac (HAVE_HARFBUZZ): Move out of the X-specific
part, and consider HarfBuzz also for HAVE_W32 systems.
Require HarfBuzz v1.2.3 for w32.
2019-05-31 08:30:36 +00:00
|
|
|
|
fi
|
|
|
|
|
else # "${HAVE_X11}" != "yes"
|
Introduce Pure GTK3 port
* src/xsettings.h:
* src/xsettings.c:
(dpyinfo_valid, store_tool_bar_style_changed)
(XSETTINGS_FONT_NAME, get_prop_window, read_settings)
(apply_xft_settings, read_and_apply_settings)
(xft_settings_event, init_xsettings, xsettings_initialize):
* src/xfaces.c:
(x_create_gc, x_free_gc):
* src/xdisp.c (redisplay_tool_bar, redisplay_internal)
(draw_glyphs_debug, draw_glyphs, mouse_face_from_buffer_pos)
(note_mouse_highlight):
* src/terminal.c (Fterminal_live_p):
* src/termhooks.h (enum output_method, GCALIGNED_STRUCT)
(TERMINAL_FONT_CACHE):
* src/process.c (wait_reading_process_output):
* src/pgtkterm.h:
* src/pgtkterm.c:
* src/pgtkselect.h:
* src/pgtkselect.c:
* src/pgtkgui.h:
* src/pgtkfns.c:
* src/image.c:
(XGetPixel, XPutPixel, image_create_bitmap_from_data)
(image_create_bitmap_from_file, free_bitmap_record)
(image_destroy_x_image, gui_put_x_image, image_get_x_image)
(Create_Pixmap_From_Bitmap_Data, xbm_load_image, )
(xpm_load_image, lookup_rgb_color, image_disable_image)
(image_build_heuristic_mask, imagemagick_load_image):
* src/gtkutil.h:
* src/gtkutil.c (PGTK_TRACE, xg_set_screen, xg_display_open)
(xg_display_close, xg_create_default_cursor)
(xg_get_pixbuf_from_pix_and_mask, xg_check_special_colors)
(qttip_cb, hierarchy_ch_cb, xg_prepare_tooltip, )
(xg_show_tooltip, xg_hide_tooltip, xg_frame_resized)
(xg_frame_set_char_size, xg_height_or_width_changed)
(xg_set_widget_bg, style_changed_cb, xg_create_frame_widgets)
(xg_free_frame_widgets, x_wm_set_size_hint, xg_frame_restack)
(xg_mark_data, xg_update_frame_menubar, free_frame_menubar)
(xg_update_submenu, xg_finish_scroll_bar_creation)
(xg_update_scrollbar_pos, xg_update_horizontal_scrollbar_pos)
(xg_set_toolkit_scroll_bar_thumb, xg_event_is_for_scrollbar)
(draw_page, xg_pack_tool_bar, xg_create_tool_bar)
(xg_update_tool_bar_sizes, update_frame_tool_bar)
(free_frame_tool_bar, xg_change_toolbar_position):
* src/ftcrfont.c:
(ftcrfont_draw):
* src/fringe.c:
(init_fringe_bitmap):
* src/frame.h (GCALIGNED_STRUCT, FRAME_WINDOW_P):
* src/frame.c (Fframep):
* src/font.h:
* src/font.c (syms_of_font):
* src/emacsgtkfixed.c:
(emacs_fixed_get_preferred_width)
(emacs_fixed_get_preferred_height, XSetWMSizeHints):
* src/emacs.c (main):
* src/dispnew.c (init_display_interactive):
* src/dispextern.h:
* src/alloc.c:
(garbage_collect):
* src/Makefile.in (PGTK_OBJ, PGTK_LIBS, base_obj, LIBES):
* src/.gdbinit:
* lisp/url/url-privacy.el (url-setup-privacy-info):
* lisp/term/pgtk-win.el (featurep):
* lisp/startup.el (command-line, fancy-splash-frame):
* lisp/net/eww.el (eww-form-submit, eww-form-file)
(eww-form-checkbox, eww-form-select):
* lisp/mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event):
* lisp/loadup.el (featurep):
* lisp/international/mule-cmds.el (set-coding-system-map):
* lisp/frame.el (pgtk-frame-geometry, frame-geometry)
(w32-frame-edges, frame-edges)
(pgtk-mouse-absolute-pixel-position)
(mouse-absolute-pixel-position)
(pgtk-set-mouse-absolute-pixel-position)
(pgtk-frame-list-z-order, frame-list-z-order)
(pgtk-frame-restack, frame-restack, display-mouse-p)
(display-graphic-p, display-symbol-keys-p, )
(display-pixel-height, display-mm-height, display-mm-width)
(display-backing-store, display-save-under, display-color-cells)
(display-planes, display-visual-class)
(pgtk-display-monitor-attributes-list)
(display-monitor-attributes-list):
* lisp/faces.el (face-spec-set-match-display, tool-bar):
* lisp/cus-edit.el (custom-button, custom-button-mouse)
(custom-button-pressed, custom-display):
* configure.ac (AUTO_DEPEND, XARGS_LIMIT, XWIDGETS_OBJ):
2017-10-28 07:16:29 +00:00
|
|
|
|
if test $window_system = pgtk; then
|
|
|
|
|
EMACS_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.2.0])
|
|
|
|
|
EMACS_CHECK_MODULES([FREETYPE], [freetype2])
|
|
|
|
|
if test "$HAVE_FONTCONFIG" != yes -o "$HAVE_FREETYPE" != yes; then
|
|
|
|
|
AC_MSG_ERROR(fontconfig and freetype is required.)
|
|
|
|
|
fi
|
|
|
|
|
HAVE_LIBOTF=no
|
|
|
|
|
AC_DEFINE(HAVE_FREETYPE, 1,
|
|
|
|
|
[Define to 1 if using the freetype and fontconfig libraries.])
|
|
|
|
|
if test "${with_libotf}" != "no"; then
|
|
|
|
|
EMACS_CHECK_MODULES([LIBOTF], [libotf])
|
|
|
|
|
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
|
|
|
|
|
else
|
|
|
|
|
HAVE_XFT=no
|
|
|
|
|
HAVE_FREETYPE=no
|
|
|
|
|
HAVE_LIBOTF=no
|
|
|
|
|
HAVE_M17N_FLT=no
|
|
|
|
|
fi
|
Add HarfBuzz font backend for MS-Windows
* src/w32uniscribe.c [HAVE_HARFBUZZ]: Include math.h and
hb.h.
(bswap_32): Define for GCC 4.3.0 and later; else include
<byteswap.h> from Gnulib.
(struct uniscribe_font_info): Extend for HarfBuzz; 'cache' is
now a 'void *' (all users changed).
[HAVE_HARFBUZZ]: Define typedefs for HarfBuzz functions to be
loaded dynamically from the HarfBuzz DLL. Define macros to
call those functions via function pointers.
(uniscribe_open) [HAVE_HARFBUZZ]: Use the HarfBuzz font driver
if the type of the font entity is 'harfbuzz'.
(uniscribe_close) [HAVE_HARFBUZZ]: For fonts using the
HarfBuzz backend, call hb_font_destroy to free memory used for
the cached hb_font data.
(uniscribe_shape): Fix assignment of character codepoints to
glyphs from a single cluster.
(w32hb_list, w32hb_match, free_cb, w32hb_get_font_table)
(w32hb_get_font, w32hb_encode_char, w32hb_begin_font)
(w32uni_combining, w32uni_general, w32uni_mirroring)
(get_hb_unicode_funcs, w32hb_shape)
(w32hb_combining_capability, load_harfbuzz_funcs)
[HAVE_HARFBUZZ]: New functions.
(syms_of_w32uniscribe_for_pdumper) [HAVE_HARFBUZZ]: Load the
HarfBuzz DLL and register the HarfBuzz backend with its
functions.
* src/w32font.c (syms_of_w32font) <Qharfbuzz>: New DEFSYM.
* src/w32fns.c (Fx_create_frame, w32_create_tip_frame)
[HAVE_HARFBUZZ]: Register the harfbuzz font backend.
* src/lisp.h (get_unicode_property): Declare prototype.
* src/font.h (harfbuzz_font_driver) [HAVE_NTGUI]: Declare.
* src/chartab.c (get_unicode_property): New function, body
taken from get-unicode-property-internal.
(Fget_unicode_property_internal): Call get_unicode_property
after validating input.
* doc/lispref/frames.texi (Font and Color Parameters):
* doc/emacs/msdos.texi (Windows Fonts): Document support for
HarfBuzz text shaping on MS-Windows.
* configure.ac (HAVE_HARFBUZZ): Move out of the X-specific
part, and consider HarfBuzz also for HAVE_W32 systems.
Require HarfBuzz v1.2.3 for w32.
2019-05-31 08:30:36 +00:00
|
|
|
|
fi # "${HAVE_X11}" != "yes"
|
|
|
|
|
|
|
|
|
|
HAVE_HARFBUZZ=no
|
2020-11-12 15:51:49 +00:00
|
|
|
|
### On MS-Windows we use hb_font_get_nominal_glyph, which appeared
|
|
|
|
|
### in HarfBuzz version 1.2.3
|
|
|
|
|
if test "${HAVE_W32}" = "yes"; then
|
|
|
|
|
harfbuzz_required_ver=1.2.3
|
|
|
|
|
else
|
|
|
|
|
harfbuzz_required_ver=0.9.42
|
|
|
|
|
fi
|
Add HarfBuzz font backend for MS-Windows
* src/w32uniscribe.c [HAVE_HARFBUZZ]: Include math.h and
hb.h.
(bswap_32): Define for GCC 4.3.0 and later; else include
<byteswap.h> from Gnulib.
(struct uniscribe_font_info): Extend for HarfBuzz; 'cache' is
now a 'void *' (all users changed).
[HAVE_HARFBUZZ]: Define typedefs for HarfBuzz functions to be
loaded dynamically from the HarfBuzz DLL. Define macros to
call those functions via function pointers.
(uniscribe_open) [HAVE_HARFBUZZ]: Use the HarfBuzz font driver
if the type of the font entity is 'harfbuzz'.
(uniscribe_close) [HAVE_HARFBUZZ]: For fonts using the
HarfBuzz backend, call hb_font_destroy to free memory used for
the cached hb_font data.
(uniscribe_shape): Fix assignment of character codepoints to
glyphs from a single cluster.
(w32hb_list, w32hb_match, free_cb, w32hb_get_font_table)
(w32hb_get_font, w32hb_encode_char, w32hb_begin_font)
(w32uni_combining, w32uni_general, w32uni_mirroring)
(get_hb_unicode_funcs, w32hb_shape)
(w32hb_combining_capability, load_harfbuzz_funcs)
[HAVE_HARFBUZZ]: New functions.
(syms_of_w32uniscribe_for_pdumper) [HAVE_HARFBUZZ]: Load the
HarfBuzz DLL and register the HarfBuzz backend with its
functions.
* src/w32font.c (syms_of_w32font) <Qharfbuzz>: New DEFSYM.
* src/w32fns.c (Fx_create_frame, w32_create_tip_frame)
[HAVE_HARFBUZZ]: Register the harfbuzz font backend.
* src/lisp.h (get_unicode_property): Declare prototype.
* src/font.h (harfbuzz_font_driver) [HAVE_NTGUI]: Declare.
* src/chartab.c (get_unicode_property): New function, body
taken from get-unicode-property-internal.
(Fget_unicode_property_internal): Call get_unicode_property
after validating input.
* doc/lispref/frames.texi (Font and Color Parameters):
* doc/emacs/msdos.texi (Windows Fonts): Document support for
HarfBuzz text shaping on MS-Windows.
* configure.ac (HAVE_HARFBUZZ): Move out of the X-specific
part, and consider HarfBuzz also for HAVE_W32 systems.
Require HarfBuzz v1.2.3 for w32.
2019-05-31 08:30:36 +00:00
|
|
|
|
if test "${HAVE_X11}" = "yes" && test "${HAVE_FREETYPE}" = "yes" \
|
Introduce Pure GTK3 port
* src/xsettings.h:
* src/xsettings.c:
(dpyinfo_valid, store_tool_bar_style_changed)
(XSETTINGS_FONT_NAME, get_prop_window, read_settings)
(apply_xft_settings, read_and_apply_settings)
(xft_settings_event, init_xsettings, xsettings_initialize):
* src/xfaces.c:
(x_create_gc, x_free_gc):
* src/xdisp.c (redisplay_tool_bar, redisplay_internal)
(draw_glyphs_debug, draw_glyphs, mouse_face_from_buffer_pos)
(note_mouse_highlight):
* src/terminal.c (Fterminal_live_p):
* src/termhooks.h (enum output_method, GCALIGNED_STRUCT)
(TERMINAL_FONT_CACHE):
* src/process.c (wait_reading_process_output):
* src/pgtkterm.h:
* src/pgtkterm.c:
* src/pgtkselect.h:
* src/pgtkselect.c:
* src/pgtkgui.h:
* src/pgtkfns.c:
* src/image.c:
(XGetPixel, XPutPixel, image_create_bitmap_from_data)
(image_create_bitmap_from_file, free_bitmap_record)
(image_destroy_x_image, gui_put_x_image, image_get_x_image)
(Create_Pixmap_From_Bitmap_Data, xbm_load_image, )
(xpm_load_image, lookup_rgb_color, image_disable_image)
(image_build_heuristic_mask, imagemagick_load_image):
* src/gtkutil.h:
* src/gtkutil.c (PGTK_TRACE, xg_set_screen, xg_display_open)
(xg_display_close, xg_create_default_cursor)
(xg_get_pixbuf_from_pix_and_mask, xg_check_special_colors)
(qttip_cb, hierarchy_ch_cb, xg_prepare_tooltip, )
(xg_show_tooltip, xg_hide_tooltip, xg_frame_resized)
(xg_frame_set_char_size, xg_height_or_width_changed)
(xg_set_widget_bg, style_changed_cb, xg_create_frame_widgets)
(xg_free_frame_widgets, x_wm_set_size_hint, xg_frame_restack)
(xg_mark_data, xg_update_frame_menubar, free_frame_menubar)
(xg_update_submenu, xg_finish_scroll_bar_creation)
(xg_update_scrollbar_pos, xg_update_horizontal_scrollbar_pos)
(xg_set_toolkit_scroll_bar_thumb, xg_event_is_for_scrollbar)
(draw_page, xg_pack_tool_bar, xg_create_tool_bar)
(xg_update_tool_bar_sizes, update_frame_tool_bar)
(free_frame_tool_bar, xg_change_toolbar_position):
* src/ftcrfont.c:
(ftcrfont_draw):
* src/fringe.c:
(init_fringe_bitmap):
* src/frame.h (GCALIGNED_STRUCT, FRAME_WINDOW_P):
* src/frame.c (Fframep):
* src/font.h:
* src/font.c (syms_of_font):
* src/emacsgtkfixed.c:
(emacs_fixed_get_preferred_width)
(emacs_fixed_get_preferred_height, XSetWMSizeHints):
* src/emacs.c (main):
* src/dispnew.c (init_display_interactive):
* src/dispextern.h:
* src/alloc.c:
(garbage_collect):
* src/Makefile.in (PGTK_OBJ, PGTK_LIBS, base_obj, LIBES):
* src/.gdbinit:
* lisp/url/url-privacy.el (url-setup-privacy-info):
* lisp/term/pgtk-win.el (featurep):
* lisp/startup.el (command-line, fancy-splash-frame):
* lisp/net/eww.el (eww-form-submit, eww-form-file)
(eww-form-checkbox, eww-form-select):
* lisp/mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event):
* lisp/loadup.el (featurep):
* lisp/international/mule-cmds.el (set-coding-system-map):
* lisp/frame.el (pgtk-frame-geometry, frame-geometry)
(w32-frame-edges, frame-edges)
(pgtk-mouse-absolute-pixel-position)
(mouse-absolute-pixel-position)
(pgtk-set-mouse-absolute-pixel-position)
(pgtk-frame-list-z-order, frame-list-z-order)
(pgtk-frame-restack, frame-restack, display-mouse-p)
(display-graphic-p, display-symbol-keys-p, )
(display-pixel-height, display-mm-height, display-mm-width)
(display-backing-store, display-save-under, display-color-cells)
(display-planes, display-visual-class)
(pgtk-display-monitor-attributes-list)
(display-monitor-attributes-list):
* lisp/faces.el (face-spec-set-match-display, tool-bar):
* lisp/cus-edit.el (custom-button, custom-button-mouse)
(custom-button-pressed, custom-display):
* configure.ac (AUTO_DEPEND, XARGS_LIMIT, XWIDGETS_OBJ):
2017-10-28 07:16:29 +00:00
|
|
|
|
|| test "$window_system" = "pgtk" \
|
Add HarfBuzz font backend for MS-Windows
* src/w32uniscribe.c [HAVE_HARFBUZZ]: Include math.h and
hb.h.
(bswap_32): Define for GCC 4.3.0 and later; else include
<byteswap.h> from Gnulib.
(struct uniscribe_font_info): Extend for HarfBuzz; 'cache' is
now a 'void *' (all users changed).
[HAVE_HARFBUZZ]: Define typedefs for HarfBuzz functions to be
loaded dynamically from the HarfBuzz DLL. Define macros to
call those functions via function pointers.
(uniscribe_open) [HAVE_HARFBUZZ]: Use the HarfBuzz font driver
if the type of the font entity is 'harfbuzz'.
(uniscribe_close) [HAVE_HARFBUZZ]: For fonts using the
HarfBuzz backend, call hb_font_destroy to free memory used for
the cached hb_font data.
(uniscribe_shape): Fix assignment of character codepoints to
glyphs from a single cluster.
(w32hb_list, w32hb_match, free_cb, w32hb_get_font_table)
(w32hb_get_font, w32hb_encode_char, w32hb_begin_font)
(w32uni_combining, w32uni_general, w32uni_mirroring)
(get_hb_unicode_funcs, w32hb_shape)
(w32hb_combining_capability, load_harfbuzz_funcs)
[HAVE_HARFBUZZ]: New functions.
(syms_of_w32uniscribe_for_pdumper) [HAVE_HARFBUZZ]: Load the
HarfBuzz DLL and register the HarfBuzz backend with its
functions.
* src/w32font.c (syms_of_w32font) <Qharfbuzz>: New DEFSYM.
* src/w32fns.c (Fx_create_frame, w32_create_tip_frame)
[HAVE_HARFBUZZ]: Register the harfbuzz font backend.
* src/lisp.h (get_unicode_property): Declare prototype.
* src/font.h (harfbuzz_font_driver) [HAVE_NTGUI]: Declare.
* src/chartab.c (get_unicode_property): New function, body
taken from get-unicode-property-internal.
(Fget_unicode_property_internal): Call get_unicode_property
after validating input.
* doc/lispref/frames.texi (Font and Color Parameters):
* doc/emacs/msdos.texi (Windows Fonts): Document support for
HarfBuzz text shaping on MS-Windows.
* configure.ac (HAVE_HARFBUZZ): Move out of the X-specific
part, and consider HarfBuzz also for HAVE_W32 systems.
Require HarfBuzz v1.2.3 for w32.
2019-05-31 08:30:36 +00:00
|
|
|
|
|| test "${HAVE_W32}" = "yes"; then
|
|
|
|
|
if test "${with_harfbuzz}" != "no"; then
|
2020-11-12 15:51:49 +00:00
|
|
|
|
EMACS_CHECK_MODULES([HARFBUZZ], [harfbuzz >= $harfbuzz_required_ver])
|
Add HarfBuzz font backend for MS-Windows
* src/w32uniscribe.c [HAVE_HARFBUZZ]: Include math.h and
hb.h.
(bswap_32): Define for GCC 4.3.0 and later; else include
<byteswap.h> from Gnulib.
(struct uniscribe_font_info): Extend for HarfBuzz; 'cache' is
now a 'void *' (all users changed).
[HAVE_HARFBUZZ]: Define typedefs for HarfBuzz functions to be
loaded dynamically from the HarfBuzz DLL. Define macros to
call those functions via function pointers.
(uniscribe_open) [HAVE_HARFBUZZ]: Use the HarfBuzz font driver
if the type of the font entity is 'harfbuzz'.
(uniscribe_close) [HAVE_HARFBUZZ]: For fonts using the
HarfBuzz backend, call hb_font_destroy to free memory used for
the cached hb_font data.
(uniscribe_shape): Fix assignment of character codepoints to
glyphs from a single cluster.
(w32hb_list, w32hb_match, free_cb, w32hb_get_font_table)
(w32hb_get_font, w32hb_encode_char, w32hb_begin_font)
(w32uni_combining, w32uni_general, w32uni_mirroring)
(get_hb_unicode_funcs, w32hb_shape)
(w32hb_combining_capability, load_harfbuzz_funcs)
[HAVE_HARFBUZZ]: New functions.
(syms_of_w32uniscribe_for_pdumper) [HAVE_HARFBUZZ]: Load the
HarfBuzz DLL and register the HarfBuzz backend with its
functions.
* src/w32font.c (syms_of_w32font) <Qharfbuzz>: New DEFSYM.
* src/w32fns.c (Fx_create_frame, w32_create_tip_frame)
[HAVE_HARFBUZZ]: Register the harfbuzz font backend.
* src/lisp.h (get_unicode_property): Declare prototype.
* src/font.h (harfbuzz_font_driver) [HAVE_NTGUI]: Declare.
* src/chartab.c (get_unicode_property): New function, body
taken from get-unicode-property-internal.
(Fget_unicode_property_internal): Call get_unicode_property
after validating input.
* doc/lispref/frames.texi (Font and Color Parameters):
* doc/emacs/msdos.texi (Windows Fonts): Document support for
HarfBuzz text shaping on MS-Windows.
* configure.ac (HAVE_HARFBUZZ): Move out of the X-specific
part, and consider HarfBuzz also for HAVE_W32 systems.
Require HarfBuzz v1.2.3 for w32.
2019-05-31 08:30:36 +00:00
|
|
|
|
if test "$HAVE_HARFBUZZ" = "yes"; then
|
|
|
|
|
AC_DEFINE(HAVE_HARFBUZZ, 1, [Define to 1 if using HarfBuzz.])
|
|
|
|
|
### mingw32 and Cygwin-w32 don't use -lharfbuzz, since they load
|
|
|
|
|
### the library dynamically.
|
|
|
|
|
if test "${HAVE_W32}" = "yes"; then
|
|
|
|
|
HARFBUZZ_LIBS=
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
fi
|
2008-05-14 01:49:04 +00:00
|
|
|
|
fi
|
2010-04-28 07:08:53 +00:00
|
|
|
|
|
Add HarfBuzz font backend for MS-Windows
* src/w32uniscribe.c [HAVE_HARFBUZZ]: Include math.h and
hb.h.
(bswap_32): Define for GCC 4.3.0 and later; else include
<byteswap.h> from Gnulib.
(struct uniscribe_font_info): Extend for HarfBuzz; 'cache' is
now a 'void *' (all users changed).
[HAVE_HARFBUZZ]: Define typedefs for HarfBuzz functions to be
loaded dynamically from the HarfBuzz DLL. Define macros to
call those functions via function pointers.
(uniscribe_open) [HAVE_HARFBUZZ]: Use the HarfBuzz font driver
if the type of the font entity is 'harfbuzz'.
(uniscribe_close) [HAVE_HARFBUZZ]: For fonts using the
HarfBuzz backend, call hb_font_destroy to free memory used for
the cached hb_font data.
(uniscribe_shape): Fix assignment of character codepoints to
glyphs from a single cluster.
(w32hb_list, w32hb_match, free_cb, w32hb_get_font_table)
(w32hb_get_font, w32hb_encode_char, w32hb_begin_font)
(w32uni_combining, w32uni_general, w32uni_mirroring)
(get_hb_unicode_funcs, w32hb_shape)
(w32hb_combining_capability, load_harfbuzz_funcs)
[HAVE_HARFBUZZ]: New functions.
(syms_of_w32uniscribe_for_pdumper) [HAVE_HARFBUZZ]: Load the
HarfBuzz DLL and register the HarfBuzz backend with its
functions.
* src/w32font.c (syms_of_w32font) <Qharfbuzz>: New DEFSYM.
* src/w32fns.c (Fx_create_frame, w32_create_tip_frame)
[HAVE_HARFBUZZ]: Register the harfbuzz font backend.
* src/lisp.h (get_unicode_property): Declare prototype.
* src/font.h (harfbuzz_font_driver) [HAVE_NTGUI]: Declare.
* src/chartab.c (get_unicode_property): New function, body
taken from get-unicode-property-internal.
(Fget_unicode_property_internal): Call get_unicode_property
after validating input.
* doc/lispref/frames.texi (Font and Color Parameters):
* doc/emacs/msdos.texi (Windows Fonts): Document support for
HarfBuzz text shaping on MS-Windows.
* configure.ac (HAVE_HARFBUZZ): Move out of the X-specific
part, and consider HarfBuzz also for HAVE_W32 systems.
Require HarfBuzz v1.2.3 for w32.
2019-05-31 08:30:36 +00:00
|
|
|
|
### End of font-backend section.
|
2008-05-14 01:49:04 +00:00
|
|
|
|
|
|
|
|
|
AC_SUBST(FREETYPE_CFLAGS)
|
|
|
|
|
AC_SUBST(FREETYPE_LIBS)
|
|
|
|
|
AC_SUBST(FONTCONFIG_CFLAGS)
|
|
|
|
|
AC_SUBST(FONTCONFIG_LIBS)
|
2018-06-05 10:12:26 +00:00
|
|
|
|
AC_SUBST(HARFBUZZ_CFLAGS)
|
|
|
|
|
AC_SUBST(HARFBUZZ_LIBS)
|
2008-05-14 01:49:04 +00:00
|
|
|
|
AC_SUBST(LIBOTF_CFLAGS)
|
|
|
|
|
AC_SUBST(LIBOTF_LIBS)
|
|
|
|
|
AC_SUBST(M17N_FLT_CFLAGS)
|
|
|
|
|
AC_SUBST(M17N_FLT_LIBS)
|
|
|
|
|
|
Introduce Pure GTK3 port
* src/xsettings.h:
* src/xsettings.c:
(dpyinfo_valid, store_tool_bar_style_changed)
(XSETTINGS_FONT_NAME, get_prop_window, read_settings)
(apply_xft_settings, read_and_apply_settings)
(xft_settings_event, init_xsettings, xsettings_initialize):
* src/xfaces.c:
(x_create_gc, x_free_gc):
* src/xdisp.c (redisplay_tool_bar, redisplay_internal)
(draw_glyphs_debug, draw_glyphs, mouse_face_from_buffer_pos)
(note_mouse_highlight):
* src/terminal.c (Fterminal_live_p):
* src/termhooks.h (enum output_method, GCALIGNED_STRUCT)
(TERMINAL_FONT_CACHE):
* src/process.c (wait_reading_process_output):
* src/pgtkterm.h:
* src/pgtkterm.c:
* src/pgtkselect.h:
* src/pgtkselect.c:
* src/pgtkgui.h:
* src/pgtkfns.c:
* src/image.c:
(XGetPixel, XPutPixel, image_create_bitmap_from_data)
(image_create_bitmap_from_file, free_bitmap_record)
(image_destroy_x_image, gui_put_x_image, image_get_x_image)
(Create_Pixmap_From_Bitmap_Data, xbm_load_image, )
(xpm_load_image, lookup_rgb_color, image_disable_image)
(image_build_heuristic_mask, imagemagick_load_image):
* src/gtkutil.h:
* src/gtkutil.c (PGTK_TRACE, xg_set_screen, xg_display_open)
(xg_display_close, xg_create_default_cursor)
(xg_get_pixbuf_from_pix_and_mask, xg_check_special_colors)
(qttip_cb, hierarchy_ch_cb, xg_prepare_tooltip, )
(xg_show_tooltip, xg_hide_tooltip, xg_frame_resized)
(xg_frame_set_char_size, xg_height_or_width_changed)
(xg_set_widget_bg, style_changed_cb, xg_create_frame_widgets)
(xg_free_frame_widgets, x_wm_set_size_hint, xg_frame_restack)
(xg_mark_data, xg_update_frame_menubar, free_frame_menubar)
(xg_update_submenu, xg_finish_scroll_bar_creation)
(xg_update_scrollbar_pos, xg_update_horizontal_scrollbar_pos)
(xg_set_toolkit_scroll_bar_thumb, xg_event_is_for_scrollbar)
(draw_page, xg_pack_tool_bar, xg_create_tool_bar)
(xg_update_tool_bar_sizes, update_frame_tool_bar)
(free_frame_tool_bar, xg_change_toolbar_position):
* src/ftcrfont.c:
(ftcrfont_draw):
* src/fringe.c:
(init_fringe_bitmap):
* src/frame.h (GCALIGNED_STRUCT, FRAME_WINDOW_P):
* src/frame.c (Fframep):
* src/font.h:
* src/font.c (syms_of_font):
* src/emacsgtkfixed.c:
(emacs_fixed_get_preferred_width)
(emacs_fixed_get_preferred_height, XSetWMSizeHints):
* src/emacs.c (main):
* src/dispnew.c (init_display_interactive):
* src/dispextern.h:
* src/alloc.c:
(garbage_collect):
* src/Makefile.in (PGTK_OBJ, PGTK_LIBS, base_obj, LIBES):
* src/.gdbinit:
* lisp/url/url-privacy.el (url-setup-privacy-info):
* lisp/term/pgtk-win.el (featurep):
* lisp/startup.el (command-line, fancy-splash-frame):
* lisp/net/eww.el (eww-form-submit, eww-form-file)
(eww-form-checkbox, eww-form-select):
* lisp/mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event):
* lisp/loadup.el (featurep):
* lisp/international/mule-cmds.el (set-coding-system-map):
* lisp/frame.el (pgtk-frame-geometry, frame-geometry)
(w32-frame-edges, frame-edges)
(pgtk-mouse-absolute-pixel-position)
(mouse-absolute-pixel-position)
(pgtk-set-mouse-absolute-pixel-position)
(pgtk-frame-list-z-order, frame-list-z-order)
(pgtk-frame-restack, frame-restack, display-mouse-p)
(display-graphic-p, display-symbol-keys-p, )
(display-pixel-height, display-mm-height, display-mm-width)
(display-backing-store, display-save-under, display-color-cells)
(display-planes, display-visual-class)
(pgtk-display-monitor-attributes-list)
(display-monitor-attributes-list):
* lisp/faces.el (face-spec-set-match-display, tool-bar):
* lisp/cus-edit.el (custom-button, custom-button-mouse)
(custom-button-pressed, custom-display):
* configure.ac (AUTO_DEPEND, XARGS_LIMIT, XWIDGETS_OBJ):
2017-10-28 07:16:29 +00:00
|
|
|
|
HAVE_CAIRO=no
|
|
|
|
|
if test "${HAVE_X11}" = "yes" -o "$window_system" = pgtk; then
|
|
|
|
|
if test "${with_cairo}" != "no"; then
|
|
|
|
|
CAIRO_REQUIRED=1.12.0
|
|
|
|
|
CAIRO_MODULE="cairo >= $CAIRO_REQUIRED"
|
|
|
|
|
EMACS_CHECK_MODULES(CAIRO, $CAIRO_MODULE)
|
|
|
|
|
if test $HAVE_CAIRO = yes; then
|
|
|
|
|
AC_DEFINE(USE_CAIRO, 1, [Define to 1 if using cairo.])
|
|
|
|
|
else
|
|
|
|
|
AC_MSG_ERROR([cairo requested but not found.])
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
CFLAGS="$CFLAGS $CAIRO_CFLAGS"
|
|
|
|
|
LIBS="$LIBS $CAIRO_LIBS"
|
|
|
|
|
AC_SUBST(CAIRO_CFLAGS)
|
|
|
|
|
AC_SUBST(CAIRO_LIBS)
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
2015-11-07 08:06:32 +00:00
|
|
|
|
if test "${HAVE_X11}" = "yes"; then
|
|
|
|
|
AC_CHECK_HEADER(X11/Xlib-xcb.h,
|
|
|
|
|
AC_CHECK_LIB(xcb, xcb_translate_coordinates, HAVE_XCB=yes))
|
|
|
|
|
if test "${HAVE_XCB}" = "yes"; then
|
|
|
|
|
AC_CHECK_LIB(X11-xcb, XGetXCBConnection, HAVE_X11_XCB=yes)
|
|
|
|
|
if test "${HAVE_X11_XCB}" = "yes"; then
|
|
|
|
|
AC_DEFINE(USE_XCB, 1,
|
|
|
|
|
[Define to 1 if you have the XCB library and X11-XCB library for mixed
|
|
|
|
|
X11/XCB programming.])
|
|
|
|
|
XCB_LIBS="-lX11-xcb -lxcb"
|
|
|
|
|
AC_SUBST(XCB_LIBS)
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
2015-04-19 21:40:51 +00:00
|
|
|
|
### 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.
|
2016-06-14 13:50:38 +00:00
|
|
|
|
### The Cygwin-w32 build uses <noX/xpm.h> instead of <X11/xpm.h>, so
|
|
|
|
|
### we need to set LDFLAGS accordingly.
|
1999-08-28 06:23:04 +00:00
|
|
|
|
HAVE_XPM=no
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +00:00
|
|
|
|
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_LDFLAGS="$LDFLAGS"
|
|
|
|
|
LDFLAGS="$LDFLAGS -L/usr/lib/noX"
|
2016-06-14 13:50:38 +00:00
|
|
|
|
AC_CHECK_HEADER(noX/xpm.h,
|
2012-09-17 11:55:02 +00:00
|
|
|
|
[AC_CHECK_LIB(Xpm, XpmReadFileToImage, HAVE_XPM=yes)])
|
|
|
|
|
if test "${HAVE_XPM}" = "yes"; then
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
AC_CACHE_CHECK([for XpmReturnAllocPixels preprocessor define],
|
|
|
|
|
[emacs_cv_cpp_xpm_return_alloc_pixels],
|
|
|
|
|
[AC_EGREP_CPP(no_return_alloc_pixels,
|
2016-06-14 13:50:38 +00:00
|
|
|
|
[#include "noX/xpm.h"
|
2012-09-17 11:55:02 +00:00
|
|
|
|
#ifndef XpmReturnAllocPixels
|
|
|
|
|
no_return_alloc_pixels
|
|
|
|
|
#endif
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
], emacs_cv_cpp_xpm_return_alloc_pixels=no,
|
|
|
|
|
emacs_cv_cpp_xpm_return_alloc_pixels=yes)])
|
2012-09-17 11:55:02 +00:00
|
|
|
|
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
if test "$emacs_cv_cpp_xpm_return_alloc_pixels" = "no"; then
|
|
|
|
|
HAVE_XPM=no
|
2012-09-17 11:55:02 +00:00
|
|
|
|
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
|
|
|
|
|
|
1999-08-28 06:23:04 +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.
|
2019-03-25 17:46:04 +00:00
|
|
|
|
case $opsys,$with_xpm_set,$with_xpm in
|
|
|
|
|
aix4-2,set,yes) ;;
|
|
|
|
|
aix4-2,*) with_xpm=no;;
|
|
|
|
|
esac
|
2014-06-07 06:10:39 +00:00
|
|
|
|
|
1999-08-28 06:23:04 +00:00
|
|
|
|
if test "${with_xpm}" != "no"; then
|
|
|
|
|
AC_CHECK_HEADER(X11/xpm.h,
|
2007-09-01 23:26:52 +00:00
|
|
|
|
[AC_CHECK_LIB(Xpm, XpmReadFileToPixmap, HAVE_XPM=yes, , -lX11)])
|
2000-07-10 20:37:48 +00:00
|
|
|
|
if test "${HAVE_XPM}" = "yes"; then
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
AC_CACHE_CHECK([for XpmReturnAllocPixels preprocessor define],
|
|
|
|
|
[emacs_cv_cpp_xpm_return_alloc_pixels],
|
|
|
|
|
[AC_EGREP_CPP(no_return_alloc_pixels,
|
2017-09-05 01:46:05 +00:00
|
|
|
|
[#include "X11/xpm.h"
|
2000-07-10 20:37:48 +00:00
|
|
|
|
#ifndef XpmReturnAllocPixels
|
|
|
|
|
no_return_alloc_pixels
|
|
|
|
|
#endif
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
], emacs_cv_cpp_xpm_return_alloc_pixels=no,
|
|
|
|
|
emacs_cv_cpp_xpm_return_alloc_pixels=yes)])
|
2001-03-20 15:47:08 +00:00
|
|
|
|
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
if test "$emacs_cv_cpp_xpm_return_alloc_pixels" = "no"; then
|
|
|
|
|
HAVE_XPM=no
|
2001-03-20 15:47:08 +00:00
|
|
|
|
fi
|
2000-09-01 14:05:06 +00:00
|
|
|
|
fi
|
1999-08-28 06:23:04 +00:00
|
|
|
|
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).])
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +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
|
1999-08-28 06:23:04 +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
|
|
|
|
|
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +00:00
|
|
|
|
AC_SUBST(LIBXPM)
|
2003-02-04 14:56:31 +00:00
|
|
|
|
|
2015-04-19 21:40:51 +00:00
|
|
|
|
### Use -ljpeg if available, unless '--with-jpeg=no'.
|
1999-08-28 06:23:04 +00:00
|
|
|
|
HAVE_JPEG=no
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +00:00
|
|
|
|
LIBJPEG=
|
2020-01-11 16:29:39 +00:00
|
|
|
|
if test "${HAVE_X11}" = "yes" || test "$window_system" = "pgtk" || test "${HAVE_W32}" = "yes" \
|
2020-04-14 21:56:06 +00:00
|
|
|
|
|| test "${HAVE_NS}" = "yes"; then
|
2019-08-11 09:24:07 +00:00
|
|
|
|
if test "${with_jpeg}" != "no"; then
|
|
|
|
|
AC_CACHE_CHECK([for jpeglib 6b or later],
|
|
|
|
|
[emacs_cv_jpeglib],
|
|
|
|
|
[OLD_LIBS=$LIBS
|
|
|
|
|
for emacs_cv_jpeglib in yes -ljpeg no; do
|
|
|
|
|
case $emacs_cv_jpeglib in
|
|
|
|
|
yes) ;;
|
|
|
|
|
no) break;;
|
|
|
|
|
*) LIBS="$LIBS $emacs_cv_jpeglib";;
|
|
|
|
|
esac
|
|
|
|
|
AC_LINK_IFELSE(
|
|
|
|
|
[AC_LANG_PROGRAM(
|
|
|
|
|
[[#undef HAVE_STDLIB_H /* Avoid config.h/jpeglib.h collision. */
|
|
|
|
|
#include <stdio.h> /* jpeglib.h needs FILE and size_t. */
|
|
|
|
|
#include <jpeglib.h>
|
|
|
|
|
#include <jerror.h>
|
|
|
|
|
char verify[JPEG_LIB_VERSION < 62 ? -1 : 1];
|
|
|
|
|
struct jpeg_decompress_struct cinfo;
|
|
|
|
|
]],
|
|
|
|
|
[[
|
|
|
|
|
jpeg_create_decompress (&cinfo);
|
|
|
|
|
WARNMS (&cinfo, JWRN_JPEG_EOF);
|
|
|
|
|
jpeg_destroy_decompress (&cinfo);
|
|
|
|
|
]])],
|
|
|
|
|
[emacs_link_ok=yes],
|
|
|
|
|
[emacs_link_ok=no])
|
|
|
|
|
LIBS=$OLD_LIBS
|
|
|
|
|
test $emacs_link_ok = yes && break
|
|
|
|
|
done])
|
|
|
|
|
if test "$emacs_cv_jpeglib" != no; then
|
|
|
|
|
HAVE_JPEG=yes
|
|
|
|
|
AC_DEFINE([HAVE_JPEG], 1,
|
|
|
|
|
[Define to 1 if you have the jpeg library (typically -ljpeg).])
|
|
|
|
|
### mingw32 doesn't use -ljpeg, since it loads the library
|
|
|
|
|
### dynamically when needed, and doesn't want a run-time
|
|
|
|
|
### dependency on the jpeglib DLL.
|
|
|
|
|
test "$emacs_cv_jpeglib" != yes && test "${opsys}" != "mingw32" \
|
|
|
|
|
&& LIBJPEG=$emacs_cv_jpeglib
|
|
|
|
|
fi
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +00:00
|
|
|
|
fi
|
1999-08-28 06:23:04 +00:00
|
|
|
|
fi
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +00:00
|
|
|
|
AC_SUBST(LIBJPEG)
|
2003-02-04 14:56:31 +00:00
|
|
|
|
|
2017-09-13 14:27:37 +00:00
|
|
|
|
HAVE_LCMS2=no
|
2018-02-05 01:43:26 +00:00
|
|
|
|
LCMS2_CFLAGS=
|
|
|
|
|
LCMS2_LIBS=
|
2017-09-13 14:27:37 +00:00
|
|
|
|
if test "${with_lcms2}" != "no"; then
|
2018-02-05 01:43:26 +00:00
|
|
|
|
EMACS_CHECK_MODULES([LCMS2], [lcms2])
|
2017-09-13 14:27:37 +00:00
|
|
|
|
fi
|
|
|
|
|
if test "${HAVE_LCMS2}" = "yes"; then
|
|
|
|
|
AC_DEFINE([HAVE_LCMS2], 1, [Define to 1 if you have the lcms2 library (-llcms2).])
|
2017-09-14 19:22:29 +00:00
|
|
|
|
### mingw32 doesn't use -llcms2, since it loads the library dynamically.
|
2017-09-13 14:27:37 +00:00
|
|
|
|
if test "${opsys}" = "mingw32"; then
|
2018-02-05 01:43:26 +00:00
|
|
|
|
LCMS2_LIBS=
|
2017-09-13 14:27:37 +00:00
|
|
|
|
fi
|
|
|
|
|
fi
|
2018-02-05 01:43:26 +00:00
|
|
|
|
AC_SUBST(LCMS2_CFLAGS)
|
|
|
|
|
AC_SUBST(LCMS2_LIBS)
|
2017-09-13 14:27:37 +00:00
|
|
|
|
|
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)
|
|
|
|
|
|
2015-11-15 23:47:04 +00:00
|
|
|
|
### Dynamic modules support
|
|
|
|
|
LIBMODULES=
|
|
|
|
|
HAVE_MODULES=no
|
|
|
|
|
MODULES_OBJ=
|
2017-07-23 01:36:22 +00:00
|
|
|
|
case $opsys in
|
|
|
|
|
cygwin|mingw32) MODULES_SUFFIX=".dll" ;;
|
2019-12-25 14:41:39 +00:00
|
|
|
|
darwin) MODULES_SUFFIX=".dylib" ;;
|
2017-07-23 01:36:22 +00:00
|
|
|
|
*) MODULES_SUFFIX=".so" ;;
|
|
|
|
|
esac
|
2019-12-25 14:41:39 +00:00
|
|
|
|
case "${opsys}" in
|
|
|
|
|
darwin) MODULES_SECONDARY_SUFFIX='.so' ;;
|
|
|
|
|
*) MODULES_SECONDARY_SUFFIX='' ;;
|
|
|
|
|
esac
|
2015-11-15 23:47:04 +00:00
|
|
|
|
if test "${with_modules}" != "no"; then
|
2016-04-15 23:19:47 +00:00
|
|
|
|
case $opsys in
|
2016-04-16 17:24:57 +00:00
|
|
|
|
gnu|gnu-linux)
|
2016-04-15 23:19:47 +00:00
|
|
|
|
LIBMODULES="-ldl"
|
|
|
|
|
HAVE_MODULES=yes
|
|
|
|
|
;;
|
2017-07-23 01:36:22 +00:00
|
|
|
|
cygwin|mingw32|darwin)
|
2016-04-15 23:19:47 +00:00
|
|
|
|
HAVE_MODULES=yes
|
|
|
|
|
;;
|
|
|
|
|
*)
|
2016-04-17 02:49:15 +00:00
|
|
|
|
# BSD systems have dlopen in libc.
|
2017-07-23 01:36:22 +00:00
|
|
|
|
AC_CHECK_FUNC([dlopen], [HAVE_MODULES=yes])
|
2016-04-15 23:19:47 +00:00
|
|
|
|
;;
|
|
|
|
|
esac
|
2015-11-15 23:47:04 +00:00
|
|
|
|
|
|
|
|
|
if test "${HAVE_MODULES}" = no; then
|
|
|
|
|
AC_MSG_ERROR([Dynamic modules are not supported on your system])
|
2015-11-24 02:48:42 +00:00
|
|
|
|
else
|
|
|
|
|
SAVE_LIBS=$LIBS
|
|
|
|
|
LIBS="$LIBS $LIBMODULES"
|
2016-02-07 15:46:59 +00:00
|
|
|
|
AC_CHECK_FUNCS([dladdr dlfunc])
|
2015-11-24 02:48:42 +00:00
|
|
|
|
LIBS=$SAVE_LIBS
|
2015-11-15 23:47:04 +00:00
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if test "${HAVE_MODULES}" = yes; then
|
2015-11-19 21:50:23 +00:00
|
|
|
|
MODULES_OBJ="dynlib.o emacs-module.o"
|
2015-11-15 23:47:04 +00:00
|
|
|
|
AC_DEFINE(HAVE_MODULES, 1, [Define to 1 if dynamic modules are enabled])
|
2015-11-19 19:31:45 +00:00
|
|
|
|
AC_DEFINE_UNQUOTED(MODULES_SUFFIX, "$MODULES_SUFFIX",
|
|
|
|
|
[System extension for dynamic libraries])
|
2019-12-25 14:41:39 +00:00
|
|
|
|
if test -n "${MODULES_SECONDARY_SUFFIX}"; then
|
|
|
|
|
AC_DEFINE_UNQUOTED(MODULES_SECONDARY_SUFFIX, "$MODULES_SECONDARY_SUFFIX",
|
|
|
|
|
[Alternative system extension for dynamic libraries.])
|
|
|
|
|
fi
|
2015-11-15 23:47:04 +00:00
|
|
|
|
fi
|
|
|
|
|
AC_SUBST(MODULES_OBJ)
|
|
|
|
|
AC_SUBST(LIBMODULES)
|
2017-04-22 13:41:39 +00:00
|
|
|
|
AC_SUBST(HAVE_MODULES)
|
|
|
|
|
AC_SUBST(MODULES_SUFFIX)
|
2019-12-25 14:41:39 +00:00
|
|
|
|
AC_SUBST(MODULES_SECONDARY_SUFFIX)
|
2015-11-15 23:47:04 +00:00
|
|
|
|
|
2017-06-17 17:12:45 +00:00
|
|
|
|
AC_CONFIG_FILES([src/emacs-module.h])
|
|
|
|
|
AC_SUBST_FILE([module_env_snippet_25])
|
|
|
|
|
AC_SUBST_FILE([module_env_snippet_26])
|
2019-01-02 21:04:56 +00:00
|
|
|
|
AC_SUBST_FILE([module_env_snippet_27])
|
2019-12-23 21:00:01 +00:00
|
|
|
|
AC_SUBST_FILE([module_env_snippet_28])
|
2017-06-17 17:12:45 +00:00
|
|
|
|
module_env_snippet_25="$srcdir/src/module-env-25.h"
|
|
|
|
|
module_env_snippet_26="$srcdir/src/module-env-26.h"
|
2019-01-02 21:04:56 +00:00
|
|
|
|
module_env_snippet_27="$srcdir/src/module-env-27.h"
|
2019-12-23 21:00:01 +00:00
|
|
|
|
module_env_snippet_28="$srcdir/src/module-env-28.h"
|
2019-04-24 08:22:18 +00:00
|
|
|
|
emacs_major_version="${PACKAGE_VERSION%%.*}"
|
|
|
|
|
AC_SUBST(emacs_major_version)
|
2017-06-17 17:12:45 +00:00
|
|
|
|
|
2015-04-19 21:40:51 +00:00
|
|
|
|
### Use -lpng if available, unless '--with-png=no'.
|
2014-05-04 21:28:08 +00:00
|
|
|
|
HAVE_PNG=no
|
|
|
|
|
LIBPNG=
|
|
|
|
|
PNG_CFLAGS=
|
2020-04-14 21:56:06 +00:00
|
|
|
|
if 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])
|
Introduce Pure GTK3 port
* src/xsettings.h:
* src/xsettings.c:
(dpyinfo_valid, store_tool_bar_style_changed)
(XSETTINGS_FONT_NAME, get_prop_window, read_settings)
(apply_xft_settings, read_and_apply_settings)
(xft_settings_event, init_xsettings, xsettings_initialize):
* src/xfaces.c:
(x_create_gc, x_free_gc):
* src/xdisp.c (redisplay_tool_bar, redisplay_internal)
(draw_glyphs_debug, draw_glyphs, mouse_face_from_buffer_pos)
(note_mouse_highlight):
* src/terminal.c (Fterminal_live_p):
* src/termhooks.h (enum output_method, GCALIGNED_STRUCT)
(TERMINAL_FONT_CACHE):
* src/process.c (wait_reading_process_output):
* src/pgtkterm.h:
* src/pgtkterm.c:
* src/pgtkselect.h:
* src/pgtkselect.c:
* src/pgtkgui.h:
* src/pgtkfns.c:
* src/image.c:
(XGetPixel, XPutPixel, image_create_bitmap_from_data)
(image_create_bitmap_from_file, free_bitmap_record)
(image_destroy_x_image, gui_put_x_image, image_get_x_image)
(Create_Pixmap_From_Bitmap_Data, xbm_load_image, )
(xpm_load_image, lookup_rgb_color, image_disable_image)
(image_build_heuristic_mask, imagemagick_load_image):
* src/gtkutil.h:
* src/gtkutil.c (PGTK_TRACE, xg_set_screen, xg_display_open)
(xg_display_close, xg_create_default_cursor)
(xg_get_pixbuf_from_pix_and_mask, xg_check_special_colors)
(qttip_cb, hierarchy_ch_cb, xg_prepare_tooltip, )
(xg_show_tooltip, xg_hide_tooltip, xg_frame_resized)
(xg_frame_set_char_size, xg_height_or_width_changed)
(xg_set_widget_bg, style_changed_cb, xg_create_frame_widgets)
(xg_free_frame_widgets, x_wm_set_size_hint, xg_frame_restack)
(xg_mark_data, xg_update_frame_menubar, free_frame_menubar)
(xg_update_submenu, xg_finish_scroll_bar_creation)
(xg_update_scrollbar_pos, xg_update_horizontal_scrollbar_pos)
(xg_set_toolkit_scroll_bar_thumb, xg_event_is_for_scrollbar)
(draw_page, xg_pack_tool_bar, xg_create_tool_bar)
(xg_update_tool_bar_sizes, update_frame_tool_bar)
(free_frame_tool_bar, xg_change_toolbar_position):
* src/ftcrfont.c:
(ftcrfont_draw):
* src/fringe.c:
(init_fringe_bitmap):
* src/frame.h (GCALIGNED_STRUCT, FRAME_WINDOW_P):
* src/frame.c (Fframep):
* src/font.h:
* src/font.c (syms_of_font):
* src/emacsgtkfixed.c:
(emacs_fixed_get_preferred_width)
(emacs_fixed_get_preferred_height, XSetWMSizeHints):
* src/emacs.c (main):
* src/dispnew.c (init_display_interactive):
* src/dispextern.h:
* src/alloc.c:
(garbage_collect):
* src/Makefile.in (PGTK_OBJ, PGTK_LIBS, base_obj, LIBES):
* src/.gdbinit:
* lisp/url/url-privacy.el (url-setup-privacy-info):
* lisp/term/pgtk-win.el (featurep):
* lisp/startup.el (command-line, fancy-splash-frame):
* lisp/net/eww.el (eww-form-submit, eww-form-file)
(eww-form-checkbox, eww-form-select):
* lisp/mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event):
* lisp/loadup.el (featurep):
* lisp/international/mule-cmds.el (set-coding-system-map):
* lisp/frame.el (pgtk-frame-geometry, frame-geometry)
(w32-frame-edges, frame-edges)
(pgtk-mouse-absolute-pixel-position)
(mouse-absolute-pixel-position)
(pgtk-set-mouse-absolute-pixel-position)
(pgtk-frame-list-z-order, frame-list-z-order)
(pgtk-frame-restack, frame-restack, display-mouse-p)
(display-graphic-p, display-symbol-keys-p, )
(display-pixel-height, display-mm-height, display-mm-width)
(display-backing-store, display-save-under, display-color-cells)
(display-planes, display-visual-class)
(pgtk-display-monitor-attributes-list)
(display-monitor-attributes-list):
* lisp/faces.el (face-spec-set-match-display, tool-bar):
* lisp/cus-edit.el (custom-button, custom-button-mouse)
(custom-button-pressed, custom-display):
* configure.ac (AUTO_DEPEND, XARGS_LIMIT, XWIDGETS_OBJ):
2017-10-28 07:16:29 +00:00
|
|
|
|
elif test "${HAVE_X11}" = "yes" || test "$window_system" = "pgtk" || test "${HAVE_W32}" = "yes" \
|
2020-04-14 21:56:06 +00:00
|
|
|
|
|| test "${HAVE_NS}" = "yes"; then
|
2018-02-13 00:39:56 +00:00
|
|
|
|
EMACS_CHECK_MODULES([PNG], [libpng >= 1.0.0])
|
|
|
|
|
if test $HAVE_PNG = yes; then
|
|
|
|
|
LIBPNG=$PNG_LIBS
|
|
|
|
|
else
|
|
|
|
|
# Test old way in case pkg-config doesn't have it (older machines).
|
|
|
|
|
AC_MSG_CHECKING([for libpng not configured by pkg-config])
|
|
|
|
|
|
|
|
|
|
png_cflags=`(libpng-config --cflags) 2>&AS_MESSAGE_LOG_FD` &&
|
|
|
|
|
png_ldflags=`(libpng-config --ldflags) 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_ldflags='-lpng'
|
|
|
|
|
}
|
|
|
|
|
SAVE_CFLAGS=$CFLAGS
|
|
|
|
|
SAVE_LIBS=$LIBS
|
|
|
|
|
CFLAGS="$CFLAGS $png_cflags"
|
|
|
|
|
LIBS="$png_ldflags -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_ldflags])
|
|
|
|
|
CFLAGS=$SAVE_CFLAGS
|
|
|
|
|
LIBS=$SAVE_LIBS
|
|
|
|
|
AC_MSG_RESULT([$HAVE_PNG])
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# $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.
|
|
|
|
|
case " $LIBPNG ",$LIBZ in
|
|
|
|
|
*' -lz '*, | *' ',?*) ;;
|
|
|
|
|
*) LIBPNG="$LIBPNG -lz" ;;
|
|
|
|
|
esac
|
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
|
|
|
|
|
2015-04-19 21:40:51 +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.
|
1999-08-28 06:23:04 +00:00
|
|
|
|
HAVE_TIFF=no
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +00:00
|
|
|
|
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
|
Introduce Pure GTK3 port
* src/xsettings.h:
* src/xsettings.c:
(dpyinfo_valid, store_tool_bar_style_changed)
(XSETTINGS_FONT_NAME, get_prop_window, read_settings)
(apply_xft_settings, read_and_apply_settings)
(xft_settings_event, init_xsettings, xsettings_initialize):
* src/xfaces.c:
(x_create_gc, x_free_gc):
* src/xdisp.c (redisplay_tool_bar, redisplay_internal)
(draw_glyphs_debug, draw_glyphs, mouse_face_from_buffer_pos)
(note_mouse_highlight):
* src/terminal.c (Fterminal_live_p):
* src/termhooks.h (enum output_method, GCALIGNED_STRUCT)
(TERMINAL_FONT_CACHE):
* src/process.c (wait_reading_process_output):
* src/pgtkterm.h:
* src/pgtkterm.c:
* src/pgtkselect.h:
* src/pgtkselect.c:
* src/pgtkgui.h:
* src/pgtkfns.c:
* src/image.c:
(XGetPixel, XPutPixel, image_create_bitmap_from_data)
(image_create_bitmap_from_file, free_bitmap_record)
(image_destroy_x_image, gui_put_x_image, image_get_x_image)
(Create_Pixmap_From_Bitmap_Data, xbm_load_image, )
(xpm_load_image, lookup_rgb_color, image_disable_image)
(image_build_heuristic_mask, imagemagick_load_image):
* src/gtkutil.h:
* src/gtkutil.c (PGTK_TRACE, xg_set_screen, xg_display_open)
(xg_display_close, xg_create_default_cursor)
(xg_get_pixbuf_from_pix_and_mask, xg_check_special_colors)
(qttip_cb, hierarchy_ch_cb, xg_prepare_tooltip, )
(xg_show_tooltip, xg_hide_tooltip, xg_frame_resized)
(xg_frame_set_char_size, xg_height_or_width_changed)
(xg_set_widget_bg, style_changed_cb, xg_create_frame_widgets)
(xg_free_frame_widgets, x_wm_set_size_hint, xg_frame_restack)
(xg_mark_data, xg_update_frame_menubar, free_frame_menubar)
(xg_update_submenu, xg_finish_scroll_bar_creation)
(xg_update_scrollbar_pos, xg_update_horizontal_scrollbar_pos)
(xg_set_toolkit_scroll_bar_thumb, xg_event_is_for_scrollbar)
(draw_page, xg_pack_tool_bar, xg_create_tool_bar)
(xg_update_tool_bar_sizes, update_frame_tool_bar)
(free_frame_tool_bar, xg_change_toolbar_position):
* src/ftcrfont.c:
(ftcrfont_draw):
* src/fringe.c:
(init_fringe_bitmap):
* src/frame.h (GCALIGNED_STRUCT, FRAME_WINDOW_P):
* src/frame.c (Fframep):
* src/font.h:
* src/font.c (syms_of_font):
* src/emacsgtkfixed.c:
(emacs_fixed_get_preferred_width)
(emacs_fixed_get_preferred_height, XSetWMSizeHints):
* src/emacs.c (main):
* src/dispnew.c (init_display_interactive):
* src/dispextern.h:
* src/alloc.c:
(garbage_collect):
* src/Makefile.in (PGTK_OBJ, PGTK_LIBS, base_obj, LIBES):
* src/.gdbinit:
* lisp/url/url-privacy.el (url-setup-privacy-info):
* lisp/term/pgtk-win.el (featurep):
* lisp/startup.el (command-line, fancy-splash-frame):
* lisp/net/eww.el (eww-form-submit, eww-form-file)
(eww-form-checkbox, eww-form-select):
* lisp/mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event):
* lisp/loadup.el (featurep):
* lisp/international/mule-cmds.el (set-coding-system-map):
* lisp/frame.el (pgtk-frame-geometry, frame-geometry)
(w32-frame-edges, frame-edges)
(pgtk-mouse-absolute-pixel-position)
(mouse-absolute-pixel-position)
(pgtk-set-mouse-absolute-pixel-position)
(pgtk-frame-list-z-order, frame-list-z-order)
(pgtk-frame-restack, frame-restack, display-mouse-p)
(display-graphic-p, display-symbol-keys-p, )
(display-pixel-height, display-mm-height, display-mm-width)
(display-backing-store, display-save-under, display-color-cells)
(display-planes, display-visual-class)
(pgtk-display-monitor-attributes-list)
(display-monitor-attributes-list):
* lisp/faces.el (face-spec-set-match-display, tool-bar):
* lisp/cus-edit.el (custom-button, custom-button-mouse)
(custom-button-pressed, custom-display):
* configure.ac (AUTO_DEPEND, XARGS_LIMIT, XWIDGETS_OBJ):
2017-10-28 07:16:29 +00:00
|
|
|
|
elif test "${HAVE_X11}" = "yes" || test "${window_system}" = "pgtk" || test "${HAVE_W32}" = "yes" \
|
2020-04-14 21:56:06 +00:00
|
|
|
|
|| test "${HAVE_NS}" = "yes"; then
|
1999-08-28 06:23:04 +00:00
|
|
|
|
if test "${with_tiff}" != "no"; then
|
|
|
|
|
AC_CHECK_HEADER(tiffio.h,
|
2007-09-01 23:26:52 +00:00
|
|
|
|
[tifflibs="-lz -lm"
|
2000-02-17 20:04:15 +00:00
|
|
|
|
# At least one tiff package requires the jpeg library.
|
|
|
|
|
if test "${HAVE_JPEG}" = yes; then tifflibs="-ljpeg $tifflibs"; fi
|
2007-09-01 23:26:52 +00:00
|
|
|
|
AC_CHECK_LIB(tiff, TIFFGetVersion, HAVE_TIFF=yes, , $tifflibs)])
|
1999-08-28 06:23:04 +00:00
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if test "${HAVE_TIFF}" = "yes"; then
|
2002-04-14 01:40:58 +00:00
|
|
|
|
AC_DEFINE(HAVE_TIFF, 1, [Define to 1 if you have the tiff library (-ltiff).])
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +00:00
|
|
|
|
dnl FIXME -lz -lm, as per libpng?
|
|
|
|
|
LIBTIFF=-ltiff
|
1999-08-28 06:23:04 +00:00
|
|
|
|
fi
|
|
|
|
|
fi
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +00:00
|
|
|
|
AC_SUBST(LIBTIFF)
|
2003-02-04 14:56:31 +00:00
|
|
|
|
|
2015-04-19 21:40:51 +00:00
|
|
|
|
### 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.
|
1999-08-28 06:23:04 +00:00
|
|
|
|
HAVE_GIF=no
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +00:00
|
|
|
|
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
|
Introduce Pure GTK3 port
* src/xsettings.h:
* src/xsettings.c:
(dpyinfo_valid, store_tool_bar_style_changed)
(XSETTINGS_FONT_NAME, get_prop_window, read_settings)
(apply_xft_settings, read_and_apply_settings)
(xft_settings_event, init_xsettings, xsettings_initialize):
* src/xfaces.c:
(x_create_gc, x_free_gc):
* src/xdisp.c (redisplay_tool_bar, redisplay_internal)
(draw_glyphs_debug, draw_glyphs, mouse_face_from_buffer_pos)
(note_mouse_highlight):
* src/terminal.c (Fterminal_live_p):
* src/termhooks.h (enum output_method, GCALIGNED_STRUCT)
(TERMINAL_FONT_CACHE):
* src/process.c (wait_reading_process_output):
* src/pgtkterm.h:
* src/pgtkterm.c:
* src/pgtkselect.h:
* src/pgtkselect.c:
* src/pgtkgui.h:
* src/pgtkfns.c:
* src/image.c:
(XGetPixel, XPutPixel, image_create_bitmap_from_data)
(image_create_bitmap_from_file, free_bitmap_record)
(image_destroy_x_image, gui_put_x_image, image_get_x_image)
(Create_Pixmap_From_Bitmap_Data, xbm_load_image, )
(xpm_load_image, lookup_rgb_color, image_disable_image)
(image_build_heuristic_mask, imagemagick_load_image):
* src/gtkutil.h:
* src/gtkutil.c (PGTK_TRACE, xg_set_screen, xg_display_open)
(xg_display_close, xg_create_default_cursor)
(xg_get_pixbuf_from_pix_and_mask, xg_check_special_colors)
(qttip_cb, hierarchy_ch_cb, xg_prepare_tooltip, )
(xg_show_tooltip, xg_hide_tooltip, xg_frame_resized)
(xg_frame_set_char_size, xg_height_or_width_changed)
(xg_set_widget_bg, style_changed_cb, xg_create_frame_widgets)
(xg_free_frame_widgets, x_wm_set_size_hint, xg_frame_restack)
(xg_mark_data, xg_update_frame_menubar, free_frame_menubar)
(xg_update_submenu, xg_finish_scroll_bar_creation)
(xg_update_scrollbar_pos, xg_update_horizontal_scrollbar_pos)
(xg_set_toolkit_scroll_bar_thumb, xg_event_is_for_scrollbar)
(draw_page, xg_pack_tool_bar, xg_create_tool_bar)
(xg_update_tool_bar_sizes, update_frame_tool_bar)
(free_frame_tool_bar, xg_change_toolbar_position):
* src/ftcrfont.c:
(ftcrfont_draw):
* src/fringe.c:
(init_fringe_bitmap):
* src/frame.h (GCALIGNED_STRUCT, FRAME_WINDOW_P):
* src/frame.c (Fframep):
* src/font.h:
* src/font.c (syms_of_font):
* src/emacsgtkfixed.c:
(emacs_fixed_get_preferred_width)
(emacs_fixed_get_preferred_height, XSetWMSizeHints):
* src/emacs.c (main):
* src/dispnew.c (init_display_interactive):
* src/dispextern.h:
* src/alloc.c:
(garbage_collect):
* src/Makefile.in (PGTK_OBJ, PGTK_LIBS, base_obj, LIBES):
* src/.gdbinit:
* lisp/url/url-privacy.el (url-setup-privacy-info):
* lisp/term/pgtk-win.el (featurep):
* lisp/startup.el (command-line, fancy-splash-frame):
* lisp/net/eww.el (eww-form-submit, eww-form-file)
(eww-form-checkbox, eww-form-select):
* lisp/mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event):
* lisp/loadup.el (featurep):
* lisp/international/mule-cmds.el (set-coding-system-map):
* lisp/frame.el (pgtk-frame-geometry, frame-geometry)
(w32-frame-edges, frame-edges)
(pgtk-mouse-absolute-pixel-position)
(mouse-absolute-pixel-position)
(pgtk-set-mouse-absolute-pixel-position)
(pgtk-frame-list-z-order, frame-list-z-order)
(pgtk-frame-restack, frame-restack, display-mouse-p)
(display-graphic-p, display-symbol-keys-p, )
(display-pixel-height, display-mm-height, display-mm-width)
(display-backing-store, display-save-under, display-color-cells)
(display-planes, display-visual-class)
(pgtk-display-monitor-attributes-list)
(display-monitor-attributes-list):
* lisp/faces.el (face-spec-set-match-display, tool-bar):
* lisp/cus-edit.el (custom-button, custom-button-mouse)
(custom-button-pressed, custom-display):
* configure.ac (AUTO_DEPEND, XARGS_LIMIT, XWIDGETS_OBJ):
2017-10-28 07:16:29 +00:00
|
|
|
|
elif test "${HAVE_X11}" = "yes" -o "${window_system}" = "pgtk" && test "${with_gif}" != "no" \
|
2020-04-14 21:56:06 +00:00
|
|
|
|
|| test "${HAVE_W32}" = "yes" || test "${HAVE_NS}" = "yes"; then
|
2007-06-12 08:13:57 +00:00
|
|
|
|
AC_CHECK_HEADER(gif_lib.h,
|
2002-03-01 16:24:37 +00:00
|
|
|
|
# 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)])])
|
2007-06-12 08:13:57 +00:00
|
|
|
|
|
|
|
|
|
if test "$HAVE_GIF" = yes; then
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +00:00
|
|
|
|
LIBGIF=-lgif
|
|
|
|
|
elif test "$HAVE_GIF" = maybe; then
|
2007-06-20 07:50:43 +00:00
|
|
|
|
# If gif_lib.h but no libgif, try libungif.
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +00:00
|
|
|
|
AC_CHECK_LIB(ungif, EGifPutExtensionLast, HAVE_GIF=yes, HAVE_GIF=no)
|
|
|
|
|
test "$HAVE_GIF" = yes && LIBGIF=-lungif
|
1999-08-28 06:23:04 +00:00
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if test "${HAVE_GIF}" = "yes"; then
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +00:00
|
|
|
|
AC_DEFINE(HAVE_GIF, 1, [Define to 1 if you have a gif (or ungif) library.])
|
2007-06-14 06:56:28 +00:00
|
|
|
|
fi
|
|
|
|
|
fi
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +00:00
|
|
|
|
AC_SUBST(LIBGIF)
|
2007-06-14 06:56:28 +00:00
|
|
|
|
|
|
|
|
|
dnl Check for required libraries.
|
2016-07-24 09:00:18 +00:00
|
|
|
|
MISSING=
|
2019-03-25 17:46:04 +00:00
|
|
|
|
WITH_IFAVAILABLE=
|
2007-06-14 06:56:28 +00:00
|
|
|
|
if test "${HAVE_X11}" = "yes"; then
|
2019-03-25 17:46:04 +00:00
|
|
|
|
case $with_xpm,$HAVE_XPM in
|
|
|
|
|
no,* | ifavailable,* | *,yes) ;;
|
|
|
|
|
*) MISSING="libXpm"
|
|
|
|
|
WITH_IFAVAILABLE="--with-xpm=ifavailable";;
|
|
|
|
|
esac
|
|
|
|
|
case $with_jpeg,$HAVE_JPEG in
|
|
|
|
|
no,* | ifavailable,* | *,yes) ;;
|
|
|
|
|
*) MISSING="$MISSING libjpeg"
|
|
|
|
|
WITH_IFAVAILABLE="$WITH_IFAVAILABLE --with-jpeg=ifavailable";;
|
|
|
|
|
esac
|
|
|
|
|
case $with_png,$HAVE_PNG in
|
|
|
|
|
no,* | ifavailable,* | *,yes) ;;
|
|
|
|
|
*) MISSING="$MISSING libpng"
|
|
|
|
|
WITH_IFAVAILABLE="$WITH_IFAVAILABLE --with-png=ifavailable";;
|
|
|
|
|
esac
|
|
|
|
|
case $with_gif,$HAVE_GIF in
|
|
|
|
|
no,* | ifavailable,* | *,yes) ;;
|
|
|
|
|
*) MISSING="$MISSING libgif/libungif"
|
|
|
|
|
WITH_IFAVAILABLE="$WITH_IFAVAILABLE --with-gif=ifavailable";;
|
|
|
|
|
esac
|
|
|
|
|
case $with_tiff,$HAVE_TIFF in
|
|
|
|
|
no,* | ifavailable,* | *,yes) ;;
|
|
|
|
|
*) MISSING="$MISSING libtiff"
|
|
|
|
|
WITH_IFAVAILABLE="$WITH_IFAVAILABLE --with-tiff=ifavailable";;
|
|
|
|
|
esac
|
|
|
|
|
fi
|
|
|
|
|
case $with_gnutls,$HAVE_GNUTLS in
|
|
|
|
|
no,* | ifavailable,* | *,yes) ;;
|
|
|
|
|
*) MISSING="$MISSING gnutls"
|
|
|
|
|
WITH_IFAVAILABLE="$WITH_IFAVAILABLE --with-gnutls=ifavailable";;
|
|
|
|
|
esac
|
2020-08-14 17:31:16 +00:00
|
|
|
|
case $with_json,$HAVE_JSON in
|
|
|
|
|
no,* | ifavailable,* | *,yes) ;;
|
|
|
|
|
*) MISSING="$MISSING json"
|
|
|
|
|
WITH_IFAVAILABLE="$WITH_IFAVAILABLE --with-json=ifavailable";;
|
|
|
|
|
esac
|
2016-07-24 09:00:18 +00:00
|
|
|
|
if test "X${MISSING}" != X; then
|
|
|
|
|
AC_MSG_ERROR([The following required libraries were not found:
|
2007-06-14 06:56:28 +00:00
|
|
|
|
$MISSING
|
2007-06-13 20:43:37 +00:00
|
|
|
|
Maybe some development libraries/packages are missing?
|
2019-03-25 17:46:04 +00:00
|
|
|
|
To build anyway, give:
|
|
|
|
|
$WITH_IFAVAILABLE
|
|
|
|
|
as options to configure.])
|
1999-08-28 06:23:04 +00:00
|
|
|
|
fi
|
|
|
|
|
|
2015-04-19 21:40:51 +00:00
|
|
|
|
### Use -lgpm if available, unless '--with-gpm=no'.
|
2007-05-20 05:16:40 +00:00
|
|
|
|
HAVE_GPM=no
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +00:00
|
|
|
|
LIBGPM=
|
2007-05-20 05:16:40 +00:00
|
|
|
|
if test "${with_gpm}" != "no"; then
|
|
|
|
|
AC_CHECK_HEADER(gpm.h,
|
2007-09-01 23:26:52 +00:00
|
|
|
|
[AC_CHECK_LIB(gpm, Gpm_Open, HAVE_GPM=yes)])
|
2007-05-20 05:16:40 +00:00
|
|
|
|
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +00:00
|
|
|
|
if test "${HAVE_GPM}" = "yes"; then
|
|
|
|
|
AC_DEFINE(HAVE_GPM, 1, [Define to 1 if you have the gpm library (-lgpm).])
|
|
|
|
|
LIBGPM=-lgpm
|
|
|
|
|
fi
|
2007-05-20 05:16:40 +00:00
|
|
|
|
fi
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +00:00
|
|
|
|
AC_SUBST(LIBGPM)
|
2007-05-20 05:16:40 +00:00
|
|
|
|
|
2004-10-08 18:36:47 +00:00
|
|
|
|
dnl Check for malloc/malloc.h on darwin
|
2012-05-28 00:46:33 +00:00
|
|
|
|
AC_CHECK_HEADERS_ONCE(malloc/malloc.h)
|
2004-10-08 18:36:47 +00:00
|
|
|
|
|
2012-04-11 01:25:51 +00:00
|
|
|
|
GNUSTEP_CFLAGS=
|
2008-07-15 18:15:18 +00:00
|
|
|
|
### Use NeXTstep API to implement GUI.
|
|
|
|
|
if test "${HAVE_NS}" = "yes"; then
|
2016-11-06 07:33:43 +00:00
|
|
|
|
AC_DEFINE(HAVE_NS, 1, [Define to 1 if you are using the NeXTstep API, either GNUstep or Cocoa on macOS.])
|
2008-07-16 23:24:46 +00:00
|
|
|
|
if test "${NS_IMPL_COCOA}" = "yes"; then
|
2016-11-06 07:33:43 +00:00
|
|
|
|
AC_DEFINE(NS_IMPL_COCOA, 1, [Define to 1 if you are using NS windowing under macOS.])
|
2008-07-15 18:15:18 +00:00
|
|
|
|
fi
|
2008-07-16 23:24:46 +00:00
|
|
|
|
if test "${NS_IMPL_GNUSTEP}" = "yes"; then
|
2008-07-15 18:15:18 +00:00
|
|
|
|
AC_DEFINE(NS_IMPL_GNUSTEP, 1, [Define to 1 if you are using NS windowing under GNUstep.])
|
2015-01-25 02:05:33 +00:00
|
|
|
|
if test $NS_GNUSTEP_CONFIG != yes; then
|
|
|
|
|
# See also .m.o rule in src/Makefile.in. */
|
|
|
|
|
# FIXME: are all these flags really needed? Document here why. */
|
|
|
|
|
GNUSTEP_CFLAGS="-D_REENTRANT -fPIC -fno-strict-aliasing -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
|
|
|
|
|
## 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"
|
|
|
|
|
fi
|
2008-07-15 18:15:18 +00:00
|
|
|
|
fi
|
2009-09-17 06:10:44 +00:00
|
|
|
|
OTHER_FILES=ns-app
|
2008-07-15 18:15:18 +00:00
|
|
|
|
fi
|
|
|
|
|
|
2002-03-10 16:37:56 +00:00
|
|
|
|
### Use session management (-lSM -lICE) if available
|
|
|
|
|
HAVE_X_SM=no
|
2010-04-21 06:35:35 +00:00
|
|
|
|
LIBXSM=
|
2002-03-10 16:37:56 +00:00
|
|
|
|
if test "${HAVE_X11}" = "yes"; then
|
|
|
|
|
AC_CHECK_HEADER(X11/SM/SMlib.h,
|
2007-09-01 23:26:52 +00:00
|
|
|
|
[AC_CHECK_LIB(SM, SmcOpenConnection, HAVE_X_SM=yes, , -lICE)])
|
2002-03-10 16:37:56 +00:00
|
|
|
|
|
|
|
|
|
if test "${HAVE_X_SM}" = "yes"; then
|
2002-04-14 01:40:58 +00:00
|
|
|
|
AC_DEFINE(HAVE_X_SM, 1, [Define to 1 if you have the SM library (-lSM).])
|
2010-04-21 06:35:35 +00:00
|
|
|
|
LIBXSM="-lSM -lICE"
|
2002-03-10 16:37:56 +00:00
|
|
|
|
fi
|
|
|
|
|
fi
|
2010-04-21 06:35:35 +00:00
|
|
|
|
AC_SUBST(LIBXSM)
|
2003-02-04 14:56:31 +00:00
|
|
|
|
|
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
|
|
|
|
|
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
|
|
|
|
|
Add double-buffering support to reduce flicker
* src/dispextern.h (struct glyph_string): Remove window member
(block_buffer_flips, unblock_buffer_flips)
(buffer_flipping_blocked_p): Declare.
* src/xterm.h (struct x_display_info): New member supports_xdbe.
(struct x_output): New members draw_desc and need_buffer_flip.
(FRAME_X_DRAWABLE, FRAME_X_RAW_DRAWABLE)
(FRAME_X_DOUBLE_BUFFERED_P)
(FRAME_X_NEED_BUFFER_FLIP): New macros.
(set_up_x_back_buffer, tear_down_x_back_buffer)
(initial_set_up_x_back_buffer): Declare.
* src/xterm.c: Include Xdbe.h.
(x_begin_cr_clip, x_fill_rectangle, x_draw_rectangle)
(x_draw_vertical_window_border, x_update_end)
(x_setup_relief_color, x_draw_relief_rect)
(x_draw_fringe_bitmap, x_shift_glyphs_for_insert)
(x_scroll_run, x_draw_hollow_cursor, x_draw_bar_cursor): Use
FRAME_X_DRAWABLE instead of FRAME_X_WINDOW; rename local
variables appropriately; substitute calls to XClearArea with
x_clear_area, which DTRT for double buffering.
(x_clear_window, x_clear_area): In double-buffering mode, use
rect-drawing X functions instead of XClearWindow and
XClearArea, which always operate on the front buffer.
(show_back_buffer): New function.
(XTframe_up_to_date): Call show_back_buffer when done.
(x_clear_frame, x_clear_frame_area): Remove obsolete calls to
gtk_widget_queue_draw to refresh scroll bars; scroll bars are
now independent X windows.
(handle_one_xevent): Call font_drop_xrender_surfaces when
XftDraw might need regenerating; perform buffer flip when
responding to Expose events; issue front-buffer clearing
commands as stopgap while we wait for redisplay.
Call flush_dirty_back_buffers.
(x_make_frame_visible): Un-bitrot comment; move XSETFRAME
earlier in function.
(x_free_frame_resources): Call tear_down_x_back_buffer when
destroying frame.
(x_term_init): Attempt to initialize double buffer extension.
(x_flip_and_flush): New function.
(x_redisplay_interface): Point to x_flip_and_flush instead of
x_flip directly.
(flush_dirty_back_buffers): New function.
(x_create_terminal): Register buffer_flipping_unblocked_hook.
* src/xftfont.c (xftfont_drop_xrender_surfaces): Use
FRAME_X_DRAWABLE instead of FRAME_X_WINDOW.
(xftfont_draw): Call x_mark_frame_dirty.
(xftfont_drop_xrender_surfaces): New function.
(syms_of_xftfont): Register it.
* src/xfont.c (xfont_draw): Use FRAME_X_DRAWABLE instead of
FRAME_X_WINDOW.
* src/xfns.c: Include Xdbe.h.
(x_set_inhibit_double_buffering, set_up_x_back_buffer)
(Fx_double_buffered_p): New functions.
(x_window): Call initial_set_up_x_back_buffer.
(x_make_gc): Use FRAME_X_DRAWABLE instead of FRAME_X_WINDOW.
(Fx_create_frame): Configure `inhibit-double-buffering'
frame parameter.
(x_create_tip_frame): Call initial_set_up_x_back_buffer.
(x_frame_parm_handlers): Register
x_set_inhibit_double_buffering.
(syms_of_xfns): Register Sx_double_buffered_p.
(x_mark_frame_dirty): Define.
* src/xfaces.c (x_create_gc): Use FRAME_X_DRAWABLE instead of
FRAME_X_WINDOW.
* src/xdisp.c (remember_mouse_glyph, init_glyph_string): Use
FRAME_X_DRAWABLE instead of FRAME_X_WINDOW.
(redisplay_internal): Restart redisplay if a frame is garbaged
during updating; explain why. Block buffer flips
during redisplay.
(redisplay_preserve_echo_area): Block buffer flip during call
to redisplay_internal.
(buffer_flip_blocked_depth): New variable.
(block_buffer_flips, unblock_buffer_flips)
(buffer_flipping_blocked_p): New functions.
(init_glyph_string): Stop setting window member of struct
glyph_string.
* src/w32fns.c (w32_frame_parm_handlers): Add placeholder for
x_set_inhibit_double_buffering.
* src/termhooks.h (struct terminal): Add
buffer_flipping_unblocked_hook.
* src/nsfns.m (ns_frame_parm_handlers): Add placeholder for
x_set_inhibit_double_buffering.
* src/image.c (x_create_bitmap_from_data)
(x_create_bitmap_from_file, x_create_x_image_and_pixmap)
(Create_Pixmap_From_Bitmap_Data)
(x_create_bitmap_from_xpm_data, xpm_load, gs_load): Use
FRAME_X_DRAWABLE instead of FRAME_X_WINDOW; rename local
variables appropriately.
* src/gtkutil.c: Include Xdbe.h.
(xg_get_widget_from_map): Forward declare.
(xg_clear_under_internal_border): Remove obsolete calls to
refresh scroll bars.
(xg_create_frame_widgets): Call initial_set_up_x_back_buffer.
(xg_free_frame_widgets): Call tear_down_x_back_buffer; reset
FRAME_X_DRAWABLE as well as FRAME_X_WINDOW and for the
same reason.
(xg_set_background_color): Set scroll bar background colors.
(xg_finish_scroll_bar_creation): New function with common
logic of xg_create_scroll_bar, xg_create_horizontal_scroll_bar. Force
scroll bars to be real X11 windows.
(xg_create_scroll_bar, xg_create_horizontal_scroll_bar): Call
xg_finish_scroll_bar_creation.
(xg_update_scrollbar_pos, xg_update_horizontal_scrollbar_pos):
Remove obsolete calls to refresh scroll bars; fix comments.
* src/ftxfont.c (ftxfont_get_gcs, ftxfont_draw_bitmap,
(ftxfont_draw_background): Use FRAME_X_DRAWABLE instead of
FRAME_X_WINDOW.
* src/frame.c (frame_parms): Add table entry for new
`inhibit-double-buffering' frame parameter
(syms_of_frame): Register Qinhibit_double_buffering.
* src/font.h (struct font_driver): Add new `flush_frame_caches' hook.
(font_drop_xrender_surfaces): Declare.
* src/font.c (font_drop_xrender_surfaces): New function.
* src/Makefile.in (XDBE_LIBS, XDBE_CFLAGS): Substitute.
* etc/NEWS: Mention use of double buffering
* doc/lispref/frames.texi (Management Parameters): Document
`inhibit-double-buffering' frame parameters.
(Visibility of Frames): Document `x-double-buffered-p'.
* configure.ac: Check for the X double buffer extension
2016-10-21 03:34:36 +00:00
|
|
|
|
### Use Xdbe (-lXdbe) if available
|
|
|
|
|
HAVE_XDBE=no
|
|
|
|
|
if test "${HAVE_X11}" = "yes"; then
|
2020-08-26 13:03:08 +00:00
|
|
|
|
if test "${with_xdbe}" != "no"; then
|
|
|
|
|
AC_CHECK_HEADER(X11/extensions/Xdbe.h,
|
|
|
|
|
[AC_CHECK_LIB(Xext, XdbeAllocateBackBufferName, HAVE_XDBE=yes)],
|
|
|
|
|
[],
|
|
|
|
|
[#include <X11/Xlib.h>
|
|
|
|
|
])
|
|
|
|
|
fi
|
Add double-buffering support to reduce flicker
* src/dispextern.h (struct glyph_string): Remove window member
(block_buffer_flips, unblock_buffer_flips)
(buffer_flipping_blocked_p): Declare.
* src/xterm.h (struct x_display_info): New member supports_xdbe.
(struct x_output): New members draw_desc and need_buffer_flip.
(FRAME_X_DRAWABLE, FRAME_X_RAW_DRAWABLE)
(FRAME_X_DOUBLE_BUFFERED_P)
(FRAME_X_NEED_BUFFER_FLIP): New macros.
(set_up_x_back_buffer, tear_down_x_back_buffer)
(initial_set_up_x_back_buffer): Declare.
* src/xterm.c: Include Xdbe.h.
(x_begin_cr_clip, x_fill_rectangle, x_draw_rectangle)
(x_draw_vertical_window_border, x_update_end)
(x_setup_relief_color, x_draw_relief_rect)
(x_draw_fringe_bitmap, x_shift_glyphs_for_insert)
(x_scroll_run, x_draw_hollow_cursor, x_draw_bar_cursor): Use
FRAME_X_DRAWABLE instead of FRAME_X_WINDOW; rename local
variables appropriately; substitute calls to XClearArea with
x_clear_area, which DTRT for double buffering.
(x_clear_window, x_clear_area): In double-buffering mode, use
rect-drawing X functions instead of XClearWindow and
XClearArea, which always operate on the front buffer.
(show_back_buffer): New function.
(XTframe_up_to_date): Call show_back_buffer when done.
(x_clear_frame, x_clear_frame_area): Remove obsolete calls to
gtk_widget_queue_draw to refresh scroll bars; scroll bars are
now independent X windows.
(handle_one_xevent): Call font_drop_xrender_surfaces when
XftDraw might need regenerating; perform buffer flip when
responding to Expose events; issue front-buffer clearing
commands as stopgap while we wait for redisplay.
Call flush_dirty_back_buffers.
(x_make_frame_visible): Un-bitrot comment; move XSETFRAME
earlier in function.
(x_free_frame_resources): Call tear_down_x_back_buffer when
destroying frame.
(x_term_init): Attempt to initialize double buffer extension.
(x_flip_and_flush): New function.
(x_redisplay_interface): Point to x_flip_and_flush instead of
x_flip directly.
(flush_dirty_back_buffers): New function.
(x_create_terminal): Register buffer_flipping_unblocked_hook.
* src/xftfont.c (xftfont_drop_xrender_surfaces): Use
FRAME_X_DRAWABLE instead of FRAME_X_WINDOW.
(xftfont_draw): Call x_mark_frame_dirty.
(xftfont_drop_xrender_surfaces): New function.
(syms_of_xftfont): Register it.
* src/xfont.c (xfont_draw): Use FRAME_X_DRAWABLE instead of
FRAME_X_WINDOW.
* src/xfns.c: Include Xdbe.h.
(x_set_inhibit_double_buffering, set_up_x_back_buffer)
(Fx_double_buffered_p): New functions.
(x_window): Call initial_set_up_x_back_buffer.
(x_make_gc): Use FRAME_X_DRAWABLE instead of FRAME_X_WINDOW.
(Fx_create_frame): Configure `inhibit-double-buffering'
frame parameter.
(x_create_tip_frame): Call initial_set_up_x_back_buffer.
(x_frame_parm_handlers): Register
x_set_inhibit_double_buffering.
(syms_of_xfns): Register Sx_double_buffered_p.
(x_mark_frame_dirty): Define.
* src/xfaces.c (x_create_gc): Use FRAME_X_DRAWABLE instead of
FRAME_X_WINDOW.
* src/xdisp.c (remember_mouse_glyph, init_glyph_string): Use
FRAME_X_DRAWABLE instead of FRAME_X_WINDOW.
(redisplay_internal): Restart redisplay if a frame is garbaged
during updating; explain why. Block buffer flips
during redisplay.
(redisplay_preserve_echo_area): Block buffer flip during call
to redisplay_internal.
(buffer_flip_blocked_depth): New variable.
(block_buffer_flips, unblock_buffer_flips)
(buffer_flipping_blocked_p): New functions.
(init_glyph_string): Stop setting window member of struct
glyph_string.
* src/w32fns.c (w32_frame_parm_handlers): Add placeholder for
x_set_inhibit_double_buffering.
* src/termhooks.h (struct terminal): Add
buffer_flipping_unblocked_hook.
* src/nsfns.m (ns_frame_parm_handlers): Add placeholder for
x_set_inhibit_double_buffering.
* src/image.c (x_create_bitmap_from_data)
(x_create_bitmap_from_file, x_create_x_image_and_pixmap)
(Create_Pixmap_From_Bitmap_Data)
(x_create_bitmap_from_xpm_data, xpm_load, gs_load): Use
FRAME_X_DRAWABLE instead of FRAME_X_WINDOW; rename local
variables appropriately.
* src/gtkutil.c: Include Xdbe.h.
(xg_get_widget_from_map): Forward declare.
(xg_clear_under_internal_border): Remove obsolete calls to
refresh scroll bars.
(xg_create_frame_widgets): Call initial_set_up_x_back_buffer.
(xg_free_frame_widgets): Call tear_down_x_back_buffer; reset
FRAME_X_DRAWABLE as well as FRAME_X_WINDOW and for the
same reason.
(xg_set_background_color): Set scroll bar background colors.
(xg_finish_scroll_bar_creation): New function with common
logic of xg_create_scroll_bar, xg_create_horizontal_scroll_bar. Force
scroll bars to be real X11 windows.
(xg_create_scroll_bar, xg_create_horizontal_scroll_bar): Call
xg_finish_scroll_bar_creation.
(xg_update_scrollbar_pos, xg_update_horizontal_scrollbar_pos):
Remove obsolete calls to refresh scroll bars; fix comments.
* src/ftxfont.c (ftxfont_get_gcs, ftxfont_draw_bitmap,
(ftxfont_draw_background): Use FRAME_X_DRAWABLE instead of
FRAME_X_WINDOW.
* src/frame.c (frame_parms): Add table entry for new
`inhibit-double-buffering' frame parameter
(syms_of_frame): Register Qinhibit_double_buffering.
* src/font.h (struct font_driver): Add new `flush_frame_caches' hook.
(font_drop_xrender_surfaces): Declare.
* src/font.c (font_drop_xrender_surfaces): New function.
* src/Makefile.in (XDBE_LIBS, XDBE_CFLAGS): Substitute.
* etc/NEWS: Mention use of double buffering
* doc/lispref/frames.texi (Management Parameters): Document
`inhibit-double-buffering' frame parameters.
(Visibility of Frames): Document `x-double-buffered-p'.
* configure.ac: Check for the X double buffer extension
2016-10-21 03:34:36 +00:00
|
|
|
|
if test $HAVE_XDBE = yes; then
|
|
|
|
|
XDBE_LIBS=-lXext
|
|
|
|
|
fi
|
|
|
|
|
if test $HAVE_XDBE = yes; then
|
|
|
|
|
AC_DEFINE(HAVE_XDBE, 1, [Define to 1 if you have the Xdbe extension.])
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
AC_SUBST(XDBE_CFLAGS)
|
|
|
|
|
AC_SUBST(XDBE_LIBS)
|
|
|
|
|
|
2010-09-10 16:44:35 +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-09-10 16:44:35 +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.
|
2015-02-09 00:00:17 +00:00
|
|
|
|
if test "${HAVE_LIBXML2}" != "yes" && test "$opsys" = "darwin"; then
|
2013-06-21 01:03:23 +00:00
|
|
|
|
SAVE_CPPFLAGS="$CPPFLAGS"
|
2015-12-31 01:37:15 +00:00
|
|
|
|
if test -z "$xcsdkdir" -a -n "$XCRUN" -a ! -d /usr/include; then
|
|
|
|
|
dnl /usr/include is not found. Try Xcode SDK dir if it is sane.
|
|
|
|
|
xcsdkdir=`$XCRUN --show-sdk-path 2>/dev/null`
|
|
|
|
|
case $xcsdkdir in
|
|
|
|
|
*[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
|
|
|
|
|
xcsdkdir="" ;;
|
|
|
|
|
esac
|
|
|
|
|
fi
|
2018-01-01 15:44:24 +00:00
|
|
|
|
CPPFLAGS="$CPPFLAGS -isystem${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, ,
|
2015-04-19 21:40:51 +00:00
|
|
|
|
[#include <libxml/HTMLparser.h>])])
|
2013-06-21 01:03:23 +00:00
|
|
|
|
CPPFLAGS="$SAVE_CPPFLAGS"
|
|
|
|
|
if test "${HAVE_LIBXML2}" = "yes"; then
|
2018-01-01 15:44:24 +00:00
|
|
|
|
LIBXML2_CFLAGS="-isystem${xcsdkdir}/usr/include/libxml2"
|
2013-06-21 01:03:23 +00:00
|
|
|
|
LIBXML2_LIBS="-lxml2"
|
|
|
|
|
fi
|
|
|
|
|
fi
|
2010-09-10 16:44:35 +00:00
|
|
|
|
if test "${HAVE_LIBXML2}" = "yes"; then
|
2012-11-23 15:22:47 +00:00
|
|
|
|
if test "${opsys}" != "mingw32"; then
|
2015-02-09 00:02:36 +00:00
|
|
|
|
AC_CHECK_LIB(xml2, htmlReadMemory, HAVE_LIBXML2=yes, HAVE_LIBXML2=no,
|
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
|
|
|
|
[$LIBXML2_LIBS])
|
2012-11-23 17:59:10 +00:00
|
|
|
|
else
|
|
|
|
|
LIBXML2_LIBS=""
|
2012-11-23 15:22:47 +00:00
|
|
|
|
fi
|
2010-09-13 14:58:48 +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
|
2010-09-10 16:44:35 +00:00
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
AC_SUBST(LIBXML2_LIBS)
|
|
|
|
|
AC_SUBST(LIBXML2_CFLAGS)
|
|
|
|
|
|
2017-03-17 06:50:37 +00:00
|
|
|
|
BLESSMAIL_TARGET=
|
|
|
|
|
LIBS_MAIL=
|
|
|
|
|
if test ! "$with_mailutils"; then
|
|
|
|
|
# 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).])
|
|
|
|
|
|
|
|
|
|
OLD_LIBS=$LIBS
|
|
|
|
|
LIBS="$LIBS_MAIL $LIBS"
|
|
|
|
|
AC_CHECK_FUNCS([touchlock])
|
|
|
|
|
LIBS=$OLD_LIBS
|
|
|
|
|
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.
|
1999-08-21 10:41:58 +00:00
|
|
|
|
This probably means that movemail could lose mail.
|
2015-04-19 21:40:51 +00:00
|
|
|
|
There may be a 'development' package to install containing liblockfile.])
|
2017-03-17 06:50:37 +00:00
|
|
|
|
fi
|
2003-05-20 16:32:16 +00:00
|
|
|
|
fi
|
2017-03-17 06:50:37 +00:00
|
|
|
|
AC_CHECK_HEADERS([maillock.h])
|
1996-12-18 18:11:20 +00:00
|
|
|
|
|
2017-03-17 06:50:37 +00:00
|
|
|
|
## 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" ;;
|
|
|
|
|
|
|
|
|
|
gnu|freebsd|dragonfly|netbsd|openbsd|darwin) mail_lock="flock" ;;
|
|
|
|
|
|
|
|
|
|
## 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
|
|
|
|
|
2017-03-17 06:50:37 +00:00
|
|
|
|
mingw32)
|
|
|
|
|
mail_lock="none-needed" ;;
|
|
|
|
|
esac
|
2010-05-10 00:07:47 +00:00
|
|
|
|
|
2017-03-17 06:50:37 +00:00
|
|
|
|
case $mail_lock in
|
|
|
|
|
flock) AC_DEFINE([MAIL_USE_FLOCK], [1],
|
|
|
|
|
[Define if the mailer uses flock to interlock the mail spool.]);;
|
2010-05-10 00:07:47 +00:00
|
|
|
|
|
2017-03-17 06:50:37 +00:00
|
|
|
|
lockf) AC_DEFINE([MAIL_USE_LOCKF], [1],
|
|
|
|
|
[Define if the mailer uses lockf to interlock the mail spool.]);;
|
2010-05-10 00:07:47 +00:00
|
|
|
|
|
2017-03-17 06:50:37 +00:00
|
|
|
|
none-needed) ;;
|
2013-04-14 16:36:49 +00:00
|
|
|
|
|
2017-03-17 06:50:37 +00:00
|
|
|
|
*) BLESSMAIL_TARGET="need-blessmail" ;;
|
|
|
|
|
esac
|
|
|
|
|
fi
|
|
|
|
|
AC_SUBST([BLESSMAIL_TARGET])
|
|
|
|
|
AC_SUBST([LIBS_MAIL])
|
2010-05-10 00:07:47 +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
|
|
|
|
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 \
|
Fix rounding error in ‘ceiling’ etc.
Without this fix, (ceiling most-negative-fixnum -1.0) returns
most-negative-fixnum instead of correctly signaling range-error,
and similarly for floor, round, and truncate.
* configure.ac (trunc): Add a check, since Gnulib’s doc says
‘trunc’ is missing from MSVC 9. The Gnulib doc says ‘trunc’ is
also missing from some other older operating systems like Solaris
9 which I know we don’t care about any more, so MSVC is the only
reason to worry about ‘trunc’ here.
* src/editfns.c (styled_format): Formatting a float with %c is now an
error. The old code did not work in general, because FIXNUM_OVERFLOW_P
had rounding errors. Besides, the "if (FLOATP (...))" was in there
only as a result of my misunderstanding old code that I introduced
2011. Although %d etc. is sometimes used on floats that represent
huge UIDs or PIDs etc. that do not fit in fixnums, this cannot
happen with characters.
* src/floatfns.c (rounding_driver): Rework to do the right thing
when the intermediate result equals 2.305843009213694e+18, i.e.,
is exactly 1 greater than MOST_POSITIVE_FIXNUM on a 64-bit host.
Simplify so that only one section of code checks for overflow,
rather than two.
(double_identity): Remove. All uses changed to ...
(emacs_trunc): ... this new function. Add replacement for
platforms that lack ‘trunc’.
* src/lisp.h (FIXNUM_OVERFLOW_P, make_fixnum_or_float):
Make it clear that the arg cannot be floating point.
* test/src/editfns-tests.el (format-c-float): New test.
* test/src/floatfns-tests.el: New file, to test for this bug.
2017-03-01 20:29:37 +00:00
|
|
|
|
lrand48 random rint trunc \
|
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 \
|
2016-03-08 02:54:25 +00:00
|
|
|
|
getrlimit setrlimit shutdown \
|
2019-02-17 17:10:26 +00:00
|
|
|
|
pthread_sigmask strsignal setitimer timer_getoverrun \
|
2016-06-10 06:11:40 +00:00
|
|
|
|
sendto recvfrom getsockname getifaddrs freeifaddrs \
|
2014-05-19 04:56:03 +00:00
|
|
|
|
gai_strerror sync \
|
2012-04-17 01:29:58 +00:00
|
|
|
|
getpwent endpwent getgrent endgrent \
|
2020-06-28 08:27:21 +00:00
|
|
|
|
cfmakeraw cfsetspeed __executable_start log2 pthread_setname_np \
|
|
|
|
|
pthread_set_name_np)
|
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
|
2000-04-14 11:21:41 +00:00
|
|
|
|
|
2020-01-07 16:08:25 +00:00
|
|
|
|
if test "$ac_cv_func_pthread_setname_np" = "yes"; then
|
|
|
|
|
AC_CACHE_CHECK(
|
|
|
|
|
[whether pthread_setname_np takes a single argument],
|
|
|
|
|
[emacs_cv_pthread_setname_np_1arg],
|
|
|
|
|
[AC_COMPILE_IFELSE(
|
|
|
|
|
[AC_LANG_PROGRAM(
|
|
|
|
|
[[#include <pthread.h>]],
|
|
|
|
|
[[pthread_setname_np ("a");]])],
|
|
|
|
|
[emacs_cv_pthread_setname_np_1arg=yes],
|
|
|
|
|
[emacs_cv_pthread_setname_np_1arg=no])])
|
|
|
|
|
if test "$emacs_cv_pthread_setname_np_1arg" = "yes"; then
|
|
|
|
|
AC_DEFINE(
|
|
|
|
|
HAVE_PTHREAD_SETNAME_NP_1ARG, 1,
|
|
|
|
|
[Define to 1 if pthread_setname_np takes a single argument.])
|
2020-01-31 09:22:59 +00:00
|
|
|
|
else
|
|
|
|
|
AC_CACHE_CHECK(
|
|
|
|
|
[whether pthread_setname_np takes three arguments],
|
|
|
|
|
[emacs_cv_pthread_setname_np_3arg],
|
|
|
|
|
[AC_COMPILE_IFELSE(
|
|
|
|
|
[AC_LANG_PROGRAM(
|
|
|
|
|
[[#include <pthread.h>]],
|
|
|
|
|
[[pthread_setname_np (0, "%s", "a");]])],
|
|
|
|
|
[emacs_cv_pthread_setname_np_3arg=yes],
|
|
|
|
|
[emacs_cv_pthread_setname_np_3arg=no])])
|
|
|
|
|
if test "$emacs_cv_pthread_setname_np_3arg" = "yes"; then
|
|
|
|
|
AC_DEFINE(
|
|
|
|
|
HAVE_PTHREAD_SETNAME_NP_3ARG, 1,
|
|
|
|
|
[Define to 1 if pthread_setname_np takes three arguments.])
|
|
|
|
|
fi
|
2020-01-07 16:08:25 +00:00
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
2016-01-31 02:38:51 +00:00
|
|
|
|
dnl No need to check for posix_memalign if aligned_alloc works.
|
|
|
|
|
AC_CHECK_FUNCS([aligned_alloc posix_memalign], [break])
|
2016-02-03 08:37:44 +00:00
|
|
|
|
AC_CHECK_DECLS([aligned_alloc], [], [], [[#include <stdlib.h>]])
|
2012-07-07 01:03:46 +00:00
|
|
|
|
|
2020-01-14 00:07:27 +00:00
|
|
|
|
case $with_unexec,$canonical in
|
|
|
|
|
yes,alpha*)
|
|
|
|
|
AC_CHECK_DECL([__ELF__], [],
|
|
|
|
|
[AC_MSG_ERROR([Non-ELF systems are not supported on this platform.])]);;
|
|
|
|
|
esac
|
|
|
|
|
|
Add portable dumper
Add a new portable dumper as an alternative to unexec. Use it by default.
* src/dmpstruct.awk: New file.
* src/doc.c (get_doc_string): use will_dump_p().
* src/editfns.c (styled_format): silence compiler warning
with UNINIT.
* src/emacs-module.c (syms_of_module): staticpro ltv_mark.
* src/emacs.c (gflags): new variable.
(init_cmdargs): unwrap
(string_starts_with_p, find_argument, dump_error_to_string)
(load_pdump): new functions.
(main): detect pdumper and --temacs invocation; actually load
portable dump when detected; set gflags as appropriate; changes to
init functions throughout to avoid passing explicit
'initialized' argument.
* src/eval.c (inhibit_lisp_code): remove unused variable.
(init_eval_once_for_pdumper): new function.
(init_eval_once): call it.
* src/filelock.c: CANNOT_DUMP -> will_dump_p()
* src/fingerprint-dummy.c: new file
* src/fingerprint.h: new file
* src/fns.c: CANNOT_DUMP -> will_dump_p(), etc.
(weak_hash_tables): remove
(hashfn_equal, hashfn_eql): un-staticify
(make_hash_table): set new 'next_weak' hash table field; drop
global weak_hash_tables logic.
(copy_hash_table): drop global weak_hash_tables logic.
(hash_table_rehash): new function.
(hash_lookup, hash_put, hash_remove_from_table, hash_clear):
rehash if needed.
(sweep_weak_table): un-staticify; explain logic; bool-ify.
(sweep_weak_hash_tables): remove function.
* src/font.c (syms_of_font): remember pdumper stuff.
* src/fontset.c (syms_of_fontset): remember pdumper stuff.
* src/frame.c (make_initial_frame): don't reset Vframe_list.
(init_frame_once_for_pdumper, init_frame_once): new functions.
(syms_of_frame): remove redundant staticpro.
* src/fringe.c (init_fringe_once_for_pdumper): new functin.
(init_fringe_once): call it.
* src/ftcrfont.c (syms_of_ftcrfont_for_pdumper): new function.
(syms_of_ftcrfont): call it.
* src/ftfont.c (syms_of_ftfont_for_pdumper): new function.
(syms_of_ftfont): call it.
* src/ftxont.c (syms_of_ftxfont_for_pdumper): new function.
(syms_of_ftxfont): call it.
* src/gmalloc.c: adjust for pdumper througout
(DUMPED): remove weird custom dumped indicator.
* src/gnutls.c (syms_of_gnutls): pdumper note for
gnutls_global_initialized.
* src/image.c (syms_of_image): add pdumper comment,
initializer note.
* src/insdel.c (prepare_to_modify_buffer_1): account
for buffer contents possibly being in dump image.
* src/keyboard.c (syms_of_keyboard_for_pdumper): new function.
(syms_of_keyboard): staticpro more; call pdumper syms function.
* src/lisp.h: add comments throughout
(gflags): declare.
(will_dump_p, will_bootstrap_p, will_dump_with_pdumper_p)
(dumped_with_pdumper_p, will_dump_with_unexec_p)
(dumped_with_unexec_p, definitely_will_not_unexec_p): new
functions.
(POWER_OF_2, ROUNDUP): move macros.
(PSEUDOVECTOR_TYPE, PSEUDOVECTOR_TYPEP): take vectorlike header
pointer instead of vector; constify.
(Lisp_Hash_Table): add comment about need to rehash on access; add
comment for next_weak.
(HASH_KEY, HASH_VALUE, HASH_HASH, HASH_TABLE_SIZE): const-ify.
(hash_table_rehash): declare.
(hash_rehash_needed_p, hash_rehash_if_needed): new functions.
(finalizers, doomed_finalizers): declare extern.
(SUBR_SECTION_ATTRIBUTE): new macro.
(staticvec, staticidx): un-static-ify.
(sweep_weak_hash_tables): remove declaration.
(sweep_weak_table): declare.
(hashfn_eql, hashfn_equal): declare.
(number_finalizers_run): new variable.
(Vdead): externify when ENABLE_CHECKING.
(gc_root_type): new enumeration.
(gc_root_visitor): new struct.
(visit_static_gc_roots): declare.
(vectorlike_nbytes): declare.
(vector_nbytes): define as trivial inline function wrapper for
vectorlike_nbytes.
(init_obarray_once): change signature.
(primary_thread): extern-ify.
(init_buffer): change signature.
(init_frame_once): declare.
* src/lread.c (readevalloop): adjust for new dumped predicates.
(init_obarray_once): new function.
(ndefsubr): new variable.
(defsubr): increment it.
(load_path_check): adjust for pdumper.
(load_path_default): use pdumper functions; adjust for
dump search.
* src/macfont.m (macfont_init_font_change_handler): avoid
shadowing global.
(syms_of_macfont_for_pdumper): new function.
(syms_of_macfont): call it.
* src/menu.c (syms_of_menu): staticpro more stuff.
* src/minibuf.c (Ftry_completion): rehash if needed.
(init_minibuf_once_for_pdumper): new function.
(init_minibuf_once): call it.
* src/nsfont.m (syms_of_nsfns): staticpro more.
* src/nsfont.m (syms_of_nsfont_for_pdumper): new function.
(syms_of_nsfont): call it.
* src/nsterm.m (syms_of_nsfont): remember pdumper stuff.
* src/pdumper.c: new file.
* src/pdumper.h: new file.
* src/process.c (init_process_emacs): use new pdumper functions
instead of CANNOT_DUMP.
* src/profiler.c (syms_of_profiler_for_pdumper): new function.
(syms_of_profiler_for_pdumper): call it.
* src/search.c (syms_of_search_for_pdumper): new function.
(syms_of_search_for_pdumper): call it.
* src/sheap.c (bss_sbrk_did_unexec): remove.
* src/sheap.h (bss_sbrk_did_unexec): remove.
* src/syntax.c (syms_of_syntax): don't redundantly staticpro
re_match_object.
* src/sysdep.c: use will_dump_with_unexec_p() instead of bss
hack thing.
* src/syssignals.h (init_sigsegv): declare.
* src/systime.h (init_timefns): remove bool from signature.
* src/textprop.c (syms_of_textprop): move staticpro.
* src/thread.c (main_thread_p): constify.
* src/thread.h (main_thread_p): constify.
* src/timefns.c (init_timefns): remove bool from signature.
(syms_of_timefns_for_pdumper): new function.
(syms_of_timefns): call it.
* src/w32.c: rearrange code.
* src/w32.h (w32_relocate): declare.
* src/w32fns.c (syms_of_w32fns): add pdumper note.
* src/w32font.c (syms_of_w32font_for_pdumper): new function.
(syms_of_w32font): call it.
* src/w32heap.c (using_dynamic_heap): new variable.
(init_heap): use it.
* src/w32menu.c (syms_of_w32menu): add pdumper note.
* src/w32proc.c
(ctrl_c_handler, mainCRTStartup, _start, open_input_file)
(rva_to_section, close_file_data): move here.
* src/w32uniscribe.c (syms_of_w32uniscribe_for_pdumper):
new function.
(syms_of_w32uniscribe): call it.
* src/window.c (init_window_once_for_pdumper): new function.
(init_window_once): call it; staticpro more stuff.
* src/xfont.c (syms_of_xfont_for_pdumper): new function.
(syms_of_xfont): call it.
* src/xftfont.c (syms_of_xftfont_for_pdumper): new function.
(syms_of_xftfont): call it.
* src/xmenu.c (syms_of_xmenu_for_pdumper): new function.
(syms_of_xmenu): call it.
* src/xselect.c (syms_of_xselect_for_pdumper): new function.
(syms_of_xselect): call it.
* src/xsettings.c (syms_of_xsettings): add more pdumper notes.
* src/term.c (syms_of_xterm): add pdumper note.
* src/dispnew.c (init_faces_initial): new function.
(init_display_interactive): rename from init_display; use
will_dump_p instead of !initialized. Initialize faces early for
pdumper if needed.
(init_display): new function.
(syms_of_display_for_pdumper): new function.
(syms_of_display): call it.
* src/dbusbind.c (syms_of_dbusbind): Add TODO for bus reset
on pdumper load.
* src/data.c (Fdefalias): Use will_dump_p
instead of Vpurify_flag.
(Fmake_variable_buffer_local): silence compiler warning with -Og
by making valcontents UNINIT.
(arith_driver): silence compiler warning with UNINIT.
* src/conf_post.h (ATTRIBUTE_SECTION): new macro.
* src/composite.c (composition_gstring_put_cache): rehash hash
table if needed.
* src/coding.c (init_coding_once, syms_of_coding): remember
pdumper stuff.
* src/charset.h (charset_table_size, charset_table_user): declare.
* src/charset.c (charset_table_used, charset_table_size): un-static.
(init_charset_oncem, syms_of_charset): remember pdumper stuff.
* src/category.c (category_table_version): remove obsolete
variable.
* src/callint.c (syms_of_callint): staticpro 'preserved_fns'
(init_callproc): use will_dump_p instead of !CANNOT_DUMP.
* src/bytecode.c (exec_byte_code): rehash table tables if needed
* src/buffer.c (alloc_buffer_text, free_buffer_text): account for
pdumper
(init_buffer_once): add TODO; remember stuff for pdumper.
(init_buffer): don't take initialized argument; adjust
for pdumper.
* src/atimer.c (init_atimer): initialize subr only if
!initialized.
* src/alloc.c: (vector_marked_p, set_vector_marked)
(vectorlike_marked_p, set_vectorlike_marked, cons_marked_p)
(set_cons_marked, string_marked_p, set_string_marked)
(symbol_marked_p, set_symbol_marked, interval_marked_p)
(set_interval_marked): new accessor routines. Use them
instead of raw GC access throughout.
(Vdead): make non-static when ENABLE_CHECKING.
(vectorlike_nbytes): rename of 'vector_nbytes'; take a vectorlike
header as input instead of a vector.
(number_finalizers_run): new internal C variable.
(mark_maybe_object): check for pdumper objects.
(valid_pointer_p): don't be gratuitously inefficient under rr(1).
(make_pure_c_string): add support for size_byte = -2 mode
indicating that string data points into Emacs image rodata.
(visit_vectorlike_root): visits GC roots embedded in
vectorlike objects.
(visit_buffer_root): visits GC roots embedded in
our totally-not-a-buffer buffer global objects.
(visit_static_gc_roots): visit GC roots in the Emacs data section.
(mark_object_root_visitor): root callback used for conventional GC
marking
(weak_hash_tables): new internal variable for tracking found weak
hash tables during GC.
(mark_and_sweep_weak_table_contents): new weak hash table marking.
(garbage_collect_1): use new GC root visitor machinery.
(mark_vectorlike): accept a vectorlike_header instead of a
Lisp_Vector.
(mark_frame, mark_window, mark_hash_table): new functions.
(mark_object): initialize 'm'; check for pdumper objects and use
new mark-bit accessors throughout. Remove some object-specific
marking code and move to helper functions above.
(survives_gc_p): check for pdumper objects.
(gc-sweep): clear pdumper mark bits.
(init_alloc_once_for_pdumper): new helper function for early init
called both during normal init and pdumper load.
(init_alloc_once): pdumper integration.
* src/Makefile.in: Rewrite dumping for pdumper; add pdumper.o;
invoke temacs with --temacs command line option; build dmpstruct.h
from dmpstruct.awk; stop relying on CANNOT_DUMP; clean up pdumper
intermediate files during build.
* nextstep/Makefile.in: build emacs.pdmp into NS packages
* lisp/startup.el: account for new '--temacs' and '--dump-file'
command line option.
* lisp/loadup.el: rewrite early init to account for pdumper; use
injected 'dump-mode' variable (set via the new '--temacs' option)
instead of parsing command line.
* lisp/cus-start.el: Check 'dump-mode' instead of 'purify-flag',
since the new 'dump-mode'
* lib-src/make-fingerprint.c: new program
* lib-src/Makefile.in: built make-fingerprint utility program
* configure.ac: Add --with-pdumper toggle to control pdumper
support; add --with-unexec toggle to control unexec support.
Add --with-dumping option to control which dumping strategy we use
by default. Adjust for pdumper throughout. Check for
posix_madvise.
* Makefile.in: Add @DUMPING@ substitution; add pdumper mode.
* .gitignore: Add make-fingerprint, temacs.in, fingerprint.c,
dmpstruct.h, and pdumper dump files.
2019-01-15 22:36:54 +00:00
|
|
|
|
# Dump loading
|
|
|
|
|
AC_CHECK_FUNCS([posix_madvise])
|
|
|
|
|
|
2011-01-05 13:09:07 +00:00
|
|
|
|
dnl Cannot use AC_CHECK_FUNCS
|
2017-08-29 21:20:47 +00:00
|
|
|
|
AC_CACHE_CHECK([for __builtin_frame_address],
|
|
|
|
|
[emacs_cv_func___builtin_frame_address],
|
|
|
|
|
[AC_LINK_IFELSE([AC_LANG_PROGRAM([], [__builtin_frame_address (0);])],
|
|
|
|
|
[emacs_cv_func___builtin_frame_address=yes],
|
|
|
|
|
[emacs_cv_func___builtin_frame_address=no])])
|
|
|
|
|
if test $emacs_cv_func___builtin_frame_address = yes; then
|
|
|
|
|
AC_DEFINE([HAVE___BUILTIN_FRAME_ADDRESS], 1,
|
|
|
|
|
[Define to 1 if you have the '__builtin_frame_address' function.])
|
|
|
|
|
fi
|
2011-01-05 13:09:07 +00:00
|
|
|
|
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,
|
2015-04-19 21:40:51 +00:00
|
|
|
|
[Define to 1 if you have the '__builtin_unwind_init' function.])
|
2000-04-14 11:21:41 +00:00
|
|
|
|
fi
|
|
|
|
|
|
2012-05-28 00:46:33 +00:00
|
|
|
|
AC_CHECK_HEADERS_ONCE(sys/un.h)
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
2000-12-11 11:53:06 +00:00
|
|
|
|
AC_FUNC_FSEEKO
|
2000-06-02 15:38:39 +00:00
|
|
|
|
|
2000-12-11 11:53:06 +00:00
|
|
|
|
# UNIX98 PTYs.
|
2012-06-23 09:55:13 +00:00
|
|
|
|
AC_CHECK_FUNCS(grantpt)
|
2000-05-20 15:50:35 +00:00
|
|
|
|
|
|
|
|
|
# PTY-related GNU extensions.
|
2012-08-17 07:20:10 +00:00
|
|
|
|
AC_CHECK_FUNCS(getpt posix_openpt)
|
2000-05-20 15:50:35 +00:00
|
|
|
|
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
dnl Run a test program that contains a call to tputs, a call that is
|
|
|
|
|
dnl never executed. This tests whether a pre-'main' dynamic linker
|
|
|
|
|
dnl works with the library. It's too much trouble to actually call
|
|
|
|
|
dnl tputs in the test program, due to portability hassles. When
|
|
|
|
|
dnl cross-compiling, assume the test program will run if it links.
|
2012-03-04 18:07:33 +00:00
|
|
|
|
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;
|
|
|
|
|
}]])
|
|
|
|
|
])
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +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.
|
|
|
|
|
AC_CACHE_CHECK([for library containing tputs], [emacs_cv_tputs_lib],
|
|
|
|
|
[if test "${opsys}" = "mingw32"; then
|
|
|
|
|
emacs_cv_tputs_lib='none required'
|
2012-11-23 15:22:47 +00:00
|
|
|
|
else
|
2017-10-24 18:46:30 +00:00
|
|
|
|
# curses precedes termcap because of AIX (Bug#9736#35) and OpenIndiana.
|
2019-01-05 17:47:14 +00:00
|
|
|
|
tputs_libraries='tinfo ncurses terminfo curses termcap tinfow ncursesw'
|
|
|
|
|
for tputs_library in '' $tputs_libraries; do
|
2012-11-23 15:22:47 +00:00
|
|
|
|
OLIBS=$LIBS
|
|
|
|
|
if test -z "$tputs_library"; then
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
emacs_cv_tputs_lib='none required'
|
2012-11-23 15:22:47 +00:00
|
|
|
|
else
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
emacs_cv_tputs_lib=-l$tputs_library
|
|
|
|
|
LIBS="$emacs_cv_tputs_lib $LIBS"
|
2012-11-23 15:22:47 +00:00
|
|
|
|
fi
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
AC_RUN_IFELSE([tputs_link_source], [], [emacs_cv_tputs_lib=no],
|
|
|
|
|
[AC_LINK_IFELSE([tputs_link_source], [], [emacs_cv_tputs_lib=no])])
|
2012-11-23 15:22:47 +00:00
|
|
|
|
LIBS=$OLIBS
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
if test "X$emacs_cv_tputs_lib" != Xno; then
|
2012-11-23 15:22:47 +00:00
|
|
|
|
break
|
|
|
|
|
fi
|
|
|
|
|
done
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
fi])
|
|
|
|
|
AS_CASE(["$emacs_cv_tputs_lib"],
|
|
|
|
|
[no], [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):
|
2017-10-24 18:46:30 +00:00
|
|
|
|
libtinfo, libncurses, libterminfo, libcurses, libtermcap
|
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.
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
For example, a libncurses-dev(el) or similar package.])],
|
|
|
|
|
[-l*], [LIBS_TERMCAP=$emacs_cv_tputs_lib],
|
|
|
|
|
[*], [LIBS_TERMCAP=])
|
Move TERMINFO, LIBS_TERMCAP from cpp to configure.
* configure.in (HAVE_LIBNCURSES): New local variable.
(TERMINFO, LIBS_TERMCAP, TERMCAP_OBJ): New output variables,
replacing cpp in src/s/*.h and src/Makefile.in.
* src/Makefile.in (LIBS_TERMCAP): Set with configure, not cpp.
(TERMCAP_OBJ): New, set by configure, replacing termcapobj.
(termcapobj): Replace with TERMCAP_OBJ.
(otherobj): Use $TERMCAP_OBJ instead of $termcapobj.
(LIBES): Use LIBS_TERMCAP as a variable.
* src/s/freebsd.h (osreldate.h): No longer include, since this file
does not use __FreeBSD_version any more.
* srs/s/aix4-2.h (TERMINFO):
* srs/s/cygwin.h (TERMINFO):
* srs/s/darwin.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/freebsd.h (TERMINFO, LIBS_TERMCAP):
* srs/s/gnu-linux.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/gnu.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/hpux10-20.h (TERMINFO, LIBS_TERMCAP):
* srs/s/irix6-5.h (TERMINFO):
* srs/s/netbsd.h (LIBS_TERMCAP):
* srs/s/openbsd.h (TERMINFO, LIBS_TERMCAP):
* srs/s/sol2-6.h (LIBS_TERMCAP) [!TERMINFO]:
* srs/s/usg5-4.h (TERMINFO):
Move to configure.
* msdos/sed1v2.inp (LIBS_TERMCAP): Edit to empty.
(TERMCAP_OBJ): Edit to tparam.o.
* admin/CPP-DEFINES (LIBS_TERMCAP, TERMINFO): Remove.
2010-05-08 02:05:24 +00:00
|
|
|
|
|
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
|
Move TERMINFO, LIBS_TERMCAP from cpp to configure.
* configure.in (HAVE_LIBNCURSES): New local variable.
(TERMINFO, LIBS_TERMCAP, TERMCAP_OBJ): New output variables,
replacing cpp in src/s/*.h and src/Makefile.in.
* src/Makefile.in (LIBS_TERMCAP): Set with configure, not cpp.
(TERMCAP_OBJ): New, set by configure, replacing termcapobj.
(termcapobj): Replace with TERMCAP_OBJ.
(otherobj): Use $TERMCAP_OBJ instead of $termcapobj.
(LIBES): Use LIBS_TERMCAP as a variable.
* src/s/freebsd.h (osreldate.h): No longer include, since this file
does not use __FreeBSD_version any more.
* srs/s/aix4-2.h (TERMINFO):
* srs/s/cygwin.h (TERMINFO):
* srs/s/darwin.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/freebsd.h (TERMINFO, LIBS_TERMCAP):
* srs/s/gnu-linux.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/gnu.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/hpux10-20.h (TERMINFO, LIBS_TERMCAP):
* srs/s/irix6-5.h (TERMINFO):
* srs/s/netbsd.h (LIBS_TERMCAP):
* srs/s/openbsd.h (TERMINFO, LIBS_TERMCAP):
* srs/s/sol2-6.h (LIBS_TERMCAP) [!TERMINFO]:
* srs/s/usg5-4.h (TERMINFO):
Move to configure.
* msdos/sed1v2.inp (LIBS_TERMCAP): Edit to empty.
(TERMCAP_OBJ): Edit to tparam.o.
* admin/CPP-DEFINES (LIBS_TERMCAP, TERMINFO): Remove.
2010-05-08 02:05:24 +00:00
|
|
|
|
## 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" ;;
|
1995-09-10 04:18:58 +00:00
|
|
|
|
|
Move TERMINFO, LIBS_TERMCAP from cpp to configure.
* configure.in (HAVE_LIBNCURSES): New local variable.
(TERMINFO, LIBS_TERMCAP, TERMCAP_OBJ): New output variables,
replacing cpp in src/s/*.h and src/Makefile.in.
* src/Makefile.in (LIBS_TERMCAP): Set with configure, not cpp.
(TERMCAP_OBJ): New, set by configure, replacing termcapobj.
(termcapobj): Replace with TERMCAP_OBJ.
(otherobj): Use $TERMCAP_OBJ instead of $termcapobj.
(LIBES): Use LIBS_TERMCAP as a variable.
* src/s/freebsd.h (osreldate.h): No longer include, since this file
does not use __FreeBSD_version any more.
* srs/s/aix4-2.h (TERMINFO):
* srs/s/cygwin.h (TERMINFO):
* srs/s/darwin.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/freebsd.h (TERMINFO, LIBS_TERMCAP):
* srs/s/gnu-linux.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/gnu.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/hpux10-20.h (TERMINFO, LIBS_TERMCAP):
* srs/s/irix6-5.h (TERMINFO):
* srs/s/netbsd.h (LIBS_TERMCAP):
* srs/s/openbsd.h (TERMINFO, LIBS_TERMCAP):
* srs/s/sol2-6.h (LIBS_TERMCAP) [!TERMINFO]:
* srs/s/usg5-4.h (TERMINFO):
Move to configure.
* msdos/sed1v2.inp (LIBS_TERMCAP): Edit to empty.
(TERMCAP_OBJ): Edit to tparam.o.
* admin/CPP-DEFINES (LIBS_TERMCAP, TERMINFO): Remove.
2010-05-08 02:05:24 +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
|
Move TERMINFO, LIBS_TERMCAP from cpp to configure.
* configure.in (HAVE_LIBNCURSES): New local variable.
(TERMINFO, LIBS_TERMCAP, TERMCAP_OBJ): New output variables,
replacing cpp in src/s/*.h and src/Makefile.in.
* src/Makefile.in (LIBS_TERMCAP): Set with configure, not cpp.
(TERMCAP_OBJ): New, set by configure, replacing termcapobj.
(termcapobj): Replace with TERMCAP_OBJ.
(otherobj): Use $TERMCAP_OBJ instead of $termcapobj.
(LIBES): Use LIBS_TERMCAP as a variable.
* src/s/freebsd.h (osreldate.h): No longer include, since this file
does not use __FreeBSD_version any more.
* srs/s/aix4-2.h (TERMINFO):
* srs/s/cygwin.h (TERMINFO):
* srs/s/darwin.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/freebsd.h (TERMINFO, LIBS_TERMCAP):
* srs/s/gnu-linux.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/gnu.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/hpux10-20.h (TERMINFO, LIBS_TERMCAP):
* srs/s/irix6-5.h (TERMINFO):
* srs/s/netbsd.h (LIBS_TERMCAP):
* srs/s/openbsd.h (TERMINFO, LIBS_TERMCAP):
* srs/s/sol2-6.h (LIBS_TERMCAP) [!TERMINFO]:
* srs/s/usg5-4.h (TERMINFO):
Move to configure.
* msdos/sed1v2.inp (LIBS_TERMCAP): Edit to empty.
(TERMCAP_OBJ): Edit to tparam.o.
* admin/CPP-DEFINES (LIBS_TERMCAP, TERMINFO): Remove.
2010-05-08 02:05:24 +00:00
|
|
|
|
fail;
|
|
|
|
|
#endif
|
2011-03-26 19:29:10 +00:00
|
|
|
|
]])], emacs_cv_freebsd_terminfo=yes, emacs_cv_freebsd_terminfo=no)])
|
2007-10-17 15:53:01 +00:00
|
|
|
|
|
Move TERMINFO, LIBS_TERMCAP from cpp to configure.
* configure.in (HAVE_LIBNCURSES): New local variable.
(TERMINFO, LIBS_TERMCAP, TERMCAP_OBJ): New output variables,
replacing cpp in src/s/*.h and src/Makefile.in.
* src/Makefile.in (LIBS_TERMCAP): Set with configure, not cpp.
(TERMCAP_OBJ): New, set by configure, replacing termcapobj.
(termcapobj): Replace with TERMCAP_OBJ.
(otherobj): Use $TERMCAP_OBJ instead of $termcapobj.
(LIBES): Use LIBS_TERMCAP as a variable.
* src/s/freebsd.h (osreldate.h): No longer include, since this file
does not use __FreeBSD_version any more.
* srs/s/aix4-2.h (TERMINFO):
* srs/s/cygwin.h (TERMINFO):
* srs/s/darwin.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/freebsd.h (TERMINFO, LIBS_TERMCAP):
* srs/s/gnu-linux.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/gnu.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/hpux10-20.h (TERMINFO, LIBS_TERMCAP):
* srs/s/irix6-5.h (TERMINFO):
* srs/s/netbsd.h (LIBS_TERMCAP):
* srs/s/openbsd.h (TERMINFO, LIBS_TERMCAP):
* srs/s/sol2-6.h (LIBS_TERMCAP) [!TERMINFO]:
* srs/s/usg5-4.h (TERMINFO):
Move to configure.
* msdos/sed1v2.inp (LIBS_TERMCAP): Edit to empty.
(TERMCAP_OBJ): Edit to tparam.o.
* admin/CPP-DEFINES (LIBS_TERMCAP, TERMINFO): Remove.
2010-05-08 02:05:24 +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
|
Move TERMINFO, LIBS_TERMCAP from cpp to configure.
* configure.in (HAVE_LIBNCURSES): New local variable.
(TERMINFO, LIBS_TERMCAP, TERMCAP_OBJ): New output variables,
replacing cpp in src/s/*.h and src/Makefile.in.
* src/Makefile.in (LIBS_TERMCAP): Set with configure, not cpp.
(TERMCAP_OBJ): New, set by configure, replacing termcapobj.
(termcapobj): Replace with TERMCAP_OBJ.
(otherobj): Use $TERMCAP_OBJ instead of $termcapobj.
(LIBES): Use LIBS_TERMCAP as a variable.
* src/s/freebsd.h (osreldate.h): No longer include, since this file
does not use __FreeBSD_version any more.
* srs/s/aix4-2.h (TERMINFO):
* srs/s/cygwin.h (TERMINFO):
* srs/s/darwin.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/freebsd.h (TERMINFO, LIBS_TERMCAP):
* srs/s/gnu-linux.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/gnu.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/hpux10-20.h (TERMINFO, LIBS_TERMCAP):
* srs/s/irix6-5.h (TERMINFO):
* srs/s/netbsd.h (LIBS_TERMCAP):
* srs/s/openbsd.h (TERMINFO, LIBS_TERMCAP):
* srs/s/sol2-6.h (LIBS_TERMCAP) [!TERMINFO]:
* srs/s/usg5-4.h (TERMINFO):
Move to configure.
* msdos/sed1v2.inp (LIBS_TERMCAP): Edit to empty.
(TERMCAP_OBJ): Edit to tparam.o.
* admin/CPP-DEFINES (LIBS_TERMCAP, TERMINFO): Remove.
2010-05-08 02:05:24 +00:00
|
|
|
|
LIBS_TERMCAP="-ltermcap"
|
|
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
|
|
2012-11-23 15:22:47 +00:00
|
|
|
|
mingw32)
|
|
|
|
|
TERMINFO=no
|
|
|
|
|
LIBS_TERMCAP=
|
|
|
|
|
;;
|
|
|
|
|
|
2010-05-20 06:37:29 +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-05-20 06:37:29 +00:00
|
|
|
|
LIBS_TERMCAP="-ltermcap"
|
|
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
|
|
2013-04-18 17:12:21 +00:00
|
|
|
|
openbsd | dragonfly) LIBS_TERMCAP="-lncurses" ;;
|
Move TERMINFO, LIBS_TERMCAP from cpp to configure.
* configure.in (HAVE_LIBNCURSES): New local variable.
(TERMINFO, LIBS_TERMCAP, TERMCAP_OBJ): New output variables,
replacing cpp in src/s/*.h and src/Makefile.in.
* src/Makefile.in (LIBS_TERMCAP): Set with configure, not cpp.
(TERMCAP_OBJ): New, set by configure, replacing termcapobj.
(termcapobj): Replace with TERMCAP_OBJ.
(otherobj): Use $TERMCAP_OBJ instead of $termcapobj.
(LIBES): Use LIBS_TERMCAP as a variable.
* src/s/freebsd.h (osreldate.h): No longer include, since this file
does not use __FreeBSD_version any more.
* srs/s/aix4-2.h (TERMINFO):
* srs/s/cygwin.h (TERMINFO):
* srs/s/darwin.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/freebsd.h (TERMINFO, LIBS_TERMCAP):
* srs/s/gnu-linux.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/gnu.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/hpux10-20.h (TERMINFO, LIBS_TERMCAP):
* srs/s/irix6-5.h (TERMINFO):
* srs/s/netbsd.h (LIBS_TERMCAP):
* srs/s/openbsd.h (TERMINFO, LIBS_TERMCAP):
* srs/s/sol2-6.h (LIBS_TERMCAP) [!TERMINFO]:
* srs/s/usg5-4.h (TERMINFO):
Move to configure.
* msdos/sed1v2.inp (LIBS_TERMCAP): Edit to empty.
(TERMCAP_OBJ): Edit to tparam.o.
* admin/CPP-DEFINES (LIBS_TERMCAP, TERMINFO): Remove.
2010-05-08 02:05:24 +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-05-20 06:37:29 +00:00
|
|
|
|
hpux*) LIBS_TERMCAP="-ltermcap" ;;
|
Move TERMINFO, LIBS_TERMCAP from cpp to configure.
* configure.in (HAVE_LIBNCURSES): New local variable.
(TERMINFO, LIBS_TERMCAP, TERMCAP_OBJ): New output variables,
replacing cpp in src/s/*.h and src/Makefile.in.
* src/Makefile.in (LIBS_TERMCAP): Set with configure, not cpp.
(TERMCAP_OBJ): New, set by configure, replacing termcapobj.
(termcapobj): Replace with TERMCAP_OBJ.
(otherobj): Use $TERMCAP_OBJ instead of $termcapobj.
(LIBES): Use LIBS_TERMCAP as a variable.
* src/s/freebsd.h (osreldate.h): No longer include, since this file
does not use __FreeBSD_version any more.
* srs/s/aix4-2.h (TERMINFO):
* srs/s/cygwin.h (TERMINFO):
* srs/s/darwin.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/freebsd.h (TERMINFO, LIBS_TERMCAP):
* srs/s/gnu-linux.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/gnu.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/hpux10-20.h (TERMINFO, LIBS_TERMCAP):
* srs/s/irix6-5.h (TERMINFO):
* srs/s/netbsd.h (LIBS_TERMCAP):
* srs/s/openbsd.h (TERMINFO, LIBS_TERMCAP):
* srs/s/sol2-6.h (LIBS_TERMCAP) [!TERMINFO]:
* srs/s/usg5-4.h (TERMINFO):
Move to configure.
* msdos/sed1v2.inp (LIBS_TERMCAP): Edit to empty.
(TERMCAP_OBJ): Edit to tparam.o.
* admin/CPP-DEFINES (LIBS_TERMCAP, TERMINFO): Remove.
2010-05-08 02:05:24 +00:00
|
|
|
|
|
|
|
|
|
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
|
Move TERMINFO, LIBS_TERMCAP from cpp to configure.
* configure.in (HAVE_LIBNCURSES): New local variable.
(TERMINFO, LIBS_TERMCAP, TERMCAP_OBJ): New output variables,
replacing cpp in src/s/*.h and src/Makefile.in.
* src/Makefile.in (LIBS_TERMCAP): Set with configure, not cpp.
(TERMCAP_OBJ): New, set by configure, replacing termcapobj.
(termcapobj): Replace with TERMCAP_OBJ.
(otherobj): Use $TERMCAP_OBJ instead of $termcapobj.
(LIBES): Use LIBS_TERMCAP as a variable.
* src/s/freebsd.h (osreldate.h): No longer include, since this file
does not use __FreeBSD_version any more.
* srs/s/aix4-2.h (TERMINFO):
* srs/s/cygwin.h (TERMINFO):
* srs/s/darwin.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/freebsd.h (TERMINFO, LIBS_TERMCAP):
* srs/s/gnu-linux.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/gnu.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/hpux10-20.h (TERMINFO, LIBS_TERMCAP):
* srs/s/irix6-5.h (TERMINFO):
* srs/s/netbsd.h (LIBS_TERMCAP):
* srs/s/openbsd.h (TERMINFO, LIBS_TERMCAP):
* srs/s/sol2-6.h (LIBS_TERMCAP) [!TERMINFO]:
* srs/s/usg5-4.h (TERMINFO):
Move to configure.
* msdos/sed1v2.inp (LIBS_TERMCAP): Edit to empty.
(TERMCAP_OBJ): Edit to tparam.o.
* admin/CPP-DEFINES (LIBS_TERMCAP, TERMINFO): Remove.
2010-05-08 02:05:24 +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
|
Move TERMINFO, LIBS_TERMCAP from cpp to configure.
* configure.in (HAVE_LIBNCURSES): New local variable.
(TERMINFO, LIBS_TERMCAP, TERMCAP_OBJ): New output variables,
replacing cpp in src/s/*.h and src/Makefile.in.
* src/Makefile.in (LIBS_TERMCAP): Set with configure, not cpp.
(TERMCAP_OBJ): New, set by configure, replacing termcapobj.
(termcapobj): Replace with TERMCAP_OBJ.
(otherobj): Use $TERMCAP_OBJ instead of $termcapobj.
(LIBES): Use LIBS_TERMCAP as a variable.
* src/s/freebsd.h (osreldate.h): No longer include, since this file
does not use __FreeBSD_version any more.
* srs/s/aix4-2.h (TERMINFO):
* srs/s/cygwin.h (TERMINFO):
* srs/s/darwin.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/freebsd.h (TERMINFO, LIBS_TERMCAP):
* srs/s/gnu-linux.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/gnu.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
* srs/s/hpux10-20.h (TERMINFO, LIBS_TERMCAP):
* srs/s/irix6-5.h (TERMINFO):
* srs/s/netbsd.h (LIBS_TERMCAP):
* srs/s/openbsd.h (TERMINFO, LIBS_TERMCAP):
* srs/s/sol2-6.h (LIBS_TERMCAP) [!TERMINFO]:
* srs/s/usg5-4.h (TERMINFO):
Move to configure.
* msdos/sed1v2.inp (LIBS_TERMCAP): Edit to empty.
(TERMCAP_OBJ): Edit to tparam.o.
* admin/CPP-DEFINES (LIBS_TERMCAP, TERMINFO): Remove.
2010-05-08 02:05:24 +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])])
|
|
|
|
|
|
2001-10-24 22:54:38 +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?
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +00:00
|
|
|
|
LIBHESIOD=
|
2016-02-29 17:39:45 +00:00
|
|
|
|
LIBRESOLV=
|
2008-07-16 07:55:50 +00:00
|
|
|
|
if test "$with_hesiod" != no ; then
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +00:00
|
|
|
|
# Don't set $LIBS here -- see comments above. FIXME which comments?
|
2016-02-29 17:39:45 +00:00
|
|
|
|
resolv=no
|
2001-10-24 22:54:38 +00:00
|
|
|
|
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
|
2016-02-29 17:39:45 +00:00
|
|
|
|
hesiod=no
|
2001-10-24 22:54:38 +00:00
|
|
|
|
AC_CHECK_FUNC(hes_getmailhost, , [AC_CHECK_LIB(hesiod, hes_getmailhost,
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +00:00
|
|
|
|
hesiod=yes, :, $RESOLVLIB)])
|
|
|
|
|
|
|
|
|
|
if test x"$hesiod" = xyes; then
|
|
|
|
|
LIBHESIOD=-lhesiod
|
2016-02-29 17:39:45 +00:00
|
|
|
|
LIBRESOLV=$RESOLVLIB
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +00:00
|
|
|
|
fi
|
2001-10-24 22:54:38 +00:00
|
|
|
|
fi
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +00:00
|
|
|
|
AC_SUBST(LIBHESIOD)
|
|
|
|
|
AC_SUBST(LIBRESOLV)
|
2007-10-17 15:53:01 +00:00
|
|
|
|
|
1999-11-23 22:16:16 +00:00
|
|
|
|
# These tell us which Kerberos-related libraries to use.
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +00:00
|
|
|
|
COM_ERRLIB=
|
|
|
|
|
CRYPTOLIB=
|
|
|
|
|
KRB5LIB=
|
|
|
|
|
DESLIB=
|
|
|
|
|
KRB4LIB=
|
|
|
|
|
|
2008-07-16 07:55:50 +00:00
|
|
|
|
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
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +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?
|
2008-07-16 07:55:50 +00:00
|
|
|
|
if test "${with_kerberos5}" = no; then
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +00:00
|
|
|
|
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
|
1999-11-23 22:16:16 +00:00
|
|
|
|
fi
|
|
|
|
|
|
2008-07-16 07:55:50 +00:00
|
|
|
|
if test "${with_kerberos5}" != no; then
|
2008-08-05 23:43:50 +00:00
|
|
|
|
AC_CHECK_HEADERS(krb5.h,
|
2008-08-06 09:29:17 +00:00
|
|
|
|
[AC_CHECK_MEMBERS([krb5_error.text, krb5_error.e_text],,,
|
|
|
|
|
[#include <krb5.h>])])
|
1999-11-23 22:16:16 +00:00
|
|
|
|
else
|
|
|
|
|
AC_CHECK_HEADERS(krb.h,,
|
2001-12-07 05:50:16 +00:00
|
|
|
|
[AC_CHECK_HEADERS(kerberosIV/krb.h,,
|
|
|
|
|
[AC_CHECK_HEADERS(kerberos/krb.h)])])
|
1999-11-23 22:16:16 +00:00
|
|
|
|
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
|
1999-11-23 22:16:16 +00:00
|
|
|
|
fi
|
|
|
|
|
|
Replace some cpp with autoconf.
* configure.in (--with-mmdf, --with-mail-unlink):
New options, off by default.
(--with-mailhost): New option to set default POP host.
(LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF, LIBGPM, LIBS_MAIL)
(LIBHESIOD, LIBRESOLV, COM_ERRLIB, CRYPTOLIB, KRB5LIB, DESLIB, KRB4LIB):
New variables, substituted in Makefiles.
(try_libungif, ac_gif_lib_name): Replace with HAVE_GIF=maybe, LIBGIF.
(LIBGIF): Use AC_SUBST rather than AC_DEFINE.
(HAVE_LIBMAIL, HAVE_LIBLOCKFILE, HAVE_LIBCOM_ERR, HAVE_LIBCRYPTO)
(HAVE_LIBK5CRYPTO, HAVE_LIBKRB5, HAVE_LIBDES425, HAVE_LIBDES)
(HAVE_LIBKRB4, HAVE_LIBKRB): New AC_DEFINEs.
* lib-src/Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(HESIODLIB, LIBS_MAIL): Set using autoconf rather than cpp.
(BASE_CFLAGS): Remove (identical to CPP_CFLAGS).
* src/Makefile.in (XFT_LIBS, LIBXPM, LIBJPEG, LIBPNG, LIBTIFF, LIBGIF)
(LIBGPM, LIBRESOLV): Set using autoconf rather than cpp.
2010-03-18 05:49:31 +00:00
|
|
|
|
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)
|
|
|
|
|
|
2015-09-13 18:55:28 +00:00
|
|
|
|
AC_CHECK_MEMBERS([struct unipair.unicode], [], [], [[#include <linux/kd.h>]])
|
|
|
|
|
|
2020-08-03 22:21:59 +00:00
|
|
|
|
AC_CHECK_FUNCS_ONCE([__lsan_ignore_object sbrk])
|
1994-08-26 14:57:46 +00:00
|
|
|
|
|
2001-12-07 05:50:16 +00:00
|
|
|
|
AC_FUNC_FORK
|
2000-02-12 16:21:43 +00:00
|
|
|
|
|
2020-08-03 22:21:59 +00:00
|
|
|
|
dnl AC_CHECK_FUNCS_ONCE wouldn’t be right for snprintf, which needs
|
|
|
|
|
dnl the current CFLAGS etc.
|
|
|
|
|
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=
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
AC_CACHE_CHECK([whether GLib is linked in], [emacs_cv_links_glib],
|
|
|
|
|
[OLDCFLAGS="$CFLAGS"
|
2014-03-23 09:17:29 +00:00
|
|
|
|
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"
|
2015-11-09 09:00:56 +00:00
|
|
|
|
CFLAGS="$CFLAGS $NOTIFY_CFLAGS $CAIRO_CFLAGS"
|
|
|
|
|
LIBS="$LIBS $NOTIFY_LIBS $CAIRO_LIBS"
|
2013-06-03 18:47:35 +00:00
|
|
|
|
AC_LINK_IFELSE([AC_LANG_PROGRAM(
|
|
|
|
|
[[#include <glib.h>
|
2015-04-19 21:40:51 +00:00
|
|
|
|
]],
|
2013-06-03 18:47:35 +00:00
|
|
|
|
[[g_print ("Hello world");]])],
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
[emacs_cv_links_glib=yes],
|
|
|
|
|
[emacs_cv_links_glib=no])
|
|
|
|
|
CFLAGS="$OLDCFLAGS"
|
|
|
|
|
LIBS="$OLDLIBS"])
|
|
|
|
|
if test "${emacs_cv_links_glib}" = "yes"; then
|
2013-06-03 18:47:35 +00:00
|
|
|
|
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
|
|
|
|
|
AC_SUBST(XGSELOBJ)
|
|
|
|
|
|
2003-01-06 17:42:52 +00:00
|
|
|
|
dnl Adapted from Haible's version.
|
2019-02-02 21:23:04 +00:00
|
|
|
|
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>]],
|
2019-02-02 21:23:04 +00:00
|
|
|
|
[[char *cs = nl_langinfo(CODESET);]])],
|
|
|
|
|
[emacs_cv_langinfo_codeset=yes],
|
|
|
|
|
[emacs_cv_langinfo_codeset=no])
|
2003-01-06 17:42:52 +00:00
|
|
|
|
])
|
2019-02-02 21:23:04 +00:00
|
|
|
|
if test "$emacs_cv_langinfo_codeset" = yes; then
|
|
|
|
|
AC_DEFINE([HAVE_LANGINFO_CODESET], 1,
|
|
|
|
|
[Define if you have <langinfo.h> and nl_langinfo (CODESET).])
|
|
|
|
|
|
|
|
|
|
AC_CACHE_CHECK([for nl_langinfo and _NL_PAPER_WIDTH],
|
|
|
|
|
[emacs_cv_langinfo__nl_paper_width],
|
|
|
|
|
[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]],
|
|
|
|
|
[[char *cs = nl_langinfo (_NL_PAPER_WIDTH);]])],
|
|
|
|
|
[emacs_cv_langinfo__nl_paper_width=yes],
|
|
|
|
|
[emacs_cv_langinfo__nl_paper_width=no])
|
|
|
|
|
])
|
|
|
|
|
if test "$emacs_cv_langinfo__nl_paper_width" = yes; then
|
|
|
|
|
AC_DEFINE([HAVE_LANGINFO__NL_PAPER_WIDTH], 1,
|
|
|
|
|
[Define if you have <langinfo.h> and nl_langinfo (_NL_PAPER_WIDTH).])
|
|
|
|
|
fi
|
2003-01-06 17:42:52 +00:00
|
|
|
|
fi
|
|
|
|
|
|
2003-06-05 16:37:13 +00:00
|
|
|
|
AC_TYPE_MBSTATE_T
|
|
|
|
|
|
2002-11-18 16:24:41 +00:00
|
|
|
|
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.
|
2003-05-20 16:32:16 +00:00
|
|
|
|
dnl The following looks like a useful start.
|
|
|
|
|
dnl
|
|
|
|
|
dnl AC_SYS_POSIX_TERMIOS
|
|
|
|
|
dnl if test $ac_cv_sys_posix_termios = yes; then
|
2005-04-20 10:54:46 +00:00
|
|
|
|
dnl AC_DEFINE(HAVE_TERMIOS, 1, [Define to 1 if you have POSIX-style functions
|
2003-05-20 16:32:16 +00:00
|
|
|
|
dnl and macros for terminal control.])
|
|
|
|
|
dnl AC_DEFINE(HAVE_TCATTR, 1, [Define to 1 if you have tcgetattr and tcsetattr.])
|
|
|
|
|
dnl fi
|
2002-11-18 16:24:41 +00:00
|
|
|
|
|
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.
|
|
|
|
|
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
|
2012-07-31 22:24:49 +00:00
|
|
|
|
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.])
|
2015-11-23 22:02:42 +00:00
|
|
|
|
dnl This is for MinGW, and is used in test/Makefile.in.
|
2013-11-28 23:50:09 +00:00
|
|
|
|
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.])
|
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_))],
|
|
|
|
|
[Returns true if character is any form of separator.])
|
|
|
|
|
fi
|
2012-07-11 23:40:59 +00:00
|
|
|
|
|
2016-07-04 17:05:06 +00:00
|
|
|
|
if test "$USE_X_TOOLKIT" != "none"; then
|
|
|
|
|
have_editres=yes
|
|
|
|
|
case $opsys in
|
|
|
|
|
hpux*)
|
|
|
|
|
dnl Assar Westerlund <assar@sics.se> says this is necessary
|
|
|
|
|
dnl for HP-UX 10.20, and that it works for HP-UX 0 as well.
|
|
|
|
|
have_editres=no
|
2012-07-12 21:14:13 +00:00
|
|
|
|
;;
|
2016-07-04 17:05:06 +00:00
|
|
|
|
esac
|
|
|
|
|
if test "$have_editres" != no && test ! -z "$LIBXMU"; then
|
|
|
|
|
OLDLIBS="$LIBS"
|
|
|
|
|
dnl See libXmu.a check above.
|
|
|
|
|
if test x$HAVE_X11XTR6 = xyes; then
|
|
|
|
|
LIBS="-lXt -lSM -lICE $LIBXMU"
|
|
|
|
|
else
|
|
|
|
|
OTHERLIBS="-lXt -$LIBXMU"
|
|
|
|
|
fi
|
|
|
|
|
AC_TRY_LINK(
|
|
|
|
|
[#include <X11/Intrinsic.h>
|
|
|
|
|
#include <X11/Xmu/Editres.h>],
|
|
|
|
|
[_XEditResCheckMessages (0, 0, 0, 0);],
|
|
|
|
|
[AC_DEFINE([X_TOOLKIT_EDITRES], 1,
|
|
|
|
|
[Define to 1 if we should use XEditRes.])])
|
|
|
|
|
LIBS=$OLDLIBS
|
|
|
|
|
fi
|
|
|
|
|
fi
|
2012-07-12 21:14:13 +00:00
|
|
|
|
|
2012-06-12 17:43:09 +00:00
|
|
|
|
case $opsys in
|
2020-08-06 00:36:50 +00:00
|
|
|
|
solaris | unixware )
|
2012-07-13 01:19:06 +00:00
|
|
|
|
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.
|
2020-08-06 00:36:50 +00:00
|
|
|
|
hpux* | nacl | openbsd | solaris | 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
|
2020-08-06 00:36:50 +00:00
|
|
|
|
gnu-* | solaris )
|
2012-06-12 19:03:32 +00:00
|
|
|
|
dnl FIXME Can't we test if this exists (eg /proc/$$)?
|
|
|
|
|
AC_DEFINE(HAVE_PROCFS, 1, [Define if you have the /proc filesystem.])
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
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-06-12 18:44:31 +00:00
|
|
|
|
|
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
|
2012-06-12 19:15:47 +00:00
|
|
|
|
|
2012-07-11 02:16:25 +00:00
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
|
2015-04-19 21:40:51 +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
|
2012-07-12 00:49:24 +00:00
|
|
|
|
dnl NARROWPROTO, we will see the wrong function prototypes for X functions
|
|
|
|
|
dnl taking float or double parameters.
|
|
|
|
|
case $opsys in
|
2016-03-07 16:22:37 +00:00
|
|
|
|
cygwin|gnu|gnu-linux|gnu-kfreebsd|freebsd|netbsd|openbsd)
|
2012-07-12 00:49:24 +00:00
|
|
|
|
AC_DEFINE(NARROWPROTO, 1, [Define if system's imake configuration
|
2015-04-19 21:40:51 +00:00
|
|
|
|
file defines 'NeedWidePrototypes' as 'NO'.])
|
2012-07-12 00:49:24 +00:00
|
|
|
|
;;
|
|
|
|
|
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.
|
|
|
|
|
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
|
|
|
|
;;
|
|
|
|
|
|
2020-06-27 03:56:42 +00:00
|
|
|
|
gnu | qnxnto )
|
2012-07-12 06:34:40 +00:00
|
|
|
|
AC_DEFINE(FIRST_PTY_LETTER, ['p'])
|
|
|
|
|
;;
|
|
|
|
|
|
2020-06-27 03:56:42 +00:00
|
|
|
|
gnu-linux | gnu-kfreebsd | dragonfly | freebsd | openbsd | netbsd | darwin | nacl )
|
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
|
|
|
|
;;
|
|
|
|
|
|
2020-08-06 00:36:50 +00:00
|
|
|
|
solaris )
|
2015-06-11 23:41:36 +00:00
|
|
|
|
dnl On SysVr4, grantpt(3) forks a subprocess, so do not use
|
|
|
|
|
dnl O_CLOEXEC when opening the pty, and keep the SIGCHLD handler
|
2012-07-12 07:43:05 +00:00
|
|
|
|
dnl from intercepting that death. If any child but grantpt's should die
|
|
|
|
|
dnl within, it should be caught after sigrelse(2).
|
2015-06-11 23:41:36 +00:00
|
|
|
|
AC_DEFINE(PTY_OPEN, [fd = open (pty_name, O_RDWR | O_NONBLOCK)])
|
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 )
|
2020-08-06 00:36:50 +00:00
|
|
|
|
dnl Comments are as per solaris.
|
2015-06-11 23:41:36 +00:00
|
|
|
|
AC_DEFINE(PTY_OPEN, [fd = open (pty_name, O_RDWR | O_NONBLOCK)])
|
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
|
2020-08-06 00:36:50 +00:00
|
|
|
|
solaris | unixware )
|
2012-07-13 21:45:55 +00:00
|
|
|
|
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.
|
2015-06-12 05:49:02 +00:00
|
|
|
|
AC_DEFINE(SETUP_SLAVE_PTY, [if (ioctl (forkin, I_PUSH, "ptem") == -1) fatal ("ioctl I_PUSH ptem"); if (ioctl (forkin, I_PUSH, "ldterm") == -1) fatal ("ioctl I_PUSH ldterm"); if (ioctl (forkin, 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.
|
2016-03-07 16:22:37 +00:00
|
|
|
|
aix4-2 | cygwin | gnu | 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 )
|
|
|
|
|
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
AC_CACHE_CHECK([for signals via characters], [emacs_cv_signals_via_chars],
|
|
|
|
|
[AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
|
2012-07-11 07:28:27 +00:00
|
|
|
|
#include <linux/version.h>
|
|
|
|
|
#if LINUX_VERSION_CODE < 0x20400
|
|
|
|
|
# error "Linux version too old"
|
|
|
|
|
#endif
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
]], [[]])], emacs_cv_signals_via_chars=yes, emacs_cv_signals_via_chars=no)])
|
2012-07-11 07:28:27 +00:00
|
|
|
|
|
Speed up ./configure with more caching (Bug#27960)
* configure.ac: Cache the 'GTK compiles', 'GSettings is in gio',
'LN_S', '-znocombreloc', 'sysinfo', 'gcc autodepends', '-b link',
'Xkb', 'Xpm preprocessor', 'tputs library' 'GLib', 'signals via
characters', and 'Windows API header' checks. Remove pause after
warning about GTK bug.
2017-04-09 00:58:20 +00:00
|
|
|
|
test "$emacs_cv_signals_via_chars" = yes && AC_DEFINE(SIGNALS_VIA_CHARACTERS, 1)
|
2012-07-11 07:28:27 +00:00
|
|
|
|
;;
|
|
|
|
|
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
|
2020-08-06 00:36:50 +00:00
|
|
|
|
aix* | dragonfly | freebsd | netbsd | openbsd | solaris )
|
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
|
|
|
|
|
|
2015-08-08 15:25:51 +00:00
|
|
|
|
case $emacs_cv_func_sigsetjmp,$emacs_cv_alternate_stack,$opsys in
|
|
|
|
|
yes,yes,* | *,*,mingw32)
|
|
|
|
|
AC_DEFINE([HAVE_STACK_OVERFLOW_HANDLING], 1,
|
|
|
|
|
[Define to 1 if C stack overflow can be handled in some cases.]);;
|
|
|
|
|
esac
|
2015-08-08 08:12:06 +00:00
|
|
|
|
|
2012-07-30 14:30:20 +00:00
|
|
|
|
case $opsys in
|
2020-08-06 00:36:50 +00:00
|
|
|
|
solaris | 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
|
2020-08-06 00:36:50 +00:00
|
|
|
|
hpux* | solaris )
|
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)
|
2016-11-06 07:33:43 +00:00
|
|
|
|
dnl Not __APPLE__, as this may not be defined on non-macOS 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 DARWIN, because Panther and lower CoreFoundation.h use DARWIN to
|
2016-11-06 07:33:43 +00:00
|
|
|
|
dnl distinguish macOS from pure Darwin.
|
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(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.])
|
|
|
|
|
;;
|
|
|
|
|
|
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
|
|
|
|
;;
|
|
|
|
|
|
2020-08-06 00:36:50 +00:00
|
|
|
|
solaris)
|
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(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
|
2015-03-31 18:26:48 +00:00
|
|
|
|
aix4-2 | nacl)
|
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 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
|
|
|
|
|
|
2012-07-12 01:49:28 +00:00
|
|
|
|
case $opsys in
|
|
|
|
|
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.])
|
|
|
|
|
;;
|
|
|
|
|
|
2020-08-06 00:36:50 +00:00
|
|
|
|
solaris)
|
2012-07-12 01:49:28 +00:00
|
|
|
|
AC_DEFINE(_STRUCTURED_PROC, 1, [Needed for system_process_attributes
|
|
|
|
|
on Solaris.])
|
|
|
|
|
;;
|
2012-06-12 17:53:25 +00:00
|
|
|
|
esac
|
|
|
|
|
|
1994-08-26 14:57:46 +00:00
|
|
|
|
# Set up the CFLAGS for real compilation, so we can substitute it.
|
|
|
|
|
CFLAGS="$REAL_CFLAGS"
|
2000-06-30 22:02:25 +00:00
|
|
|
|
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"
|
1994-08-26 14:57:46 +00:00
|
|
|
|
|
2010-05-03 01:42:50 +00:00
|
|
|
|
## Hack to detect a buggy GCC version.
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
|
if test "$GCC" = yes && \
|
|
|
|
|
$CC --version 2> /dev/null | grep 'gcc.* 4.5.0' >/dev/null; then
|
|
|
|
|
case $CFLAGS in
|
|
|
|
|
*-fno-optimize-sibling-calls*) ;;
|
|
|
|
|
*-O@<:@23@:>@*)
|
|
|
|
|
AC_MSG_ERROR([GCC 4.5.0 has problems compiling Emacs; see etc/PROBLEMS.]);;
|
|
|
|
|
esac
|
2010-05-03 01:42:50 +00:00
|
|
|
|
fi
|
|
|
|
|
|
2011-01-31 08:12:52 +00:00
|
|
|
|
version=$PACKAGE_VERSION
|
1994-08-26 14:57:46 +00:00
|
|
|
|
|
2020-01-01 01:01:53 +00:00
|
|
|
|
copyright="Copyright (C) 2020 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)
|
|
|
|
|
|
1994-08-26 14:57:46 +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)
|
2010-05-13 03:18:04 +00:00
|
|
|
|
## Unused?
|
1994-10-27 19:58:25 +00:00
|
|
|
|
AC_SUBST(canonical)
|
1994-08-26 14:57:46 +00:00
|
|
|
|
AC_SUBST(srcdir)
|
|
|
|
|
AC_SUBST(prefix)
|
|
|
|
|
AC_SUBST(exec_prefix)
|
|
|
|
|
AC_SUBST(bindir)
|
|
|
|
|
AC_SUBST(datadir)
|
2019-07-17 16:07:36 +00:00
|
|
|
|
AC_SUBST(gsettingsschemadir)
|
1994-10-27 19:58:25 +00:00
|
|
|
|
AC_SUBST(sharedstatedir)
|
|
|
|
|
AC_SUBST(libexecdir)
|
1994-08-26 14:57:46 +00:00
|
|
|
|
AC_SUBST(mandir)
|
|
|
|
|
AC_SUBST(infodir)
|
|
|
|
|
AC_SUBST(lispdir)
|
2012-06-30 21:10:50 +00:00
|
|
|
|
AC_SUBST(standardlisppath)
|
1994-08-26 14:57:46 +00:00
|
|
|
|
AC_SUBST(locallisppath)
|
|
|
|
|
AC_SUBST(lisppath)
|
1997-08-24 01:01:45 +00:00
|
|
|
|
AC_SUBST(x_default_search_path)
|
1994-08-26 14:57:46 +00:00
|
|
|
|
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)
|
1994-10-27 19:58:25 +00:00
|
|
|
|
AC_SUBST(bitmapdir)
|
2002-04-10 19:04:08 +00:00
|
|
|
|
AC_SUBST(gamedir)
|
|
|
|
|
AC_SUBST(gameuser)
|
2015-01-16 08:25:25 +00:00
|
|
|
|
AC_SUBST(gamegroup)
|
2010-05-13 03:18:04 +00:00
|
|
|
|
## 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.
|
1994-08-26 14:57:46 +00:00
|
|
|
|
AC_SUBST(LD_SWITCH_X_SITE)
|
|
|
|
|
AC_SUBST(C_SWITCH_X_SITE)
|
2012-04-11 01:25:51 +00:00
|
|
|
|
AC_SUBST(GNUSTEP_CFLAGS)
|
1994-08-26 14:57:46 +00:00
|
|
|
|
AC_SUBST(CFLAGS)
|
2010-04-27 07:33:35 +00:00
|
|
|
|
## Used in lwlib/Makefile.in.
|
1994-08-26 14:57:46 +00:00
|
|
|
|
AC_SUBST(X_TOOLKIT_TYPE)
|
2008-07-15 18:15:18 +00:00
|
|
|
|
AC_SUBST(ns_appdir)
|
2008-07-17 17:44:41 +00:00
|
|
|
|
AC_SUBST(ns_appbindir)
|
|
|
|
|
AC_SUBST(ns_appresdir)
|
|
|
|
|
AC_SUBST(ns_appsrc)
|
2008-08-07 14:21:43 +00:00
|
|
|
|
AC_SUBST(GNU_OBJC_CFLAGS)
|
2009-09-17 06:10:44 +00:00
|
|
|
|
AC_SUBST(OTHER_FILES)
|
1994-08-26 14:57:46 +00:00
|
|
|
|
|
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
|
|
|
|
|
|
2002-04-14 01:40:58 +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}",
|
2002-04-14 01:40:58 +00:00
|
|
|
|
[Define to the options passed to configure.])
|
2013-03-29 19:53:25 +00:00
|
|
|
|
|
2010-04-21 06:35:35 +00:00
|
|
|
|
XMENU_OBJ=
|
|
|
|
|
XOBJ=
|
2010-05-15 21:31:19 +00:00
|
|
|
|
FONT_OBJ=
|
1994-08-26 14:57:46 +00:00
|
|
|
|
if test "${HAVE_X_WINDOWS}" = "yes" ; then
|
2002-04-14 01:40:58 +00:00
|
|
|
|
AC_DEFINE(HAVE_X_WINDOWS, 1,
|
|
|
|
|
[Define to 1 if you want to use the X window system.])
|
2010-04-21 06:35:35 +00:00
|
|
|
|
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-05-15 21:31:19 +00:00
|
|
|
|
FONT_OBJ=xfont.o
|
2016-01-25 23:29:53 +00:00
|
|
|
|
if test "$HAVE_CAIRO" = "yes"; then
|
2019-06-08 05:05:49 +00:00
|
|
|
|
FONT_OBJ="$FONT_OBJ ftfont.o ftcrfont.o"
|
Add cairo drawing.
* configure.ac (with-cairo): New option.
(USE_CAIRO): Default to yes for Gtk+ 3. Add code to test for cairo,
set CAIRO_CFLAGS, CAIRO_LIBS. Add ftcrfonto to FONT_OBJ if cairo.
Output "Does Emacs use cairo?".
* lisp/version.el (emacs-version): Add cairo version.
* src/Makefile.in (CAIRO_CFLAGS, CAIRO_LIBS): New variables.
(FONT_OBJ): Add comment about ftcrfont.
(ALL_CFLAGS): Add CAIRO_CFLAGS.
(LIBES): Add CAIRO_LIBS.
* src/dispextern.h (struct image): Add cr_data for cairo.
(x_cr_init_fringe): Declare.
* src/font.c (syms_of_font): Call syms_of_ftcrfont for cairo.
* src/font.h (ftcrfont_driver, syms_of_ftcrfont): Declare
* src/fringe.c (x_cr_init_fringe): New function name that shares code
with w32_init_fringe.
* src/ftcrfont.c: New font driver for cairo, based on the ftfont driver.
* src/ftfont.c (ftfont_info_size); New global variable.
(ftfont_open2): New extern function almost the same as old ftfont_open,
but takes the font_object as argument.
(ftfont_open): Build font object and call ftfont_open2.
* src/ftfont.h (ftfont_open2, ftfont_info_size): Declare.
* src/gtkutil.c (xg_clear_under_internal_border)
(xg_update_scrollbar_pos, xg_update_horizontal_scrollbar_pos): Only
queue_draw if not cairo. Change args to x_clear_area.
(xg_get_font): Use Qftcr when using cairo, Qxft otherwise.
(xg_page_setup_dialog, xg_get_page_setup, draw_page)
(xg_print_frames_dialog): New functions for printing.
* src/gtkutil.h (xg_page_setup_dialog, xg_get_page_setup)
(xg_print_frames_dialog): Declare.
* src/image.c: Add defined (USE_CAIRO) for PNG.
Add !defined USE_CAIRO for W32 PNG code.
(x_clear_image): If cairo, destroy the surface in cr_data.
(png_load): Add new cairo compatible implementation.
(lookup_image_type): Add defined (USE_CAIRO) for define png_type.
* src/xfns.c: New section Printing.
(x-export-frames, x-page-setup-dialog, x-get-page-setup)
(x-print-frames-dialog): New printing functions.
(Fx_create_frame, x_create_tip_frame): Register ftcrfont if
cairo.
(syms_of_xfns): Defsym Qorientation, Qtop_margin, Qbottom_margin,
Qportrait, Qlandscape, Qreverse_portrait, Qreverse_landscape).
(syms_of_xfns): Provide cairo and defvar cairo-version-string.
defsubr Sx_page_setup_dialog, Sx_get_page_setup, Sx_print_frames_dialog.
* src/xterm.c (x_clear_area1, x_prepare_for_xlibdraw)
(x_set_clip_rectangles, x_reset_clip_rectangles, x_fill_rectangle)
(x_draw_rectangle, x_fill_trapezoid_for_relief, x_clear_window)
(x_gc_get_ext_data, x_extension_initialize, x_cr_accumulate_data):
Declare.
(FRAME_CR_CONTEXT, FRAME_CR_SURFACE): New macros.
(max_fringe_bmp, fringe_bmp): New variables.
(x_gc_get_ext_data, x_extension_initialize)
(x_cr_destroy_surface, x_begin_cr_clip, x_end_cr_clip)
(x_set_cr_source_with_gc_foreground)
(x_set_cr_source_with_gc_background, x_cr_define_fringe_bitmap)
(x_cr_destroy_fringe_bitmap, x_cr_draw_image, x_cr_draw_frame)
(x_cr_accumulate_data, x_cr_destroy, x_cr_export_frames)
(x_prepare_for_xlibdraw, x_set_clip_rectangles)
(x_reset_clip_rectangles, x_fill_rectangle, x_draw_rectangle)
(x_clear_window, x_fill_trapezoid_for_relief): New functions.
(x_update_begin): Create cairo surface if needed.
(x_draw_vertical_window_border): Call x_fill_rectangle for cairo.
(x_update_end): Paint cairo drawing surface to xlib surface.
(x_clear_under_internal_border, x_after_update_window_line): Adjust
arguments to x_clear_area.
(x_draw_fringe_bitmap): Call x_fill_rectangle. Get GC values and
call x_cr_draw_image for cairo. Call x_reset_clip_rectangles instead
of XSetClipMask.
(x_set_glyph_string_clipping)
(x_set_glyph_string_clipping_exactly): Use x_set_clip_rectangles
instead of XSetClipRectangles.
(x_clear_glyph_string_rect, x_draw_glyph_string_background): Use
x_fill_rectangle instead of XFillRectangle.
(x_draw_glyph_string_foreground)
(x_draw_composite_glyph_string_foreground)
(x_draw_glyphless_glyph_string_foreground): Use x_draw_rectangle instead
of XDrawRectangle.
(x_draw_relief_rect): Add code for USE_CAIRO.
Call x_reset_clip_rectangles instead of XSetClipMask.
(x_draw_box_rect): x_set_clip_rectangles instead of XSetClipRectangles,
x_fill_rectangle instead of XFillRectangle, x_reset_clip_rectangles
instead of XSetClipMask.
(x_draw_image_foreground, x_draw_image_foreground_1):
x_draw_rectangle instead of XDrawRectangle.
(x_draw_glyph_string_bg_rect): x_fill_rectangle instead of
XFillRectangle.
(x_draw_image_glyph_string): If img has cr_data, use it as
a cairo surface.
(x_draw_stretch_glyph_string): x_set_clip_rectangles instead of
XSetClipRectangles, x_fill_rectangle instead of XFillRectangle.
(x_draw_glyph_string): x_fill_rectangle instead of XFillRectangle.,
x_reset_clip_rectangles instead of XSetClipMask.
(x_shift_glyphs_for_insert): Call x_prepare_for_xlibdraw.
(x_clear_area1): New function that calls XClearArea.
(x_clear_area): Takes frame as parameter, calls x_clear_area1 for
non-cairo.
(x_clear_frame): x_clear_window instead of XClearWindow.
(x_scroll_run): Set frame garbaged if cairo.
(XTmouse_position): Initialize *part to 0.
(x_scroll_bar_create): Adjust arguments to x_clear_area.
(x_scroll_bar_set_handle): x_clear_area1 instead of x_clear_area,
x_fill_rectangle instead of XFillRectangle.
(XTset_vertical_scroll_bar, XTset_horizontal_scroll_bar): Adjust
arguments to x_clear_area.
(x_scroll_bar_expose): x_draw_rectangle instead of XDrawRectangle.
(handle_one_xevent): Adjust arguments to x_clear_area.
Destroy cairo surface for frame if ConfigureNotify.
(x_clip_to_row): x_set_clip_rectangles instead of XSetClipRectangles.
(x_draw_hollow_cursor): x_draw_rectangle instead of XDrawRectangle,
x_reset_clip_rectangles instead of XSetClipMask.
(x_draw_bar_cursor): x_fill_rectangle instead of XFillRectangle,
x_reset_clip_rectangles instead of XSetClipMask.
(x_clear_frame_area): Adjust arguments to x_clear_area.
(x_free_frame_resources): Call x_prepare_for_xlibdraw.
(x_term_init): Call x_extension_initialize if cairo.
(x_redisplay_interface): Add x_cr_define_fringe_bitmap,
x_cr_destroy_fringe_bitmap for cairo.
(x_initialize): Call x_cr_init_fringe for cairo.
* src/xterm.h: Add include of cairo header files.
(x_bitmap_record): Add img if cairo.
(x_gc_ext_data): New struct for cairo.
(x_display_info): Add ext_codes for cairo.
(x_output): Add cr_context and cr_surface for cairo.
(x_clear_area): Change arguments from Display*/Window to frame pointer.
(x_query_color, x_begin_cr_clip, x_end_cr_clip)
(x_set_cr_source_with_gc_foreground, x_set_cr_source_with_gc_background)
(x_cr_draw_frame, x_cr_export_frames): Declare.
2015-02-11 15:14:35 +00:00
|
|
|
|
elif test "$HAVE_XFT" = "yes"; then
|
2020-01-15 18:57:27 +00:00
|
|
|
|
FONT_OBJ="$FONT_OBJ ftfont.o xftfont.o"
|
2010-05-15 21:31:19 +00:00
|
|
|
|
elif test "$HAVE_FREETYPE" = "yes"; then
|
2020-01-15 18:57:27 +00:00
|
|
|
|
FONT_OBJ="$FONT_OBJ ftfont.o"
|
2010-05-15 21:31:19 +00:00
|
|
|
|
fi
|
1994-08-26 14:57:46 +00:00
|
|
|
|
fi
|
Introduce Pure GTK3 port
* src/xsettings.h:
* src/xsettings.c:
(dpyinfo_valid, store_tool_bar_style_changed)
(XSETTINGS_FONT_NAME, get_prop_window, read_settings)
(apply_xft_settings, read_and_apply_settings)
(xft_settings_event, init_xsettings, xsettings_initialize):
* src/xfaces.c:
(x_create_gc, x_free_gc):
* src/xdisp.c (redisplay_tool_bar, redisplay_internal)
(draw_glyphs_debug, draw_glyphs, mouse_face_from_buffer_pos)
(note_mouse_highlight):
* src/terminal.c (Fterminal_live_p):
* src/termhooks.h (enum output_method, GCALIGNED_STRUCT)
(TERMINAL_FONT_CACHE):
* src/process.c (wait_reading_process_output):
* src/pgtkterm.h:
* src/pgtkterm.c:
* src/pgtkselect.h:
* src/pgtkselect.c:
* src/pgtkgui.h:
* src/pgtkfns.c:
* src/image.c:
(XGetPixel, XPutPixel, image_create_bitmap_from_data)
(image_create_bitmap_from_file, free_bitmap_record)
(image_destroy_x_image, gui_put_x_image, image_get_x_image)
(Create_Pixmap_From_Bitmap_Data, xbm_load_image, )
(xpm_load_image, lookup_rgb_color, image_disable_image)
(image_build_heuristic_mask, imagemagick_load_image):
* src/gtkutil.h:
* src/gtkutil.c (PGTK_TRACE, xg_set_screen, xg_display_open)
(xg_display_close, xg_create_default_cursor)
(xg_get_pixbuf_from_pix_and_mask, xg_check_special_colors)
(qttip_cb, hierarchy_ch_cb, xg_prepare_tooltip, )
(xg_show_tooltip, xg_hide_tooltip, xg_frame_resized)
(xg_frame_set_char_size, xg_height_or_width_changed)
(xg_set_widget_bg, style_changed_cb, xg_create_frame_widgets)
(xg_free_frame_widgets, x_wm_set_size_hint, xg_frame_restack)
(xg_mark_data, xg_update_frame_menubar, free_frame_menubar)
(xg_update_submenu, xg_finish_scroll_bar_creation)
(xg_update_scrollbar_pos, xg_update_horizontal_scrollbar_pos)
(xg_set_toolkit_scroll_bar_thumb, xg_event_is_for_scrollbar)
(draw_page, xg_pack_tool_bar, xg_create_tool_bar)
(xg_update_tool_bar_sizes, update_frame_tool_bar)
(free_frame_tool_bar, xg_change_toolbar_position):
* src/ftcrfont.c:
(ftcrfont_draw):
* src/fringe.c:
(init_fringe_bitmap):
* src/frame.h (GCALIGNED_STRUCT, FRAME_WINDOW_P):
* src/frame.c (Fframep):
* src/font.h:
* src/font.c (syms_of_font):
* src/emacsgtkfixed.c:
(emacs_fixed_get_preferred_width)
(emacs_fixed_get_preferred_height, XSetWMSizeHints):
* src/emacs.c (main):
* src/dispnew.c (init_display_interactive):
* src/dispextern.h:
* src/alloc.c:
(garbage_collect):
* src/Makefile.in (PGTK_OBJ, PGTK_LIBS, base_obj, LIBES):
* src/.gdbinit:
* lisp/url/url-privacy.el (url-setup-privacy-info):
* lisp/term/pgtk-win.el (featurep):
* lisp/startup.el (command-line, fancy-splash-frame):
* lisp/net/eww.el (eww-form-submit, eww-form-file)
(eww-form-checkbox, eww-form-select):
* lisp/mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event):
* lisp/loadup.el (featurep):
* lisp/international/mule-cmds.el (set-coding-system-map):
* lisp/frame.el (pgtk-frame-geometry, frame-geometry)
(w32-frame-edges, frame-edges)
(pgtk-mouse-absolute-pixel-position)
(mouse-absolute-pixel-position)
(pgtk-set-mouse-absolute-pixel-position)
(pgtk-frame-list-z-order, frame-list-z-order)
(pgtk-frame-restack, frame-restack, display-mouse-p)
(display-graphic-p, display-symbol-keys-p, )
(display-pixel-height, display-mm-height, display-mm-width)
(display-backing-store, display-save-under, display-color-cells)
(display-planes, display-visual-class)
(pgtk-display-monitor-attributes-list)
(display-monitor-attributes-list):
* lisp/faces.el (face-spec-set-match-display, tool-bar):
* lisp/cus-edit.el (custom-button, custom-button-mouse)
(custom-button-pressed, custom-display):
* configure.ac (AUTO_DEPEND, XARGS_LIMIT, XWIDGETS_OBJ):
2017-10-28 07:16:29 +00:00
|
|
|
|
if test "${window_system}" = "pgtk"; then
|
|
|
|
|
FONT_OBJ="ftfont.o ftcrfont.o"
|
|
|
|
|
fi
|
2019-06-01 09:53:41 +00:00
|
|
|
|
if test "${HAVE_HARFBUZZ}" = "yes" ; then
|
|
|
|
|
FONT_OBJ="$FONT_OBJ hbfont.o"
|
|
|
|
|
fi
|
|
|
|
|
AC_SUBST(FONT_OBJ)
|
2010-04-21 06:35:35 +00:00
|
|
|
|
AC_SUBST(XMENU_OBJ)
|
|
|
|
|
AC_SUBST(XOBJ)
|
2010-05-15 21:31:19 +00:00
|
|
|
|
AC_SUBST(FONT_OBJ)
|
2010-04-21 06:35:35 +00:00
|
|
|
|
|
2010-04-27 02:36:20 +00:00
|
|
|
|
WIDGET_OBJ=
|
2010-04-27 07:02:12 +00:00
|
|
|
|
MOTIF_LIBW=
|
1994-08-26 14:57:46 +00:00
|
|
|
|
if test "${USE_X_TOOLKIT}" != "none" ; then
|
2010-04-27 02:36:20 +00:00
|
|
|
|
WIDGET_OBJ=widget.o
|
2002-04-14 01:40:58 +00:00
|
|
|
|
AC_DEFINE(USE_X_TOOLKIT, 1, [Define to 1 if using an X toolkit.])
|
2008-06-01 17:39:27 +00:00
|
|
|
|
if test "${USE_X_TOOLKIT}" = "LUCID"; then
|
2008-04-18 15:48:06 +00:00
|
|
|
|
AC_DEFINE(USE_LUCID, 1, [Define to 1 if using the Lucid X toolkit.])
|
2008-06-01 17:39:27 +00:00
|
|
|
|
elif test "${USE_X_TOOLKIT}" = "MOTIF"; then
|
2008-04-18 15:48:06 +00:00
|
|
|
|
AC_DEFINE(USE_MOTIF, 1, [Define to 1 if using the Motif X toolkit.])
|
2010-04-27 07:02:12 +00:00
|
|
|
|
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"
|
2008-04-18 15:48:06 +00:00
|
|
|
|
fi
|
1994-08-26 14:57:46 +00:00
|
|
|
|
fi
|
2010-04-27 02:36:20 +00:00
|
|
|
|
AC_SUBST(WIDGET_OBJ)
|
2010-04-27 07:33:35 +00:00
|
|
|
|
|
2010-04-30 01:50:17 +00:00
|
|
|
|
TOOLKIT_LIBW=
|
2010-04-27 07:33:35 +00:00
|
|
|
|
case "$USE_X_TOOLKIT" in
|
|
|
|
|
MOTIF) TOOLKIT_LIBW="$MOTIF_LIBW" ;;
|
|
|
|
|
LUCID) TOOLKIT_LIBW="$LUCID_LIBW" ;;
|
2015-02-01 19:39:36 +00:00
|
|
|
|
none) test "x$HAVE_GTK" = "xyes" && TOOLKIT_LIBW="$GTK_LIBS" ;;
|
2010-04-27 07:33:35 +00:00
|
|
|
|
esac
|
Support for the new Xwidget feature.
* configure.ac:
(HAVE_XWIDGETS, WIDGET_OBJ, EMACS_CONFIG_FEATURES):
* xterm.c (x_draw_glyph_string, x_draw_bar_cursor):
* xdisp.c:
(handle_display_spec, handle_single_display_spec, push_it)
(pop_it, set_iterator_to_next, dump_glyph)
(calc_pixel_width_or_height, fill_xwidget_glyph_string)
(BUILD_XWIDGET_GLYPH_STRING, BUILD_GLYPH_STRINGS)
(produce_xwidget_glyph, x_produce_glyphs)
(get_window_cursor_type):
* window.c (Fdelete_window_internal):
* termhooks.h (e):
* print.c (print_object):
* lisp.h (ptrdiff_t):
* keyboard.c (kbd_buffer_get_event, make_lispy_event)
(syms_of_keyboard):
* emacs.c (main):
* dispnew.c (update_window, scrolling_window):
* dispextern.h (g, i):
* Makefile.in (XWIDGETS_OBJ, WEBKIT_CFLAGS, WEBKIT_LIBS)
(GIR_LIBS, ALL_CFLAGS, base_obj, LIBES):
* keyboard.c (kbd_buffer_get_event):
* emacsgtkfixed.c (emacs_fixed_gtk_widget_size_allocate)
(emacs_fixed_class_init): Add case for an xwidget view.
* xwidget.c, xwidget.h, xwidget.el: New files for xwidgets
Co-authored-by: Grégoire Jadi <daimrod@gmail.com>
Various improvements to the Xwidget feature.
* xwidgets.c:
* emacsgtkfixed.c:
* xwidget.el:
2016-01-19 19:27:12 +00:00
|
|
|
|
if test "$HAVE_XWIDGETS" = "yes"; then
|
|
|
|
|
TOOLKIT_LIBW="$TOOLKIT_LIBW -lXcomposite"
|
|
|
|
|
fi
|
2010-04-27 07:33:35 +00:00
|
|
|
|
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-05-03 02:10:43 +00:00
|
|
|
|
fi
|
|
|
|
|
AC_SUBST(LIBXT_OTHER)
|
|
|
|
|
|
1994-08-26 14:57:46 +00:00
|
|
|
|
if test "${HAVE_X11}" = "yes" ; then
|
2002-04-14 01:40:58 +00:00
|
|
|
|
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-05-03 02:10:43 +00:00
|
|
|
|
LIBX_OTHER="\$(LIBXT) \$(LIBX_EXTRA)"
|
2010-04-30 01:50:17 +00:00
|
|
|
|
else
|
2010-05-03 02:10:43 +00:00
|
|
|
|
LIBX_OTHER=
|
1994-08-26 14:57:46 +00:00
|
|
|
|
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-04-30 01:50:17 +00:00
|
|
|
|
|
2017-05-16 00:56:46 +00:00
|
|
|
|
HAVE_OLDXMENU=no
|
2013-11-29 01:22:40 +00:00
|
|
|
|
if test "$HAVE_GTK" = yes || test "$HAVE_X11" != yes; then
|
2010-04-30 01:50:17 +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
|
2017-05-16 00:56:46 +00:00
|
|
|
|
HAVE_OLDXMENU=yes
|
2013-11-21 17:26:55 +00:00
|
|
|
|
LIBXMENU='$(oldXMenudir)/libXMenu11.a'
|
2017-03-21 16:59:10 +00:00
|
|
|
|
AUTODEPEND_PARENTS="$AUTODEPEND_PARENTS oldXMenu"
|
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'
|
2017-03-21 16:59:10 +00:00
|
|
|
|
AUTODEPEND_PARENTS="$AUTODEPEND_PARENTS lwlib"
|
2010-04-30 01:50:17 +00:00
|
|
|
|
fi
|
|
|
|
|
AC_SUBST(LIBXMENU)
|
2010-05-18 02:44:07 +00:00
|
|
|
|
|
2018-10-19 16:06:52 +00:00
|
|
|
|
AC_CACHE_CHECK([for struct alignment],
|
|
|
|
|
[emacs_cv_struct_alignment],
|
|
|
|
|
[AC_COMPILE_IFELSE(
|
|
|
|
|
[AC_LANG_PROGRAM([[#include <stddef.h>
|
|
|
|
|
struct s { char c; } __attribute__ ((aligned (8)));
|
|
|
|
|
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
|
|
|
|
|
|
2019-08-15 09:18:06 +00:00
|
|
|
|
AC_C_TYPEOF
|
|
|
|
|
|
|
|
|
|
AC_CACHE_CHECK([for statement expressions],
|
|
|
|
|
[emacs_cv_statement_expressions],
|
|
|
|
|
[AC_COMPILE_IFELSE(
|
|
|
|
|
[AC_LANG_PROGRAM([], [[return ({ int x = 5; x-x; });]])],
|
|
|
|
|
[emacs_cv_statement_expressions=yes],
|
|
|
|
|
[emacs_cv_statement_expressions=no])])
|
|
|
|
|
if test "$emacs_cv_statement_expressions" = yes; then
|
|
|
|
|
AC_DEFINE([HAVE_STATEMENT_EXPRESSIONS], 1,
|
|
|
|
|
[Define to 1 if statement expressions work.])
|
|
|
|
|
fi
|
|
|
|
|
|
1994-08-26 14:57:46 +00:00
|
|
|
|
if test "${GNU_MALLOC}" = "yes" ; then
|
2002-04-14 01:40:58 +00:00
|
|
|
|
AC_DEFINE(GNU_MALLOC, 1,
|
|
|
|
|
[Define to 1 if you want to use the GNU memory allocator.])
|
1994-08-26 14:57:46 +00:00
|
|
|
|
fi
|
2010-05-18 02:44:07 +00:00
|
|
|
|
|
|
|
|
|
RALLOC_OBJ=
|
1994-08-26 14:57:46 +00:00
|
|
|
|
if test "${REL_ALLOC}" = "yes" ; then
|
2002-04-14 01:40:58 +00:00
|
|
|
|
AC_DEFINE(REL_ALLOC, 1,
|
|
|
|
|
[Define REL_ALLOC if you want to use the relocating allocator for
|
|
|
|
|
buffer space.])
|
1994-08-26 14:57:46 +00:00
|
|
|
|
|
2010-05-18 02:44:07 +00:00
|
|
|
|
test "$system_malloc" != "yes" && RALLOC_OBJ=ralloc.o
|
|
|
|
|
fi
|
|
|
|
|
AC_SUBST(RALLOC_OBJ)
|
2007-06-14 06:56:28 +00:00
|
|
|
|
|
2010-04-30 01:36:42 +00:00
|
|
|
|
if test "$opsys" = "cygwin"; then
|
2016-01-30 22:20:56 +00:00
|
|
|
|
CYGWIN_OBJ="cygw32.o"
|
2010-04-30 01:36:42 +00:00
|
|
|
|
## Cygwin differs because of its unexec().
|
2010-05-01 03:04:51 +00:00
|
|
|
|
PRE_ALLOC_OBJ=
|
2010-05-18 02:49:28 +00:00
|
|
|
|
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-04-30 01:36:42 +00:00
|
|
|
|
else
|
2010-04-30 01:50:17 +00:00
|
|
|
|
CYGWIN_OBJ=
|
2010-05-01 03:04:51 +00:00
|
|
|
|
PRE_ALLOC_OBJ=lastfile.o
|
2010-05-18 02:49:28 +00:00
|
|
|
|
POST_ALLOC_OBJ=
|
2010-04-30 01:36:42 +00:00
|
|
|
|
fi
|
2010-04-28 07:20:39 +00:00
|
|
|
|
AC_SUBST(CYGWIN_OBJ)
|
2010-05-01 03:04:51 +00:00
|
|
|
|
AC_SUBST(PRE_ALLOC_OBJ)
|
|
|
|
|
AC_SUBST(POST_ALLOC_OBJ)
|
2007-06-14 06:56:28 +00:00
|
|
|
|
|
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"
|
2011-07-08 20:20:19 +00:00
|
|
|
|
gl_ASSERT_NO_GNULIB_POSIXCHECK
|
|
|
|
|
gl_ASSERT_NO_GNULIB_TESTS
|
|
|
|
|
gl_INIT
|
2012-07-17 02:09:58 +00:00
|
|
|
|
CFLAGS=$SAVE_CFLAGS
|
|
|
|
|
LIBS=$SAVE_LIBS
|
2010-05-04 03:06:27 +00:00
|
|
|
|
|
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
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
|
CC=`AS_ECHO(["$CC"]) | sed -e "s,$GCC_TEST_OPTIONS,,"`
|
2012-11-24 16:02:07 +00:00
|
|
|
|
fi
|
|
|
|
|
|
2010-05-04 03:06:27 +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-05-04 03:06:27 +00:00
|
|
|
|
darwin)
|
2019-02-01 20:05:28 +00:00
|
|
|
|
if test "$HAVE_NS" = "yes"; then
|
|
|
|
|
libs_nsgui="-framework AppKit"
|
|
|
|
|
if test "$NS_IMPL_COCOA" = "yes"; then
|
|
|
|
|
libs_nsgui="$libs_nsgui -framework IOKit -framework Carbon"
|
|
|
|
|
fi
|
|
|
|
|
else
|
|
|
|
|
libs_nsgui=
|
|
|
|
|
fi
|
|
|
|
|
LD_SWITCH_SYSTEM_TEMACS=$libs_nsgui
|
2010-05-25 03:53:12 +00:00
|
|
|
|
## 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
|
2019-02-01 20:05:28 +00:00
|
|
|
|
if test "$with_unexec" = yes; then
|
|
|
|
|
LD_SWITCH_SYSTEM_TEMACS="-fno-pie $LD_SWITCH_SYSTEM_TEMACS -Xlinker -headerpad -Xlinker $headerpad_extra"
|
2010-05-25 03:53:12 +00:00
|
|
|
|
fi
|
2011-01-22 00:12:10 +00:00
|
|
|
|
|
2010-05-25 03:53:12 +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-05-25 03:53:12 +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-05-25 03:53:12 +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-05-04 03:06:27 +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
|
|
|
|
;;
|
|
|
|
|
|
2010-05-04 03:06:27 +00:00
|
|
|
|
*) LD_SWITCH_SYSTEM_TEMACS= ;;
|
|
|
|
|
esac
|
2010-05-26 03:42:07 +00:00
|
|
|
|
|
2016-10-16 23:25:47 +00:00
|
|
|
|
# -no-pie or -nopie fixes a temacs segfault on Gentoo, OpenBSD,
|
|
|
|
|
# Ubuntu, and other systems with "hardened" GCC configurations for
|
|
|
|
|
# some reason (Bug#18784). We don't know why this works, but not
|
|
|
|
|
# segfaulting is better than segfaulting. Use ac_c_werror_flag=yes
|
|
|
|
|
# when trying the option, otherwise clang keeps warning that it does
|
|
|
|
|
# not understand it, and pre-4.6 GCC has a similar problem
|
|
|
|
|
# (Bug#20338). Prefer -no-pie to -nopie, as -no-pie is the
|
|
|
|
|
# spelling used by GCC 6.1.0 and later (Bug#24682).
|
|
|
|
|
AC_CACHE_CHECK(
|
|
|
|
|
[for $CC option to disable position independent executables],
|
|
|
|
|
[emacs_cv_prog_cc_no_pie],
|
2019-02-01 21:03:18 +00:00
|
|
|
|
[if test $with_unexec = no; then
|
2018-06-15 22:51:39 +00:00
|
|
|
|
emacs_cv_prog_cc_no_pie='not needed'
|
|
|
|
|
else
|
|
|
|
|
emacs_save_c_werror_flag=$ac_c_werror_flag
|
|
|
|
|
emacs_save_LDFLAGS=$LDFLAGS
|
|
|
|
|
ac_c_werror_flag=yes
|
|
|
|
|
for emacs_cv_prog_cc_no_pie in -no-pie -nopie no; do
|
|
|
|
|
test $emacs_cv_prog_cc_no_pie = no && break
|
|
|
|
|
LDFLAGS="$emacs_save_LDFLAGS $emacs_cv_prog_cc_no_pie"
|
|
|
|
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [break])
|
|
|
|
|
done
|
|
|
|
|
ac_c_werror_flag=$emacs_save_c_werror_flag
|
|
|
|
|
LDFLAGS=$emacs_save_LDFLAGS
|
|
|
|
|
fi])
|
|
|
|
|
case $emacs_cv_prog_cc_no_pie in
|
|
|
|
|
-*)
|
|
|
|
|
LD_SWITCH_SYSTEM_TEMACS="$LD_SWITCH_SYSTEM_TEMACS $emacs_cv_prog_cc_no_pie"
|
|
|
|
|
;;
|
|
|
|
|
esac
|
2015-03-16 16:09:54 +00:00
|
|
|
|
|
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
|
|
|
|
|
|
2018-10-18 00:55:43 +00:00
|
|
|
|
LD_SWITCH_SYSTEM_TEMACS="$LDFLAGS_NOCOMBRELOC $LD_SWITCH_SYSTEM_TEMACS"
|
|
|
|
|
|
2010-05-04 03:06:27 +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-05-14 03:05:00 +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-05-14 03:05:00 +00:00
|
|
|
|
fi
|
|
|
|
|
|
2012-09-01 06:38:52 +00:00
|
|
|
|
AC_SUBST(WINDOW_SYSTEM_OBJ)
|
2010-05-14 03:05:00 +00:00
|
|
|
|
|
2002-10-30 18:52:27 +00:00
|
|
|
|
AH_TOP([/* GNU Emacs site configuration template file.
|
2011-01-25 04:08:28 +00:00
|
|
|
|
|
2020-01-01 01:01:53 +00:00
|
|
|
|
Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2020
|
2011-01-25 04:08:28 +00:00
|
|
|
|
Free Software Foundation, Inc.
|
2002-04-14 01:40:58 +00:00
|
|
|
|
|
|
|
|
|
This file is part of GNU Emacs.
|
|
|
|
|
|
2008-05-07 07:37:21 +00:00
|
|
|
|
GNU Emacs is free software: you can redistribute it and/or modify
|
2002-04-14 01:40:58 +00:00
|
|
|
|
it under the terms of the GNU General Public License as published by
|
2016-03-10 15:34:52 +00:00
|
|
|
|
the Free Software Foundation, either version 3 of the License, or (at
|
|
|
|
|
your option) any later version.
|
2002-04-14 01:40:58 +00:00
|
|
|
|
|
|
|
|
|
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
|
2017-09-13 22:52:52 +00:00
|
|
|
|
along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
|
2002-04-14 01:40:58 +00:00
|
|
|
|
|
|
|
|
|
|
2002-11-18 16:24:41 +00:00
|
|
|
|
/* No code in Emacs #includes config.h twice, but some bits of code
|
2003-02-04 14:56:31 +00:00
|
|
|
|
intended to work with other packages as well (like gmalloc.c)
|
2002-04-14 01:40:58 +00:00
|
|
|
|
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-10-03 15:39:21 +00:00
|
|
|
|
|
2002-11-18 16:24:41 +00:00
|
|
|
|
#endif /* EMACS_CONFIG_H */
|
|
|
|
|
|
2003-02-04 14:56:31 +00:00
|
|
|
|
/*
|
2002-11-18 16:24:41 +00:00
|
|
|
|
Local Variables:
|
2002-10-30 18:52:27 +00:00
|
|
|
|
mode: c
|
|
|
|
|
End:
|
|
|
|
|
*/
|
2002-04-14 01:40:58 +00:00
|
|
|
|
])dnl
|
2001-11-06 15:42:06 +00:00
|
|
|
|
|
1994-08-26 14:57:46 +00:00
|
|
|
|
#### Report on what we decided to do.
|
2003-01-19 21:50:03 +00:00
|
|
|
|
#### 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"
|
2003-01-19 21:50:03 +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
|
|
|
|
|
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
|
emacs_standard_dirs='Standard dirs'
|
|
|
|
|
AS_ECHO(["
|
2015-04-19 21:40:51 +00:00
|
|
|
|
Configured for '${canonical}'.
|
1994-08-26 14:57:46 +00:00
|
|
|
|
|
|
|
|
|
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}
|
2000-09-06 21:23:55 +00:00
|
|
|
|
Should Emacs use a relocating allocator for buffers? ${REL_ALLOC}
|
2000-09-14 15:11:53 +00:00
|
|
|
|
Should Emacs use mmap(2) for buffer allocation? $use_mmap_for_buffers
|
1994-08-26 14:57:46 +00:00
|
|
|
|
What window system should Emacs use? ${window_system}
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
|
What toolkit should Emacs use? ${USE_X_TOOLKIT}
|
|
|
|
|
Where do we find X Windows header files? ${x_includes:-$emacs_standard_dirs}
|
|
|
|
|
Where do we find X Windows libraries? ${x_libraries:-$emacs_standard_dirs}"])
|
1994-08-26 14:57:46 +00:00
|
|
|
|
|
2014-03-28 22:03:42 +00:00
|
|
|
|
optsep=
|
|
|
|
|
emacs_config_features=
|
2015-06-03 00:22:35 +00:00
|
|
|
|
for opt in XAW3D XPM JPEG TIFF GIF PNG RSVG CAIRO IMAGEMAGICK SOUND GPM DBUS \
|
2018-06-05 10:12:26 +00:00
|
|
|
|
GCONF GSETTINGS GLIB NOTIFY ACL LIBSELINUX GNUTLS LIBXML2 FREETYPE HARFBUZZ M17N_FLT \
|
2018-08-28 01:46:14 +00:00
|
|
|
|
LIBOTF XFT ZLIB TOOLKIT_SCROLL_BARS X_TOOLKIT OLDXMENU X11 XDBE XIM \
|
2019-02-01 21:44:47 +00:00
|
|
|
|
NS MODULES THREADS XWIDGETS LIBSYSTEMD JSON PDUMPER UNEXEC LCMS2 GMP; do
|
2014-03-28 22:03:42 +00:00
|
|
|
|
|
|
|
|
|
case $opt in
|
2019-02-01 21:44:47 +00:00
|
|
|
|
PDUMPER) val=${with_pdumper} ;;
|
|
|
|
|
UNEXEC) val=${with_unexec} ;;
|
2018-08-28 01:46:14 +00:00
|
|
|
|
GLIB) val=${emacs_cv_links_glib} ;;
|
2014-03-28 22:03:42 +00:00
|
|
|
|
NOTIFY|ACL) eval val=\${${opt}_SUMMARY} ;;
|
2016-01-25 23:29:53 +00:00
|
|
|
|
TOOLKIT_SCROLL_BARS|X_TOOLKIT) eval val=\${USE_$opt} ;;
|
2018-01-18 23:09:15 +00:00
|
|
|
|
THREADS) val=${threads_enabled} ;;
|
2014-03-28 22:03:42 +00:00
|
|
|
|
*) eval val=\${HAVE_$opt} ;;
|
|
|
|
|
esac
|
2015-06-03 01:25:11 +00:00
|
|
|
|
case x$val in
|
|
|
|
|
xno|xnone|x) continue ;;
|
|
|
|
|
esac
|
|
|
|
|
case $opt in
|
|
|
|
|
X_TOOLKIT)
|
|
|
|
|
case $val in
|
|
|
|
|
GTK*|LUCID|MOTIF) opt=$val ;;
|
|
|
|
|
*) continue ;;
|
|
|
|
|
esac
|
|
|
|
|
;;
|
2018-10-30 00:50:14 +00:00
|
|
|
|
NOTIFY)
|
|
|
|
|
case $val in
|
|
|
|
|
*lkqueue*) opt="$opt LIBKQUEUE" ;;
|
|
|
|
|
*kqueue*) opt="$opt KQUEUE" ;;
|
|
|
|
|
*inotify*) opt="$opt INOTIFY" ;;
|
|
|
|
|
*gfile*) opt="$opt GFILENOTIFY" ;;
|
|
|
|
|
*w32*) opt="$opt W32NOTIFY" ;;
|
|
|
|
|
esac
|
|
|
|
|
;;
|
2015-06-03 01:25:11 +00:00
|
|
|
|
esac
|
2014-03-28 22:03:42 +00:00
|
|
|
|
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.])
|
|
|
|
|
|
Use Gnulib libgmp module
Instead of doing GMP by hand, use the Gnulib libgmp module.
* .gitignore: Add lib/gmp.h.
* admin/merge-gnulib (GNULIB_MODULES): Add libgmp.
* configure.ac (GMP_LIB, GMP_OBJ): Remove. Gnulib uses the name
LIB_GMP, so all uses changed. All uses of GMP_OBJ removed.
(HAVE_GMP): Set this from Gnulib’s variables.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
* lib/mini-gmp-gnulib.c, lib/mini-gmp.c, lib/mini-gmp.h, m4/libgmp.m4:
New files, copied from Gnulib.
* src/bignum.h, test/data/emacs-module/mod-test.c:
Include gmp.h unconditionally.
* src/mini-gmp-emacs.c, src/mini-gmp.c, src/mini-gmp.h:
Remove. This moves these files from src to lib, and
updates them to the current GMP version.
* test/Makefile.in (GMP_H): New macro.
($(test_module)): Use it to decide whether to compile
mini-gmp-gnulib.c too.
2020-07-09 23:35:48 +00:00
|
|
|
|
if test -z "$GMP_H"; then
|
|
|
|
|
HAVE_GMP=yes
|
|
|
|
|
else
|
|
|
|
|
HAVE_GMP=no
|
|
|
|
|
fi
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
|
AS_ECHO([" Does Emacs use -lXaw3d? ${HAVE_XAW3D}
|
|
|
|
|
Does Emacs use -lXpm? ${HAVE_XPM}
|
|
|
|
|
Does Emacs use -ljpeg? ${HAVE_JPEG}
|
|
|
|
|
Does Emacs use -ltiff? ${HAVE_TIFF}
|
|
|
|
|
Does Emacs use a gif library? ${HAVE_GIF} $LIBGIF
|
|
|
|
|
Does Emacs use a png library? ${HAVE_PNG} $LIBPNG
|
|
|
|
|
Does Emacs use -lrsvg-2? ${HAVE_RSVG}
|
2016-01-25 23:29:53 +00:00
|
|
|
|
Does Emacs use cairo? ${HAVE_CAIRO}
|
2017-09-14 16:37:35 +00:00
|
|
|
|
Does Emacs use -llcms2? ${HAVE_LCMS2}
|
2018-08-28 01:57:44 +00:00
|
|
|
|
Does Emacs use imagemagick? ${HAVE_IMAGEMAGICK}
|
2020-04-14 15:10:41 +00:00
|
|
|
|
Does Emacs use native APIs for images? ${NATIVE_IMAGE_API}
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
|
Does Emacs support sound? ${HAVE_SOUND}
|
|
|
|
|
Does Emacs use -lgpm? ${HAVE_GPM}
|
|
|
|
|
Does Emacs use -ldbus? ${HAVE_DBUS}
|
|
|
|
|
Does Emacs use -lgconf? ${HAVE_GCONF}
|
|
|
|
|
Does Emacs use GSettings? ${HAVE_GSETTINGS}
|
|
|
|
|
Does Emacs use a file notification library? ${NOTIFY_SUMMARY}
|
|
|
|
|
Does Emacs use access control lists? ${ACL_SUMMARY}
|
|
|
|
|
Does Emacs use -lselinux? ${HAVE_LIBSELINUX}
|
|
|
|
|
Does Emacs use -lgnutls? ${HAVE_GNUTLS}
|
|
|
|
|
Does Emacs use -lxml2? ${HAVE_LIBXML2}
|
|
|
|
|
Does Emacs use -lfreetype? ${HAVE_FREETYPE}
|
2018-06-05 10:12:26 +00:00
|
|
|
|
Does Emacs use HarfBuzz? ${HAVE_HARFBUZZ}
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
|
Does Emacs use -lm17n-flt? ${HAVE_M17N_FLT}
|
|
|
|
|
Does Emacs use -lotf? ${HAVE_LIBOTF}
|
|
|
|
|
Does Emacs use -lxft? ${HAVE_XFT}
|
2016-04-21 16:16:41 +00:00
|
|
|
|
Does Emacs use -lsystemd? ${HAVE_LIBSYSTEMD}
|
Implement native JSON support using Jansson
* configure.ac: New option --with-json.
* src/json.c (Fjson_serialize, Fjson_insert, Fjson_parse_string)
(Fjson_parse_buffer): New defuns.
(json_malloc, json_free, json_has_prefix, json_has_suffix)
(json_make_string, json_build_string, json_encode)
(json_out_of_memory, json_parse_error)
(json_release_object, check_string_without_embedded_nulls, json_check)
(lisp_to_json, lisp_to_json_toplevel, lisp_to_json_toplevel_1)
(json_insert, json_insert_callback, json_to_lisp)
(json_read_buffer_callback, Fjson_parse_buffer, define_error): New
helper functions.
(init_json, syms_of_json): New file.
* src/lisp.h: Declaration for init_json and syms_of_json.
* src/emacs.c (main): Enable JSON functions.
* src/eval.c (internal_catch_all, internal_catch_all_1): New helper
functions to catch all signals.
(syms_of_eval): Add uninterned symbol to signify out of memory.
* src/Makefile.in (JSON_LIBS, JSON_CFLAGS, JSON_OBJ, EMACS_CFLAGS)
(base_obj, LIBES): Compile json.c if --with-json is enabled.
* test/src/json-tests.el (json-serialize/roundtrip)
(json-serialize/object, json-parse-string/object)
(json-parse-string/string, json-serialize/string)
(json-parse-string/incomplete, json-parse-string/trailing)
(json-parse-buffer/incomplete, json-parse-buffer/trailing): New unit
tests.
* doc/lispref/text.texi (Parsing JSON): New manual section.
2017-09-18 08:51:39 +00:00
|
|
|
|
Does Emacs use -ljansson? ${HAVE_JSON}
|
Use Gnulib libgmp module
Instead of doing GMP by hand, use the Gnulib libgmp module.
* .gitignore: Add lib/gmp.h.
* admin/merge-gnulib (GNULIB_MODULES): Add libgmp.
* configure.ac (GMP_LIB, GMP_OBJ): Remove. Gnulib uses the name
LIB_GMP, so all uses changed. All uses of GMP_OBJ removed.
(HAVE_GMP): Set this from Gnulib’s variables.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
* lib/mini-gmp-gnulib.c, lib/mini-gmp.c, lib/mini-gmp.h, m4/libgmp.m4:
New files, copied from Gnulib.
* src/bignum.h, test/data/emacs-module/mod-test.c:
Include gmp.h unconditionally.
* src/mini-gmp-emacs.c, src/mini-gmp.c, src/mini-gmp.h:
Remove. This moves these files from src to lib, and
updates them to the current GMP version.
* test/Makefile.in (GMP_H): New macro.
($(test_module)): Use it to decide whether to compile
mini-gmp-gnulib.c too.
2020-07-09 23:35:48 +00:00
|
|
|
|
Does Emacs use the GMP library? ${HAVE_GMP}
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
|
Does Emacs directly use zlib? ${HAVE_ZLIB}
|
2015-11-18 20:17:58 +00:00
|
|
|
|
Does Emacs have dynamic modules support? ${HAVE_MODULES}
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
|
Does Emacs use toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}
|
2020-08-12 10:12:34 +00:00
|
|
|
|
Does Emacs support Xwidgets? ${HAVE_XWIDGETS}
|
2016-12-04 17:59:17 +00:00
|
|
|
|
Does Emacs have threading support in lisp? ${threads_enabled}
|
Add portable dumper
Add a new portable dumper as an alternative to unexec. Use it by default.
* src/dmpstruct.awk: New file.
* src/doc.c (get_doc_string): use will_dump_p().
* src/editfns.c (styled_format): silence compiler warning
with UNINIT.
* src/emacs-module.c (syms_of_module): staticpro ltv_mark.
* src/emacs.c (gflags): new variable.
(init_cmdargs): unwrap
(string_starts_with_p, find_argument, dump_error_to_string)
(load_pdump): new functions.
(main): detect pdumper and --temacs invocation; actually load
portable dump when detected; set gflags as appropriate; changes to
init functions throughout to avoid passing explicit
'initialized' argument.
* src/eval.c (inhibit_lisp_code): remove unused variable.
(init_eval_once_for_pdumper): new function.
(init_eval_once): call it.
* src/filelock.c: CANNOT_DUMP -> will_dump_p()
* src/fingerprint-dummy.c: new file
* src/fingerprint.h: new file
* src/fns.c: CANNOT_DUMP -> will_dump_p(), etc.
(weak_hash_tables): remove
(hashfn_equal, hashfn_eql): un-staticify
(make_hash_table): set new 'next_weak' hash table field; drop
global weak_hash_tables logic.
(copy_hash_table): drop global weak_hash_tables logic.
(hash_table_rehash): new function.
(hash_lookup, hash_put, hash_remove_from_table, hash_clear):
rehash if needed.
(sweep_weak_table): un-staticify; explain logic; bool-ify.
(sweep_weak_hash_tables): remove function.
* src/font.c (syms_of_font): remember pdumper stuff.
* src/fontset.c (syms_of_fontset): remember pdumper stuff.
* src/frame.c (make_initial_frame): don't reset Vframe_list.
(init_frame_once_for_pdumper, init_frame_once): new functions.
(syms_of_frame): remove redundant staticpro.
* src/fringe.c (init_fringe_once_for_pdumper): new functin.
(init_fringe_once): call it.
* src/ftcrfont.c (syms_of_ftcrfont_for_pdumper): new function.
(syms_of_ftcrfont): call it.
* src/ftfont.c (syms_of_ftfont_for_pdumper): new function.
(syms_of_ftfont): call it.
* src/ftxont.c (syms_of_ftxfont_for_pdumper): new function.
(syms_of_ftxfont): call it.
* src/gmalloc.c: adjust for pdumper througout
(DUMPED): remove weird custom dumped indicator.
* src/gnutls.c (syms_of_gnutls): pdumper note for
gnutls_global_initialized.
* src/image.c (syms_of_image): add pdumper comment,
initializer note.
* src/insdel.c (prepare_to_modify_buffer_1): account
for buffer contents possibly being in dump image.
* src/keyboard.c (syms_of_keyboard_for_pdumper): new function.
(syms_of_keyboard): staticpro more; call pdumper syms function.
* src/lisp.h: add comments throughout
(gflags): declare.
(will_dump_p, will_bootstrap_p, will_dump_with_pdumper_p)
(dumped_with_pdumper_p, will_dump_with_unexec_p)
(dumped_with_unexec_p, definitely_will_not_unexec_p): new
functions.
(POWER_OF_2, ROUNDUP): move macros.
(PSEUDOVECTOR_TYPE, PSEUDOVECTOR_TYPEP): take vectorlike header
pointer instead of vector; constify.
(Lisp_Hash_Table): add comment about need to rehash on access; add
comment for next_weak.
(HASH_KEY, HASH_VALUE, HASH_HASH, HASH_TABLE_SIZE): const-ify.
(hash_table_rehash): declare.
(hash_rehash_needed_p, hash_rehash_if_needed): new functions.
(finalizers, doomed_finalizers): declare extern.
(SUBR_SECTION_ATTRIBUTE): new macro.
(staticvec, staticidx): un-static-ify.
(sweep_weak_hash_tables): remove declaration.
(sweep_weak_table): declare.
(hashfn_eql, hashfn_equal): declare.
(number_finalizers_run): new variable.
(Vdead): externify when ENABLE_CHECKING.
(gc_root_type): new enumeration.
(gc_root_visitor): new struct.
(visit_static_gc_roots): declare.
(vectorlike_nbytes): declare.
(vector_nbytes): define as trivial inline function wrapper for
vectorlike_nbytes.
(init_obarray_once): change signature.
(primary_thread): extern-ify.
(init_buffer): change signature.
(init_frame_once): declare.
* src/lread.c (readevalloop): adjust for new dumped predicates.
(init_obarray_once): new function.
(ndefsubr): new variable.
(defsubr): increment it.
(load_path_check): adjust for pdumper.
(load_path_default): use pdumper functions; adjust for
dump search.
* src/macfont.m (macfont_init_font_change_handler): avoid
shadowing global.
(syms_of_macfont_for_pdumper): new function.
(syms_of_macfont): call it.
* src/menu.c (syms_of_menu): staticpro more stuff.
* src/minibuf.c (Ftry_completion): rehash if needed.
(init_minibuf_once_for_pdumper): new function.
(init_minibuf_once): call it.
* src/nsfont.m (syms_of_nsfns): staticpro more.
* src/nsfont.m (syms_of_nsfont_for_pdumper): new function.
(syms_of_nsfont): call it.
* src/nsterm.m (syms_of_nsfont): remember pdumper stuff.
* src/pdumper.c: new file.
* src/pdumper.h: new file.
* src/process.c (init_process_emacs): use new pdumper functions
instead of CANNOT_DUMP.
* src/profiler.c (syms_of_profiler_for_pdumper): new function.
(syms_of_profiler_for_pdumper): call it.
* src/search.c (syms_of_search_for_pdumper): new function.
(syms_of_search_for_pdumper): call it.
* src/sheap.c (bss_sbrk_did_unexec): remove.
* src/sheap.h (bss_sbrk_did_unexec): remove.
* src/syntax.c (syms_of_syntax): don't redundantly staticpro
re_match_object.
* src/sysdep.c: use will_dump_with_unexec_p() instead of bss
hack thing.
* src/syssignals.h (init_sigsegv): declare.
* src/systime.h (init_timefns): remove bool from signature.
* src/textprop.c (syms_of_textprop): move staticpro.
* src/thread.c (main_thread_p): constify.
* src/thread.h (main_thread_p): constify.
* src/timefns.c (init_timefns): remove bool from signature.
(syms_of_timefns_for_pdumper): new function.
(syms_of_timefns): call it.
* src/w32.c: rearrange code.
* src/w32.h (w32_relocate): declare.
* src/w32fns.c (syms_of_w32fns): add pdumper note.
* src/w32font.c (syms_of_w32font_for_pdumper): new function.
(syms_of_w32font): call it.
* src/w32heap.c (using_dynamic_heap): new variable.
(init_heap): use it.
* src/w32menu.c (syms_of_w32menu): add pdumper note.
* src/w32proc.c
(ctrl_c_handler, mainCRTStartup, _start, open_input_file)
(rva_to_section, close_file_data): move here.
* src/w32uniscribe.c (syms_of_w32uniscribe_for_pdumper):
new function.
(syms_of_w32uniscribe): call it.
* src/window.c (init_window_once_for_pdumper): new function.
(init_window_once): call it; staticpro more stuff.
* src/xfont.c (syms_of_xfont_for_pdumper): new function.
(syms_of_xfont): call it.
* src/xftfont.c (syms_of_xftfont_for_pdumper): new function.
(syms_of_xftfont): call it.
* src/xmenu.c (syms_of_xmenu_for_pdumper): new function.
(syms_of_xmenu): call it.
* src/xselect.c (syms_of_xselect_for_pdumper): new function.
(syms_of_xselect): call it.
* src/xsettings.c (syms_of_xsettings): add more pdumper notes.
* src/term.c (syms_of_xterm): add pdumper note.
* src/dispnew.c (init_faces_initial): new function.
(init_display_interactive): rename from init_display; use
will_dump_p instead of !initialized. Initialize faces early for
pdumper if needed.
(init_display): new function.
(syms_of_display_for_pdumper): new function.
(syms_of_display): call it.
* src/dbusbind.c (syms_of_dbusbind): Add TODO for bus reset
on pdumper load.
* src/data.c (Fdefalias): Use will_dump_p
instead of Vpurify_flag.
(Fmake_variable_buffer_local): silence compiler warning with -Og
by making valcontents UNINIT.
(arith_driver): silence compiler warning with UNINIT.
* src/conf_post.h (ATTRIBUTE_SECTION): new macro.
* src/composite.c (composition_gstring_put_cache): rehash hash
table if needed.
* src/coding.c (init_coding_once, syms_of_coding): remember
pdumper stuff.
* src/charset.h (charset_table_size, charset_table_user): declare.
* src/charset.c (charset_table_used, charset_table_size): un-static.
(init_charset_oncem, syms_of_charset): remember pdumper stuff.
* src/category.c (category_table_version): remove obsolete
variable.
* src/callint.c (syms_of_callint): staticpro 'preserved_fns'
(init_callproc): use will_dump_p instead of !CANNOT_DUMP.
* src/bytecode.c (exec_byte_code): rehash table tables if needed
* src/buffer.c (alloc_buffer_text, free_buffer_text): account for
pdumper
(init_buffer_once): add TODO; remember stuff for pdumper.
(init_buffer): don't take initialized argument; adjust
for pdumper.
* src/atimer.c (init_atimer): initialize subr only if
!initialized.
* src/alloc.c: (vector_marked_p, set_vector_marked)
(vectorlike_marked_p, set_vectorlike_marked, cons_marked_p)
(set_cons_marked, string_marked_p, set_string_marked)
(symbol_marked_p, set_symbol_marked, interval_marked_p)
(set_interval_marked): new accessor routines. Use them
instead of raw GC access throughout.
(Vdead): make non-static when ENABLE_CHECKING.
(vectorlike_nbytes): rename of 'vector_nbytes'; take a vectorlike
header as input instead of a vector.
(number_finalizers_run): new internal C variable.
(mark_maybe_object): check for pdumper objects.
(valid_pointer_p): don't be gratuitously inefficient under rr(1).
(make_pure_c_string): add support for size_byte = -2 mode
indicating that string data points into Emacs image rodata.
(visit_vectorlike_root): visits GC roots embedded in
vectorlike objects.
(visit_buffer_root): visits GC roots embedded in
our totally-not-a-buffer buffer global objects.
(visit_static_gc_roots): visit GC roots in the Emacs data section.
(mark_object_root_visitor): root callback used for conventional GC
marking
(weak_hash_tables): new internal variable for tracking found weak
hash tables during GC.
(mark_and_sweep_weak_table_contents): new weak hash table marking.
(garbage_collect_1): use new GC root visitor machinery.
(mark_vectorlike): accept a vectorlike_header instead of a
Lisp_Vector.
(mark_frame, mark_window, mark_hash_table): new functions.
(mark_object): initialize 'm'; check for pdumper objects and use
new mark-bit accessors throughout. Remove some object-specific
marking code and move to helper functions above.
(survives_gc_p): check for pdumper objects.
(gc-sweep): clear pdumper mark bits.
(init_alloc_once_for_pdumper): new helper function for early init
called both during normal init and pdumper load.
(init_alloc_once): pdumper integration.
* src/Makefile.in: Rewrite dumping for pdumper; add pdumper.o;
invoke temacs with --temacs command line option; build dmpstruct.h
from dmpstruct.awk; stop relying on CANNOT_DUMP; clean up pdumper
intermediate files during build.
* nextstep/Makefile.in: build emacs.pdmp into NS packages
* lisp/startup.el: account for new '--temacs' and '--dump-file'
command line option.
* lisp/loadup.el: rewrite early init to account for pdumper; use
injected 'dump-mode' variable (set via the new '--temacs' option)
instead of parsing command line.
* lisp/cus-start.el: Check 'dump-mode' instead of 'purify-flag',
since the new 'dump-mode'
* lib-src/make-fingerprint.c: new program
* lib-src/Makefile.in: built make-fingerprint utility program
* configure.ac: Add --with-pdumper toggle to control pdumper
support; add --with-unexec toggle to control unexec support.
Add --with-dumping option to control which dumping strategy we use
by default. Adjust for pdumper throughout. Check for
posix_madvise.
* Makefile.in: Add @DUMPING@ substitution; add pdumper mode.
* .gitignore: Add make-fingerprint, temacs.in, fingerprint.c,
dmpstruct.h, and pdumper dump files.
2019-01-15 22:36:54 +00:00
|
|
|
|
Does Emacs support the portable dumper? ${with_pdumper}
|
|
|
|
|
Does Emacs support legacy unexec dumping? ${with_unexec}
|
|
|
|
|
Which dumping strategy does Emacs use? ${with_dumping}
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
|
"])
|
1994-08-26 14:57:46 +00:00
|
|
|
|
|
2011-11-22 08:02:21 +00:00
|
|
|
|
if test -n "${EMACSDATA}"; then
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
|
AS_ECHO([" Environment variable EMACSDATA set to: $EMACSDATA"])
|
2011-11-22 08:02:21 +00:00
|
|
|
|
fi
|
|
|
|
|
if test -n "${EMACSDOC}"; then
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
|
AS_ECHO([" Environment variable EMACSDOC set to: $EMACSDOC"])
|
2011-11-22 08:02:21 +00:00
|
|
|
|
fi
|
|
|
|
|
|
2008-03-11 08:14:28 +00:00
|
|
|
|
echo
|
|
|
|
|
|
2008-07-17 17:44:41 +00:00
|
|
|
|
if test "$HAVE_NS" = "yes"; then
|
|
|
|
|
echo
|
2018-07-16 18:36:31 +00:00
|
|
|
|
AS_ECHO(["Run '${MAKE-make}' to build Emacs, then run 'src/emacs' to test it.
|
|
|
|
|
Run '${MAKE-make} install' in order to build an application bundle.
|
|
|
|
|
The application will go to nextstep/Emacs.app and can be run or moved
|
|
|
|
|
from there."])
|
2008-07-17 17:44:41 +00:00
|
|
|
|
if test "$EN_NS_SELF_CONTAINED" = "yes"; then
|
|
|
|
|
echo "The application will be fully self-contained."
|
|
|
|
|
else
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
|
AS_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
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
|
to run if these resources are not installed."])
|
2008-07-17 17:44:41 +00:00
|
|
|
|
fi
|
|
|
|
|
echo
|
|
|
|
|
fi
|
|
|
|
|
|
2017-07-29 07:01:02 +00:00
|
|
|
|
case $opsys,$emacs_uname_r in
|
|
|
|
|
cygwin,1.5.*)
|
|
|
|
|
AC_MSG_WARN([[building Emacs on Cygwin 1.5 is not supported.]])
|
2012-04-12 12:17:20 +00:00
|
|
|
|
echo
|
|
|
|
|
;;
|
2020-01-31 02:58:33 +00:00
|
|
|
|
cygwin,3.0.[[0-7]]'('* | cygwin,3.1.[[0-2]]'('*)
|
2019-06-29 19:03:34 +00:00
|
|
|
|
AC_DEFINE([HAVE_CYGWIN_O_PATH_BUG], 1,
|
2020-01-31 02:58:33 +00:00
|
|
|
|
[Define to 1 if opening a FIFO, socket, or symlink with O_PATH is buggy.]);;
|
2017-07-29 07:01:02 +00:00
|
|
|
|
esac
|
2004-10-06 12:28:31 +00:00
|
|
|
|
|
1994-08-26 14:57:46 +00:00
|
|
|
|
# Remove any trailing slashes in these variables.
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
|
case $prefix in
|
|
|
|
|
*/) prefix=`AS_DIRNAME(["$prefix."])`;;
|
|
|
|
|
esac
|
|
|
|
|
case $exec_prefix in
|
|
|
|
|
*/) exec_prefix=`AS_DIRNAME(["$exec_prefix."])`;;
|
|
|
|
|
esac
|
1994-08-26 14:57:46 +00:00
|
|
|
|
|
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-10 21:52:26 +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-10 21:52:26 +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-10 21:52:26 +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
|
|
|
|
|
|
Switch from Automake to GNU Make
Emacs assumes GNU Make, and GNU Make has much of the functionality of
Automake built-in. The Emacs build process uses Automake primarily
because Emacs uses some Gnulib code and Gnulib formerly required
Automake. Now that Gnulib no longer requires Automake, Emacs can
stop using Automake and this should simplify Emacs maintenance
in the future (Bug#26100). Although this patch may look long, most of
it is generated automatically: the changes to build-aux/config.guess,
build-aux/config.sub, build-aux/install-sh, and lib/gnulib.mk.in are
all done by admin/merge-gnulib.
* .gitignore: Remove build-aux/ar-lib, build-aux/compile,
build-aux/config.guess, build-aux/config.sub, build-aux/depcomp,
build-aux/install-sh, build-aux/missing, and lib/Makefile.in,
as they are no longer built by autogen.sh.
Add lib/gnulib.mk, as it is now built by 'configure'.
Remove nt/gnulib.mk, as it is no longer built by 'make'.
* INSTALL.REPO, README, admin/make-tarball.txt:
Remove mention of Automake.
* Makefile.in (AUTOCONF, AUTOMAKE, AUTOHEADER, ACLOCAL, lib)
(AUTOCONF_INPUTS, ACLOCAL_PATH, ACLOCAL_INPUTS)
($(srcdir)/aclocal.m4, AUTOMAKE_INPUTS)
($(srcdir)/lib/Makefile.in, $(srcdir)/nt/gnulib.mk, am--refresh):
Remove.
($(MAKEFILE_NAME)): Depend on lib/gnulib.mk.in.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in)
($(srcdir)/src/config.in):
Use autogen.sh instead of doing it by hand.
* admin/merge-gnulib (AVOIDED_MODULES, avoided_flags)):
New vars, to simplify processing of avoided modules.
(GNULIB_TOOL_FLAGS): Move --avoid flags into AVOIDED_MODULES.
Add --gnu-make, and change makefile name to gnulib.mk.in.
Copy config.guess, config.sub, and install-sh too, since
Automake no longer does that for us.
* admin/notes/copyright:
* admin/update_autogen (genfiles):
Update list of files.
Remove hack for nt/gnulib.mk, a file that is no longer needed.
* autogen.sh (progs): Remove Automake.
(automake_min): Remove.
Build aclocal.m4 so that autoreconf need not use aclocal.
* build-aux/config.guess, build-aux/config.sub:
* build-aux/install-sh:
New files, copied from Gnulib. These are now updated by
admin/merge-gnulib instead by autogen.sh.
* configure.ac (AC_PROG_MAKE_SET, ACLOCAL_PATH, AM_CONDITIONAL):
Remove.
(AM_INIT_AUTOMAKE, AM_SILENT_RULES): Remove call.
(AC_PROG_CC_C_O): Call this instead of AM_PROG_CC_C_O.
(BUILDING_FOR_WINDOWSNT, HYBRID_MALLOC_LIB): Remove; no longer needed.
(--disable-silent-rules): New option, since Automake no longer
does this for us.
(AM_V, AM_DEFAULT_V): Set unconditionally, and do not bother
with AM_SUBST_NOTMAKE.
(AC_PROG_INSTALL): Add call.
(MAKEINFO): Do not bother with the 'missing' program.
(MAKEINFO, SYSTEM_TYPE): AC_SUBST.
(AC_CONFIG_FILES): Add Makefile, lib/gnulib.mk.
(SUBDIR_MAKEFILES): Remove duplication.
* lib/Makefile.am: Remove, replacing with:
* lib/Makefile.in: New file, with the old Makefile.am contents
and with the following changes:
(AUTOMAKE_OPTIONS, BUILT_SOURCES, CLEANFILES, EXTRA_DIST)
(MOSTLYCLEANDIRS, MOSTLYCLEANFILES, noinst_LIBRARIES, SUFFIXES)
(AM_CFLAGS, DEFAULT_INCLUDES, libegnu_a_SOURCES, libegnu_a_LIBADD)
(EXTRA_libegnu_a_SOURCES, libegnu_a_SHORTNAME, libegnu_a_CPPFLAGS):
Remove.
(VPATH, abs_top_builddir, top_builddir, top_srcdir, all, AM_V_AR)
(AM_V_CC, AM_V_GEN, AM_V_at, DEPDIR, DEPFLAGS, MKDEPDIR, SYSTEM_TYPE)
(libgnu.a, libegnu.a, ETAGS, $(ETAGS), tags, TAGS, clean)
(mostlyclean, distclean, bootstrap-clean, maintainer-clean):
New macros and rules, since Automake no longer does them.
Include ../nt/gnulib-cfg.mk if SYSTEM_TYPE is windows-nt,
instead of including ../nt/gnulib.mk if BUILDING_FOR_WINDOWS_NT.
Include dependency files if AUTO_DEPEND.
(ALL_CFLAGS, AUTOCONF_INPUTS, libgnu_a_OBJECTS, libegnu_a_OBJECTS):
New macros.
(bootstrap-clean): Depend on distclean, not maintainer-clean,
and remove gnulib.mk.
(AUTOCONF_INPUTS, $(top_srcdir)/configure, ../config.status, Makefile):
New macros and rules, copied from ../Makefile.in.
($(libegnu_a_OBJECTS), $(libgnu_a_OBJECTS)): Depend on BUILT_SOURCES.
(.c.o, e-%.o): New generic rules.
* lib/gnulib.mk: Remove.
* lib/gnulib.mk.in: New file, which is built by autogen.sh
and contains much of what used to be in lib/gnulib.mk.
* m4/gnulib-common.m4: Copy from gnulib.
* make-dist: Do not distribute build-aux/compile, build-aux/depcomp,
build-aux/missing, build-aux/ar-lib, lib/Makefile.am, nt/gnulib.mk,
nt/gnulib-modules-to-delete.cfg. Distribute lib/Makefile.in,
lib/gnulib.mk.in, and nt/gnulib-cfg.mk instead.
* nt/Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0)
(am__v_GEN_1, ${srcdir}/gnulib.mk): Remove.
* nt/gnulib-cfg.mk: New file, which supersedes ...
* nt/gnulib-modules-to-delete.cfg: ... this file, which is removed.
* src/Makefile.in (ACLOCAL_INPUTS): Remove.
(AUTOCONF_INPUTS): Merge ACLOCAL_INPUTS into it.
($(top_srcdir)/configure, ../config.status, config.in Makefile):
Defer to parent Makefile.
2017-03-17 18:33:47 +00:00
|
|
|
|
AC_CONFIG_FILES([Makefile lib/gnulib.mk])
|
|
|
|
|
|
2014-11-10 02:01:56 +00:00
|
|
|
|
dnl config.status treats $srcdir specially, so I think this is ok...
|
|
|
|
|
AC_CONFIG_FILES([$srcdir/doc/man/emacs.1])
|
|
|
|
|
|
Switch from Automake to GNU Make
Emacs assumes GNU Make, and GNU Make has much of the functionality of
Automake built-in. The Emacs build process uses Automake primarily
because Emacs uses some Gnulib code and Gnulib formerly required
Automake. Now that Gnulib no longer requires Automake, Emacs can
stop using Automake and this should simplify Emacs maintenance
in the future (Bug#26100). Although this patch may look long, most of
it is generated automatically: the changes to build-aux/config.guess,
build-aux/config.sub, build-aux/install-sh, and lib/gnulib.mk.in are
all done by admin/merge-gnulib.
* .gitignore: Remove build-aux/ar-lib, build-aux/compile,
build-aux/config.guess, build-aux/config.sub, build-aux/depcomp,
build-aux/install-sh, build-aux/missing, and lib/Makefile.in,
as they are no longer built by autogen.sh.
Add lib/gnulib.mk, as it is now built by 'configure'.
Remove nt/gnulib.mk, as it is no longer built by 'make'.
* INSTALL.REPO, README, admin/make-tarball.txt:
Remove mention of Automake.
* Makefile.in (AUTOCONF, AUTOMAKE, AUTOHEADER, ACLOCAL, lib)
(AUTOCONF_INPUTS, ACLOCAL_PATH, ACLOCAL_INPUTS)
($(srcdir)/aclocal.m4, AUTOMAKE_INPUTS)
($(srcdir)/lib/Makefile.in, $(srcdir)/nt/gnulib.mk, am--refresh):
Remove.
($(MAKEFILE_NAME)): Depend on lib/gnulib.mk.in.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in)
($(srcdir)/src/config.in):
Use autogen.sh instead of doing it by hand.
* admin/merge-gnulib (AVOIDED_MODULES, avoided_flags)):
New vars, to simplify processing of avoided modules.
(GNULIB_TOOL_FLAGS): Move --avoid flags into AVOIDED_MODULES.
Add --gnu-make, and change makefile name to gnulib.mk.in.
Copy config.guess, config.sub, and install-sh too, since
Automake no longer does that for us.
* admin/notes/copyright:
* admin/update_autogen (genfiles):
Update list of files.
Remove hack for nt/gnulib.mk, a file that is no longer needed.
* autogen.sh (progs): Remove Automake.
(automake_min): Remove.
Build aclocal.m4 so that autoreconf need not use aclocal.
* build-aux/config.guess, build-aux/config.sub:
* build-aux/install-sh:
New files, copied from Gnulib. These are now updated by
admin/merge-gnulib instead by autogen.sh.
* configure.ac (AC_PROG_MAKE_SET, ACLOCAL_PATH, AM_CONDITIONAL):
Remove.
(AM_INIT_AUTOMAKE, AM_SILENT_RULES): Remove call.
(AC_PROG_CC_C_O): Call this instead of AM_PROG_CC_C_O.
(BUILDING_FOR_WINDOWSNT, HYBRID_MALLOC_LIB): Remove; no longer needed.
(--disable-silent-rules): New option, since Automake no longer
does this for us.
(AM_V, AM_DEFAULT_V): Set unconditionally, and do not bother
with AM_SUBST_NOTMAKE.
(AC_PROG_INSTALL): Add call.
(MAKEINFO): Do not bother with the 'missing' program.
(MAKEINFO, SYSTEM_TYPE): AC_SUBST.
(AC_CONFIG_FILES): Add Makefile, lib/gnulib.mk.
(SUBDIR_MAKEFILES): Remove duplication.
* lib/Makefile.am: Remove, replacing with:
* lib/Makefile.in: New file, with the old Makefile.am contents
and with the following changes:
(AUTOMAKE_OPTIONS, BUILT_SOURCES, CLEANFILES, EXTRA_DIST)
(MOSTLYCLEANDIRS, MOSTLYCLEANFILES, noinst_LIBRARIES, SUFFIXES)
(AM_CFLAGS, DEFAULT_INCLUDES, libegnu_a_SOURCES, libegnu_a_LIBADD)
(EXTRA_libegnu_a_SOURCES, libegnu_a_SHORTNAME, libegnu_a_CPPFLAGS):
Remove.
(VPATH, abs_top_builddir, top_builddir, top_srcdir, all, AM_V_AR)
(AM_V_CC, AM_V_GEN, AM_V_at, DEPDIR, DEPFLAGS, MKDEPDIR, SYSTEM_TYPE)
(libgnu.a, libegnu.a, ETAGS, $(ETAGS), tags, TAGS, clean)
(mostlyclean, distclean, bootstrap-clean, maintainer-clean):
New macros and rules, since Automake no longer does them.
Include ../nt/gnulib-cfg.mk if SYSTEM_TYPE is windows-nt,
instead of including ../nt/gnulib.mk if BUILDING_FOR_WINDOWS_NT.
Include dependency files if AUTO_DEPEND.
(ALL_CFLAGS, AUTOCONF_INPUTS, libgnu_a_OBJECTS, libegnu_a_OBJECTS):
New macros.
(bootstrap-clean): Depend on distclean, not maintainer-clean,
and remove gnulib.mk.
(AUTOCONF_INPUTS, $(top_srcdir)/configure, ../config.status, Makefile):
New macros and rules, copied from ../Makefile.in.
($(libegnu_a_OBJECTS), $(libgnu_a_OBJECTS)): Depend on BUILT_SOURCES.
(.c.o, e-%.o): New generic rules.
* lib/gnulib.mk: Remove.
* lib/gnulib.mk.in: New file, which is built by autogen.sh
and contains much of what used to be in lib/gnulib.mk.
* m4/gnulib-common.m4: Copy from gnulib.
* make-dist: Do not distribute build-aux/compile, build-aux/depcomp,
build-aux/missing, build-aux/ar-lib, lib/Makefile.am, nt/gnulib.mk,
nt/gnulib-modules-to-delete.cfg. Distribute lib/Makefile.in,
lib/gnulib.mk.in, and nt/gnulib-cfg.mk instead.
* nt/Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0)
(am__v_GEN_1, ${srcdir}/gnulib.mk): Remove.
* nt/gnulib-cfg.mk: New file, which supersedes ...
* nt/gnulib-modules-to-delete.cfg: ... this file, which is removed.
* src/Makefile.in (ACLOCAL_INPUTS): Remove.
(AUTOCONF_INPUTS): Merge ACLOCAL_INPUTS into it.
($(top_srcdir)/configure, ../config.status, config.in Makefile):
Defer to parent Makefile.
2017-03-17 18:33:47 +00:00
|
|
|
|
m4_define([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])
|
|
|
|
|
SUBDIR_MAKEFILES="subdir_makefiles"
|
|
|
|
|
AC_CONFIG_FILES(subdir_makefiles)
|
2011-05-24 04:00:56 +00:00
|
|
|
|
|
2019-05-16 17:42:27 +00:00
|
|
|
|
dnl The test/ directory is missing if './make-dist --no-tests' was used.
|
2015-11-23 22:02:42 +00:00
|
|
|
|
opt_makefile=test/Makefile
|
2012-12-09 02:22:39 +00:00
|
|
|
|
if test -f "$srcdir/$opt_makefile.in"; then
|
2017-06-13 18:46:03 +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.
|
2017-06-13 18:46:03 +00:00
|
|
|
|
AC_CONFIG_FILES([test/Makefile])
|
2011-05-24 19:12:58 +00:00
|
|
|
|
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
|
Generate admin/charsets Makefile via configure, and make more portable.
* configure.ac (SUBDIR_MAKEFILES): Add admin/charsets/Makefile.
(admin/charsets/Makefile): Generate it.
* admin/charsets/Makefile.in: Rename from Makefile.
(AWK, srcdir, top_srcdir, AM_DEFAULT_VERBOSITY):
New variables, set by configure.
(charsetdir, lispintdir, mapfiledir, AM_V_GEN, am__v_GEN_)
(am__v_GEN_0, am__v_GEN_1, AM_V_at, am__v_at_, am__v_at_0)
(am__v_at_1, LOCAL, mapconv, run_mapconv, big5, compact, cp51932)
(cp932, eucjp_ms, gb180302, gb180304, kuten): New variables.
(TRANS_TABLE, CHARSETS): Add directory prefix to value.
(all): Declare PHONY.
(local): New PHONY target.
(map_template): New template. Use to define short PHONY aliases.
(*.map): Add directory prefixes to targets and prerequisites.
Respect make verbosity.
(JISC6226.map): Replace non-portable sed append without newline.
(install): Remove rule.
(clean): Only delete temporary sedscript.
(bootstrap-clean, distclean, maintainer-clean, extraclean)
(totalclean): New PHONY rules.
* admin/charsets/mapconv (BASE): Replace basename with expr.
(FILE): Add "mapfiles" subdirectory.
(AWK): New variable. Use throughout in place of "awk".
(main): Use "gunzip -c" in place of "zcat".
Don't leave whitespace before "p", for older sed.
* admin/charsets/mapfiles/PTCP154: Add final newline,
to make older sed versions happy.
; * .gitignore: Ignore admin/charsets/Makefile.
2015-05-22 06:44:00 +00:00
|
|
|
|
SUBDIR_MAKEFILES="$SUBDIR_MAKEFILES admin/charsets/Makefile admin/unidata/Makefile admin/grammars/Makefile"
|
|
|
|
|
AC_CONFIG_FILES([admin/charsets/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-05-29 18:54:16 +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);
|
2017-03-12 19:04:10 +00:00
|
|
|
|
dnl e.g., gamedir='${localstatedir}/games/emacs'.
|
2010-05-29 18:54:16 +00:00
|
|
|
|
dnl Secondly, the GNU Coding standards require that one should be able
|
2015-04-19 21:40:51 +00:00
|
|
|
|
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"])
|
1996-08-22 19:29:12 +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
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
|
AS_ECHO(["source $ac_abs_top_srcdir/src/.gdbinit"]) > src/.gdbinit
|
1995-02-02 16:18:40 +00:00
|
|
|
|
fi
|
2011-02-24 04:28:17 +00:00
|
|
|
|
])
|
1995-02-02 16:18:40 +00:00
|
|
|
|
|
2014-11-10 00:57:01 +00:00
|
|
|
|
dnl Perhaps this would be better named doc-emacs-emacsver.texi?
|
|
|
|
|
dnl See comments for etc-refcards-emacsver.tex.
|
|
|
|
|
dnl Since we get a doc/emacs directory generated anyway, for the Makefile,
|
|
|
|
|
dnl it is not quite the same. But we are generating in $srcdir.
|
2014-11-10 00:17:17 +00:00
|
|
|
|
AC_CONFIG_COMMANDS([doc/emacs/emacsver.texi], [
|
|
|
|
|
${MAKE-make} -s --no-print-directory -C doc/emacs doc-emacsver || \
|
|
|
|
|
AC_MSG_ERROR(['doc/emacs/emacsver.texi' could not be made.])
|
|
|
|
|
])
|
|
|
|
|
|
2014-11-10 00:57:01 +00:00
|
|
|
|
dnl If we give this the more natural name, etc/refcards/emacsver.texi,
|
|
|
|
|
dnl then a directory etc/refcards is created in the build directory,
|
|
|
|
|
dnl which is probably harmless, but confusing (in out-of-tree builds).
|
|
|
|
|
dnl (If we were to generate etc/refcards/Makefile, this might change.)
|
|
|
|
|
dnl It is really $srcdir/etc/refcards/emacsver.tex that we generate.
|
|
|
|
|
AC_CONFIG_COMMANDS([etc-refcards-emacsver.tex], [
|
|
|
|
|
${MAKE-make} -s MAKEFILE_NAME=do-not-make-Makefile etc-emacsver || \
|
|
|
|
|
AC_MSG_ERROR(['etc/refcards/emacsver.tex' could not be made.])
|
|
|
|
|
])
|
|
|
|
|
|
2017-03-21 16:59:10 +00:00
|
|
|
|
if test $AUTO_DEPEND = yes; then
|
|
|
|
|
for dir in $AUTODEPEND_PARENTS; do
|
|
|
|
|
AS_MKDIR_P([$dir/deps])
|
|
|
|
|
done
|
|
|
|
|
fi
|
|
|
|
|
|
2011-02-24 04:28:17 +00:00
|
|
|
|
AC_OUTPUT
|
2014-06-05 08:03:22 +00:00
|
|
|
|
|
2017-03-21 19:04:56 +00:00
|
|
|
|
if test ! "$with_mailutils"; then
|
2017-03-21 20:53:47 +00:00
|
|
|
|
if test "$with_pop" = yes; then
|
|
|
|
|
AC_MSG_WARN([This configuration installs a 'movemail' program
|
|
|
|
|
that retrieves POP3 email via only insecure channels.
|
|
|
|
|
To omit insecure POP3, you can use '$0 --without-pop'.])
|
2017-10-03 22:42:10 +00:00
|
|
|
|
elif test "$with_pop" = no-by-default; then
|
|
|
|
|
AC_MSG_WARN([This configuration installs a 'movemail' program
|
|
|
|
|
that does not retrieve POP3 email. By default, Emacs 25 and earlier
|
|
|
|
|
installed a 'movemail' program that retrieved POP3 email via only
|
|
|
|
|
insecure channels, a practice that is no longer recommended but that
|
|
|
|
|
you can continue to support by using '$0 --with-pop'.])
|
2017-03-21 20:53:47 +00:00
|
|
|
|
fi
|
|
|
|
|
|
2017-03-17 10:22:23 +00:00
|
|
|
|
case $opsys in
|
2017-05-01 18:37:26 +00:00
|
|
|
|
mingw32)
|
2017-03-17 10:22:23 +00:00
|
|
|
|
# Don't suggest GNU Mailutils, as it hasn't been ported.
|
2017-03-21 20:53:47 +00:00
|
|
|
|
;;
|
2017-03-17 10:22:23 +00:00
|
|
|
|
*)
|
|
|
|
|
emacs_fix_movemail="use '$0 --with-mailutils'"
|
|
|
|
|
case `(movemail --version) 2>/dev/null` in
|
|
|
|
|
*Mailutils*) ;;
|
|
|
|
|
*) emacs_fix_movemail="install GNU Mailutils
|
2017-10-03 22:42:10 +00:00
|
|
|
|
<https://mailutils.org> and $emacs_fix_movemail";;
|
2017-03-21 20:53:47 +00:00
|
|
|
|
esac
|
|
|
|
|
AC_MSG_NOTICE([You might want to $emacs_fix_movemail.]);;
|
2017-03-17 06:50:37 +00:00
|
|
|
|
esac
|
|
|
|
|
fi
|
|
|
|
|
|
2020-01-24 09:37:59 +00:00
|
|
|
|
if test "${HAVE_XFT}" = yes; then
|
2020-01-24 11:04:36 +00:00
|
|
|
|
AC_MSG_WARN([This configuration uses libXft, which has a number of
|
|
|
|
|
font rendering issues, and is being considered for removal in the
|
|
|
|
|
next release of Emacs. Please consider using Cairo graphics +
|
|
|
|
|
HarfBuzz text shaping instead (they are auto-detected if the
|
|
|
|
|
relevant development headers are installed).])
|
2020-01-24 09:37:59 +00:00
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if test "${HAVE_CAIRO}" = "yes" && test "${HAVE_HARFBUZZ}" = no; then
|
2020-01-24 11:04:36 +00:00
|
|
|
|
AC_MSG_WARN([This configuration uses the Cairo graphics library,
|
2020-11-12 15:51:49 +00:00
|
|
|
|
but not the HarfBuzz font shaping library (minimum version $harfbuzz_required_ver).
|
|
|
|
|
We recommend the use of HarfBuzz when using Cairo, please install
|
|
|
|
|
appropriate HarfBuzz development packages.])
|
2020-01-24 09:37:59 +00:00
|
|
|
|
fi
|
|
|
|
|
|
2019-04-23 03:44:11 +00:00
|
|
|
|
# Let plain 'make' work.
|
|
|
|
|
test "$MAKE" = make || test -f makefile || cat >makefile <<EOF
|
|
|
|
|
.POSIX:
|
|
|
|
|
MAKE = $MAKE
|
|
|
|
|
all:
|
|
|
|
|
\$(MAKE) -f Makefile \$?
|
|
|
|
|
.DEFAULT:
|
|
|
|
|
\$(MAKE) -f Makefile \$<
|
|
|
|
|
EOF
|