diff options
| author | Andrea Corallo <akrl@sdf.org> | 2021-01-02 10:11:15 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2021-01-02 10:11:15 +0100 |
| commit | 5db5064395c251a822e429e19ddecb74a974b6ef (patch) | |
| tree | 2e04729a03d5fc68d0caef3a16e00349b6d413fc /configure.ac | |
| parent | 9420ea6e0840bffcb140d3677dfdabb9251c1f63 (diff) | |
| parent | 0f561ee55348ff451600cc6027db5940ee14606f (diff) | |
| download | emacs-5db5064395c251a822e429e19ddecb74a974b6ef.tar.gz | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index d04a6fee4db..255fec9a8be 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl autoconf dnl in the directory containing this script. dnl If you changed any AC_DEFINES, also run autoheader. dnl -dnl Copyright (C) 1994-1996, 1999-2020 Free Software Foundation, Inc. +dnl Copyright (C) 1994-1996, 1999-2021 Free Software Foundation, Inc. dnl dnl This file is part of GNU Emacs. dnl @@ -3294,7 +3294,12 @@ fi # Check for XRender HAVE_XRENDER=no if test "${HAVE_X11}" = "yes"; then - AC_CHECK_HEADER([X11/extensions/Xrender.h], + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include <X11/Intrinsic.h> + #include <X11/extensions/Xrender.h> + ]], + [[return !XRenderQueryExtension;]])], [AC_CHECK_LIB([Xrender], [XRenderQueryExtension], [HAVE_XRENDER=yes])]) if test $HAVE_XRENDER = yes; then XRENDER_LIBS="-lXrender" @@ -5032,7 +5037,7 @@ case $opsys in AC_DEFINE(FIRST_PTY_LETTER, ['z']) AC_DEFINE(PTY_NAME_SPRINTF, [strcpy (pty_name, "/dev/ptmx");]) dnl Push various streams modules onto a PTY channel. Used in process.c. - 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.]) + AC_DEFINE(SETUP_SLAVE_PTY, [if (ioctl (std_in, I_PUSH, "ptem") == -1) fatal ("ioctl I_PUSH ptem"); if (ioctl (std_in, I_PUSH, "ldterm") == -1) fatal ("ioctl I_PUSH ldterm"); if (ioctl (std_in, I_PUSH, "ttcompat") == -1) fatal ("ioctl I_PUSH ttcompat");], [How to set up a slave PTY, if needed.]) ;; esac @@ -5321,7 +5326,7 @@ fi version=$PACKAGE_VERSION -copyright="Copyright (C) 2020 Free Software Foundation, Inc." +copyright="Copyright (C) 2021 Free Software Foundation, Inc." AC_DEFINE_UNQUOTED(COPYRIGHT, ["$copyright"], [Short copyright string for this version of Emacs.]) AC_SUBST(copyright) @@ -5598,7 +5603,7 @@ case "$opsys" in 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" + libs_nsgui="$libs_nsgui -framework IOKit -framework Carbon -framework IOSurface" fi else libs_nsgui= @@ -5696,7 +5701,7 @@ AC_SUBST(WINDOW_SYSTEM_OBJ) AH_TOP([/* GNU Emacs site configuration template file. -Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2020 +Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2021 Free Software Foundation, Inc. This file is part of GNU Emacs. |