diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 72 |
1 files changed, 44 insertions, 28 deletions
diff --git a/configure.ac b/configure.ac index aa2d9ef745f..a4daf1414d3 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnl along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. AC_PREREQ(2.65) dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el. -AC_INIT(GNU Emacs, 27.0.60, bug-gnu-emacs@gnu.org, , https://www.gnu.org/software/emacs/) +AC_INIT(GNU Emacs, 28.0.50, bug-gnu-emacs@gnu.org, , https://www.gnu.org/software/emacs/) 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. @@ -430,7 +430,7 @@ OPTION_DEFAULT_ON([png],[don't compile with PNG image support]) OPTION_DEFAULT_ON([rsvg],[don't compile with SVG image support]) OPTION_DEFAULT_ON([lcms2],[don't compile with Little CMS support]) OPTION_DEFAULT_ON([libsystemd],[don't compile with libsystemd support]) -OPTION_DEFAULT_OFF([cairo],[compile with Cairo drawing]) +OPTION_DEFAULT_ON([cairo],[don't compile with Cairo drawing]) OPTION_DEFAULT_ON([xml2],[don't compile with XML parsing support]) OPTION_DEFAULT_OFF([imagemagick],[compile with ImageMagick image support]) OPTION_DEFAULT_ON([json], [don't compile with native JSON support]) @@ -882,11 +882,6 @@ for func in $ac_func_list; do test $func = pthread_sigmask || AS_VAR_APPEND([funcs], [" $func"]) done ac_func_list=$funcs -# Use the system putenv even if it lacks GNU features, as we don't need them, -# and the gnulib replacement runs afoul of a FreeBSD 10.1 bug; see Bug#19874. -AC_CHECK_FUNCS_ONCE([putenv]) -AC_DEFUN([gl_FUNC_PUTENV], - [test "$ac_cv_func_putenv" = yes || REPLACE_PUTENV=1]) # Emacs does not use the wchar or wctype-h modules. AC_DEFUN([gt_TYPE_WINT_T], [GNULIB_OVERRIDES_WINT_T=0 @@ -1508,6 +1503,7 @@ case "$opsys" in UNEXEC_OBJ=unexelf.o ;; esac +AC_SUBST(UNEXEC_OBJ) LD_SWITCH_SYSTEM= test "$with_unexec" = no || case "$opsys" in @@ -1561,8 +1557,6 @@ C_SWITCH_MACHINE= test $with_unexec = yes && case $canonical in alpha*) - AC_CHECK_DECL([__ELF__]) - if test "$ac_cv_have_decl___ELF__" = "yes"; then ## With ELF, make sure that all common symbols get allocated to in the ## data section. Otherwise, the dump of temacs may miss variables in ## the shared library that have been initialized. For example, with @@ -1573,18 +1567,10 @@ case $canonical in else AC_MSG_ERROR([Non-GCC compilers are not supported.]) fi - else - dnl This was the unexalpha.c case. Removed in 24.1, 2010-07-24, - dnl albeit under the mistaken assumption that said file - dnl was no longer used. - AC_MSG_ERROR([Non-ELF systems are not supported since Emacs 24.1.]) - fi ;; esac AC_SUBST(C_SWITCH_MACHINE) -AC_SUBST(UNEXEC_OBJ) - C_SWITCH_SYSTEM= ## Some programs in src produce warnings saying certain subprograms ## are too complex and need a MAXMEM value greater than 2000 for @@ -2050,7 +2036,7 @@ NS_OBJ= NS_OBJC_OBJ= if test "${HAVE_NS}" = yes; then if test "$with_toolkit_scroll_bars" = "no"; then - AC_MSG_ERROR([Non-toolkit scroll bars are not implemented for Nextstep.]) + AC_MSG_WARN([Non-toolkit scroll bars are not implemented for Nextstep.]) fi window_system=nextstep @@ -3309,14 +3295,13 @@ if test "${HAVE_X11}" = "yes"; then EMACS_CHECK_MODULES(CAIRO, $CAIRO_MODULE) if test $HAVE_CAIRO = yes; then AC_DEFINE(USE_CAIRO, 1, [Define to 1 if using cairo.]) + CFLAGS="$CFLAGS $CAIRO_CFLAGS" + LIBS="$LIBS $CAIRO_LIBS" + AC_SUBST(CAIRO_CFLAGS) + AC_SUBST(CAIRO_LIBS) else - AC_MSG_ERROR([cairo requested but not found.]) + AC_MSG_WARN([cairo requested but not found.]) fi - - CFLAGS="$CFLAGS $CAIRO_CFLAGS" - LIBS="$LIBS $CAIRO_LIBS" - AC_SUBST(CAIRO_CFLAGS) - AC_SUBST(CAIRO_LIBS) fi fi @@ -3382,8 +3367,6 @@ if test "${HAVE_X11}" = "yes"; then fi # "$HAVE_XFT" != no fi # "x${with_xft}" != "xno" - ## We used to allow building with FreeType and without Xft. - ## However, the ftx font backend driver is not in good shape. if test "$HAVE_XFT" != "yes"; then dnl For the "Does Emacs use" message at the end. HAVE_XFT=no @@ -3676,8 +3659,13 @@ HAVE_MODULES=no MODULES_OBJ= case $opsys in cygwin|mingw32) MODULES_SUFFIX=".dll" ;; + darwin) MODULES_SUFFIX=".dylib" ;; *) MODULES_SUFFIX=".so" ;; esac +case "${opsys}" in + darwin) MODULES_SECONDARY_SUFFIX='.so' ;; + *) MODULES_SECONDARY_SUFFIX='' ;; +esac if test "${with_modules}" != "no"; then case $opsys in gnu|gnu-linux) @@ -3708,19 +3696,26 @@ if test "${HAVE_MODULES}" = yes; then AC_DEFINE(HAVE_MODULES, 1, [Define to 1 if dynamic modules are enabled]) AC_DEFINE_UNQUOTED(MODULES_SUFFIX, "$MODULES_SUFFIX", [System extension for dynamic libraries]) + if test -n "${MODULES_SECONDARY_SUFFIX}"; then + AC_DEFINE_UNQUOTED(MODULES_SECONDARY_SUFFIX, "$MODULES_SECONDARY_SUFFIX", + [Alternative system extension for dynamic libraries.]) + fi fi AC_SUBST(MODULES_OBJ) AC_SUBST(LIBMODULES) AC_SUBST(HAVE_MODULES) AC_SUBST(MODULES_SUFFIX) +AC_SUBST(MODULES_SECONDARY_SUFFIX) AC_CONFIG_FILES([src/emacs-module.h]) AC_SUBST_FILE([module_env_snippet_25]) AC_SUBST_FILE([module_env_snippet_26]) AC_SUBST_FILE([module_env_snippet_27]) +AC_SUBST_FILE([module_env_snippet_28]) module_env_snippet_25="$srcdir/src/module-env-25.h" module_env_snippet_26="$srcdir/src/module-env-26.h" module_env_snippet_27="$srcdir/src/module-env-27.h" +module_env_snippet_28="$srcdir/src/module-env-28.h" emacs_major_version="${PACKAGE_VERSION%%.*}" AC_SUBST(emacs_major_version) @@ -4219,6 +4214,12 @@ dnl No need to check for posix_memalign if aligned_alloc works. AC_CHECK_FUNCS([aligned_alloc posix_memalign], [break]) AC_CHECK_DECLS([aligned_alloc], [], [], [[#include <stdlib.h>]]) +case $with_unexec,$canonical in + yes,alpha*) + AC_CHECK_DECL([__ELF__], [], + [AC_MSG_ERROR([Non-ELF systems are not supported on this platform.])]);; +esac + # Dump loading AC_CHECK_FUNCS([posix_madvise]) @@ -5287,9 +5288,9 @@ if test "${HAVE_X_WINDOWS}" = "yes" ; then if test "$HAVE_CAIRO" = "yes"; then FONT_OBJ="$FONT_OBJ ftfont.o ftcrfont.o" elif test "$HAVE_XFT" = "yes"; then - FONT_OBJ="$FONT_OBJ ftfont.o xftfont.o ftxfont.o" + FONT_OBJ="$FONT_OBJ ftfont.o xftfont.o" elif test "$HAVE_FREETYPE" = "yes"; then - FONT_OBJ="$FONT_OBJ ftfont.o ftxfont.o" + FONT_OBJ="$FONT_OBJ ftfont.o" fi fi if test "${HAVE_HARFBUZZ}" = "yes" ; then @@ -5905,6 +5906,21 @@ you can continue to support by using '$0 --with-pop'.]) esac fi +if test "${HAVE_XFT}" = yes; then + 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).]) +fi + +if test "${HAVE_CAIRO}" = "yes" && test "${HAVE_HARFBUZZ}" = no; then + AC_MSG_WARN([This configuration uses the Cairo graphics library, + but not the HarfBuzz font shaping library. We recommend the use + of HarfBuzz when using Cairo, please install HarfBuzz development + packages.]) +fi + # Let plain 'make' work. test "$MAKE" = make || test -f makefile || cat >makefile <<EOF .POSIX: |